hcq/oceanbase
hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

DBA_OB_BACKUP_STORAGE_INFO/_HISTORY add max_iops/max_bandwid

Browse Source
This commit is contained in:
Gmldry 2024-11-26 13:45:10 +00:00 committed by ob-robot
parent 2ca21225d6
commit 2202128579
4 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/share/inner_table/ob_inner_table_schema.21251_21300.cpp
View File

@ -1335,7 +1335,7 @@ int ObInnerTableSchema::dba_ob_backup_storage_info_schema(ObTableSchema &table_s
table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, PATH, ENDPOINT, DEST_ID, DEST_TYPE, AUTHORIZATION, EXTENSION, CHECK_FILE_NAME, USEC_TO_TIME(LAST_CHECK_TIME) AS LAST_CHECK_TIMESTAMP FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_STORAGE_INFO WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, PATH, ENDPOINT, DEST_ID, DEST_TYPE, AUTHORIZATION, EXTENSION, CHECK_FILE_NAME, USEC_TO_TIME(LAST_CHECK_TIME) AS LAST_CHECK_TIMESTAMP, MAX_IOPS, MAX_BANDWIDTH, CASE WHEN MAX_BANDWIDTH = 0 THEN "UNLIMITED" WHEN MAX_BANDWIDTH >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(MAX_BANDWIDTH/1024/1024/1024/1024/1024,2), 'PB/s') WHEN MAX_BANDWIDTH >= 1024*1024*1024*1024 THEN CONCAT(ROUND(MAX_BANDWIDTH/1024/1024/1024/1024,2), 'TB/s') WHEN MAX_BANDWIDTH >= 1024*1024*1024 THEN CONCAT(ROUND(MAX_BANDWIDTH/1024/1024/1024,2), 'GB/s') WHEN MAX_BANDWIDTH >= 1024*1024 THEN CONCAT(ROUND(MAX_BANDWIDTH/1024/1024,2), 'MB/s') WHEN MAX_BANDWIDTH >= 1024 THEN CONCAT(ROUND(MAX_BANDWIDTH/1024,2), 'KB/s') ELSE CONCAT(ROUND(MAX_BANDWIDTH,2), 'B/s') END AS MAX_BANDWIDTH_DISPLAY FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_STORAGE_INFO WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
LOG_ERROR("fail to set view_definition", K(ret));
}
}
@ -1386,7 +1386,7 @@ int ObInnerTableSchema::dba_ob_backup_storage_info_history_schema(ObTableSchema
table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, PATH, ENDPOINT, DEST_ID, DEST_TYPE, AUTHORIZATION, EXTENSION, CHECK_FILE_NAME, USEC_TO_TIME(LAST_CHECK_TIME) AS LAST_CHECK_TIMESTAMP FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_STORAGE_INFO_HISTORY WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, PATH, ENDPOINT, DEST_ID, DEST_TYPE, AUTHORIZATION, EXTENSION, CHECK_FILE_NAME, USEC_TO_TIME(LAST_CHECK_TIME) AS LAST_CHECK_TIMESTAMP, MAX_IOPS, MAX_BANDWIDTH, CASE WHEN MAX_BANDWIDTH = 0 THEN "UNLIMITED" WHEN MAX_BANDWIDTH >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(MAX_BANDWIDTH/1024/1024/1024/1024/1024,2), 'PB/s') WHEN MAX_BANDWIDTH >= 1024*1024*1024*1024 THEN CONCAT(ROUND(MAX_BANDWIDTH/1024/1024/1024/1024,2), 'TB/s') WHEN MAX_BANDWIDTH >= 1024*1024*1024 THEN CONCAT(ROUND(MAX_BANDWIDTH/1024/1024/1024,2), 'GB/s') WHEN MAX_BANDWIDTH >= 1024*1024 THEN CONCAT(ROUND(MAX_BANDWIDTH/1024/1024,2), 'MB/s') WHEN MAX_BANDWIDTH >= 1024 THEN CONCAT(ROUND(MAX_BANDWIDTH/1024,2), 'KB/s') ELSE CONCAT(ROUND(MAX_BANDWIDTH,2), 'B/s') END AS MAX_BANDWIDTH_DISPLAY FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_STORAGE_INFO_HISTORY WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
LOG_ERROR("fail to set view_definition", K(ret));
}
}

40
src/share/inner_table/ob_inner_table_schema_def.py
View File

@ -27760,7 +27760,25 @@ def_table_schema(
AUTHORIZATION,
EXTENSION,
CHECK_FILE_NAME,
USEC_TO_TIME(LAST_CHECK_TIME) AS LAST_CHECK_TIMESTAMP
USEC_TO_TIME(LAST_CHECK_TIME) AS LAST_CHECK_TIMESTAMP,
MAX_IOPS,
MAX_BANDWIDTH,
CASE
WHEN MAX_BANDWIDTH = 0
THEN "UNLIMITED"
WHEN MAX_BANDWIDTH >= 1024*1024*1024*1024*1024
THEN CONCAT(ROUND(MAX_BANDWIDTH/1024/1024/1024/1024/1024,2), 'PB/s')
WHEN MAX_BANDWIDTH >= 1024*1024*1024*1024
THEN CONCAT(ROUND(MAX_BANDWIDTH/1024/1024/1024/1024,2), 'TB/s')
WHEN MAX_BANDWIDTH >= 1024*1024*1024
THEN CONCAT(ROUND(MAX_BANDWIDTH/1024/1024/1024,2), 'GB/s')
WHEN MAX_BANDWIDTH >= 1024*1024
THEN CONCAT(ROUND(MAX_BANDWIDTH/1024/1024,2), 'MB/s')
WHEN MAX_BANDWIDTH >= 1024
THEN CONCAT(ROUND(MAX_BANDWIDTH/1024,2), 'KB/s')
ELSE
CONCAT(ROUND(MAX_BANDWIDTH,2), 'B/s')
END AS MAX_BANDWIDTH_DISPLAY
FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_STORAGE_INFO
WHERE TENANT_ID = EFFECTIVE_TENANT_ID()
""".replace("\n", " ")
@ -27785,7 +27803,25 @@ def_table_schema(
AUTHORIZATION,
EXTENSION,
CHECK_FILE_NAME,
USEC_TO_TIME(LAST_CHECK_TIME) AS LAST_CHECK_TIMESTAMP
USEC_TO_TIME(LAST_CHECK_TIME) AS LAST_CHECK_TIMESTAMP,
MAX_IOPS,
MAX_BANDWIDTH,
CASE
WHEN MAX_BANDWIDTH = 0
THEN "UNLIMITED"
WHEN MAX_BANDWIDTH >= 1024*1024*1024*1024*1024
THEN CONCAT(ROUND(MAX_BANDWIDTH/1024/1024/1024/1024/1024,2), 'PB/s')
WHEN MAX_BANDWIDTH >= 1024*1024*1024*1024
THEN CONCAT(ROUND(MAX_BANDWIDTH/1024/1024/1024/1024,2), 'TB/s')
WHEN MAX_BANDWIDTH >= 1024*1024*1024
THEN CONCAT(ROUND(MAX_BANDWIDTH/1024/1024/1024,2), 'GB/s')
WHEN MAX_BANDWIDTH >= 1024*1024
THEN CONCAT(ROUND(MAX_BANDWIDTH/1024/1024,2), 'MB/s')
WHEN MAX_BANDWIDTH >= 1024
THEN CONCAT(ROUND(MAX_BANDWIDTH/1024,2), 'KB/s')
ELSE
CONCAT(ROUND(MAX_BANDWIDTH,2), 'B/s')
END AS MAX_BANDWIDTH_DISPLAY
FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_STORAGE_INFO_HISTORY
WHERE TENANT_ID = EFFECTIVE_TENANT_ID()
""".replace("\n", " ")

6
tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_mysql.result
View File

@ -3793,6 +3793,9 @@ AUTHORIZATION varchar(1024) NO NULL
EXTENSION varchar(512) NO NULL
CHECK_FILE_NAME varchar(256) YES
LAST_CHECK_TIMESTAMP timestamp(6) YES
MAX_IOPS bigint(20) NO
MAX_BANDWIDTH bigint(20) NO
MAX_BANDWIDTH_DISPLAY varchar(29) NO
select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.DBA_OB_BACKUP_STORAGE_INFO limit 1);
cnt
1
@ -3807,6 +3810,9 @@ AUTHORIZATION varchar(1024) NO NULL
EXTENSION varchar(512) NO NULL
CHECK_FILE_NAME varchar(256) YES
LAST_CHECK_TIMESTAMP timestamp(6) YES
MAX_IOPS bigint(20) NO
MAX_BANDWIDTH bigint(20) NO
MAX_BANDWIDTH_DISPLAY varchar(29) NO
select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.DBA_OB_BACKUP_STORAGE_INFO_HISTORY limit 1);
cnt
1

6
tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_sys.result
View File

@ -5255,6 +5255,9 @@ AUTHORIZATION varchar(1024) NO NULL
EXTENSION varchar(512) NO NULL
CHECK_FILE_NAME varchar(256) YES
LAST_CHECK_TIMESTAMP timestamp(6) YES
MAX_IOPS bigint(20) NO
MAX_BANDWIDTH bigint(20) NO
MAX_BANDWIDTH_DISPLAY varchar(29) NO
select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.DBA_OB_BACKUP_STORAGE_INFO limit 1);
cnt
1
@ -5269,6 +5272,9 @@ AUTHORIZATION varchar(1024) NO NULL
EXTENSION varchar(512) NO NULL
CHECK_FILE_NAME varchar(256) YES
LAST_CHECK_TIMESTAMP timestamp(6) YES
MAX_IOPS bigint(20) NO
MAX_BANDWIDTH bigint(20) NO
MAX_BANDWIDTH_DISPLAY varchar(29) NO
select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.DBA_OB_BACKUP_STORAGE_INFO_HISTORY limit 1);
cnt
1