From 22021285796ab89a106e29000c43a6a30dff9b10 Mon Sep 17 00:00:00 2001 From: Gmldry <1187044372@qq.com> Date: Tue, 26 Nov 2024 13:45:10 +0000 Subject: [PATCH] DBA_OB_BACKUP_STORAGE_INFO/_HISTORY add max_iops/max_bandwid --- .../ob_inner_table_schema.21251_21300.cpp | 4 +- .../inner_table/ob_inner_table_schema_def.py | 40 ++++++++++++++++++- .../r/mysql/desc_sys_views_in_mysql.result | 6 +++ .../r/mysql/desc_sys_views_in_sys.result | 6 +++ 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/share/inner_table/ob_inner_table_schema.21251_21300.cpp b/src/share/inner_table/ob_inner_table_schema.21251_21300.cpp index 7c97d608c..d56bac17c 100644 --- a/src/share/inner_table/ob_inner_table_schema.21251_21300.cpp +++ b/src/share/inner_table/ob_inner_table_schema.21251_21300.cpp @@ -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)); } } diff --git a/src/share/inner_table/ob_inner_table_schema_def.py b/src/share/inner_table/ob_inner_table_schema_def.py index 7e87eb967..90a2b8546 100755 --- a/src/share/inner_table/ob_inner_table_schema_def.py +++ b/src/share/inner_table/ob_inner_table_schema_def.py @@ -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", " ") diff --git a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_mysql.result b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_mysql.result index 1c671f822..5835b8db7 100644 --- a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_mysql.result +++ b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_mysql.result @@ -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 diff --git a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_sys.result b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_sys.result index 330d9afa9..f067f9f3f 100644 --- a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_sys.result +++ b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_sys.result @@ -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