diff --git a/src/share/inner_table/ob_inner_table_schema.12201_12250.cpp b/src/share/inner_table/ob_inner_table_schema.12201_12250.cpp index 9fa1aae848..be54c1dc8d 100644 --- a/src/share/inner_table/ob_inner_table_schema.12201_12250.cpp +++ b/src/share/inner_table/ob_inner_table_schema.12201_12250.cpp @@ -8388,6 +8388,44 @@ int ObInnerTableSchema::all_virtual_backup_storage_info_schema(ObTableSchema &ta last_check_time_default, last_check_time_default); //default_value } + + if (OB_SUCC(ret)) { + ObObj max_iops_default; + max_iops_default.set_int(0); + ADD_COLUMN_SCHEMA_T("max_iops", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(int64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + max_iops_default, + max_iops_default); //default_value + } + + if (OB_SUCC(ret)) { + ObObj max_bandwidth_default; + max_bandwidth_default.set_int(0); + ADD_COLUMN_SCHEMA_T("max_bandwidth", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(int64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + max_bandwidth_default, + max_bandwidth_default); //default_value + } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(ENCODING_ROW_STORE); table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL); diff --git a/src/share/inner_table/ob_inner_table_schema.12301_12350.cpp b/src/share/inner_table/ob_inner_table_schema.12301_12350.cpp index 408270d75f..8dd2bb0942 100644 --- a/src/share/inner_table/ob_inner_table_schema.12301_12350.cpp +++ b/src/share/inner_table/ob_inner_table_schema.12301_12350.cpp @@ -4560,6 +4560,44 @@ int ObInnerTableSchema::all_virtual_backup_storage_info_history_schema(ObTableSc last_check_time_default, last_check_time_default); //default_value } + + if (OB_SUCC(ret)) { + ObObj max_iops_default; + max_iops_default.set_int(0); + ADD_COLUMN_SCHEMA_T("max_iops", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(int64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + max_iops_default, + max_iops_default); //default_value + } + + if (OB_SUCC(ret)) { + ObObj max_bandwidth_default; + max_bandwidth_default.set_int(0); + ADD_COLUMN_SCHEMA_T("max_bandwidth", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(int64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + max_bandwidth_default, + max_bandwidth_default); //default_value + } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(ENCODING_ROW_STORE); table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL); diff --git a/src/share/inner_table/ob_inner_table_schema.15251_15300.cpp b/src/share/inner_table/ob_inner_table_schema.15251_15300.cpp index fcf5ecb67e..0445377a44 100644 --- a/src/share/inner_table/ob_inner_table_schema.15251_15300.cpp +++ b/src/share/inner_table/ob_inner_table_schema.15251_15300.cpp @@ -627,6 +627,36 @@ int ObInnerTableSchema::all_virtual_backup_storage_info_ora_schema(ObTableSchema true, //is_nullable false); //is_autoincrement } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("MAX_IOPS", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObNumberType, //column_type + CS_TYPE_INVALID, //column_collation_type + 38, //column_length + 38, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("MAX_BANDWIDTH", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObNumberType, //column_type + CS_TYPE_INVALID, //column_collation_type + 38, //column_length + 38, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement + } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(ENCODING_ROW_STORE); table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL); @@ -836,6 +866,36 @@ int ObInnerTableSchema::all_virtual_backup_storage_info_history_ora_schema(ObTab true, //is_nullable false); //is_autoincrement } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("MAX_IOPS", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObNumberType, //column_type + CS_TYPE_INVALID, //column_collation_type + 38, //column_length + 38, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("MAX_BANDWIDTH", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObNumberType, //column_type + CS_TYPE_INVALID, //column_collation_type + 38, //column_length + 38, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement + } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(ENCODING_ROW_STORE); table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL); diff --git a/src/share/inner_table/ob_inner_table_schema.351_400.cpp b/src/share/inner_table/ob_inner_table_schema.351_400.cpp index 803e7022f9..e6b1ede2ec 100644 --- a/src/share/inner_table/ob_inner_table_schema.351_400.cpp +++ b/src/share/inner_table/ob_inner_table_schema.351_400.cpp @@ -1254,6 +1254,44 @@ int ObInnerTableSchema::all_backup_storage_info_schema(ObTableSchema &table_sche last_check_time_default, last_check_time_default); //default_value } + + if (OB_SUCC(ret)) { + ObObj max_iops_default; + max_iops_default.set_int(0); + ADD_COLUMN_SCHEMA_T("max_iops", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(int64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + max_iops_default, + max_iops_default); //default_value + } + + if (OB_SUCC(ret)) { + ObObj max_bandwidth_default; + max_bandwidth_default.set_int(0); + ADD_COLUMN_SCHEMA_T("max_bandwidth", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(int64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + max_bandwidth_default, + max_bandwidth_default); //default_value + } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(ENCODING_ROW_STORE); table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL); diff --git a/src/share/inner_table/ob_inner_table_schema.401_450.cpp b/src/share/inner_table/ob_inner_table_schema.401_450.cpp index 2206eeffb6..376adab825 100644 --- a/src/share/inner_table/ob_inner_table_schema.401_450.cpp +++ b/src/share/inner_table/ob_inner_table_schema.401_450.cpp @@ -1061,6 +1061,44 @@ int ObInnerTableSchema::all_backup_storage_info_history_schema(ObTableSchema &ta last_check_time_default, last_check_time_default); //default_value } + + if (OB_SUCC(ret)) { + ObObj max_iops_default; + max_iops_default.set_int(0); + ADD_COLUMN_SCHEMA_T("max_iops", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(int64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + max_iops_default, + max_iops_default); //default_value + } + + if (OB_SUCC(ret)) { + ObObj max_bandwidth_default; + max_bandwidth_default.set_int(0); + ADD_COLUMN_SCHEMA_T("max_bandwidth", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(int64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + max_bandwidth_default, + max_bandwidth_default); //default_value + } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(ENCODING_ROW_STORE); table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL); 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 44cdd058b7..d2346615c5 100644 --- a/src/share/inner_table/ob_inner_table_schema_def.py +++ b/src/share/inner_table/ob_inner_table_schema_def.py @@ -3753,6 +3753,8 @@ def_table_schema( ('extension', 'varchar:OB_MAX_BACKUP_EXTENSION_LENGTH'), ('check_file_name', 'varchar:OB_MAX_BACKUP_CHECK_FILE_NAME_LENGTH', 'true', ''), ('last_check_time', 'int', 'true', '0'), + ('max_iops', 'int', 'false', '0'), + ('max_bandwidth', 'int', 'false', '0'), ], ) @@ -5072,6 +5074,8 @@ def_table_schema( ('extension', 'varchar:OB_MAX_BACKUP_EXTENSION_LENGTH'), ('check_file_name', 'varchar:OB_MAX_BACKUP_CHECK_FILE_NAME_LENGTH', 'true', ''), ('last_check_time', 'int', 'true', '0'), + ('max_iops', 'int', 'false', '0'), + ('max_bandwidth', 'int', 'false', '0'), ], ) diff --git a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_mysql.result b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_mysql.result index 932032028c..3b7f6a065b 100644 --- a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_mysql.result +++ b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_mysql.result @@ -2334,6 +2334,8 @@ authorization varchar(1024) NO NULL extension varchar(512) NO NULL check_file_name varchar(256) YES last_check_time bigint(20) YES 0 +max_iops bigint(20) NO 0 +max_bandwidth bigint(20) NO 0 select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_backup_storage_info; IF(count(*) >= 0, 1, 0) 1 @@ -3244,6 +3246,8 @@ authorization varchar(1024) NO NULL extension varchar(512) NO NULL check_file_name varchar(256) YES last_check_time bigint(20) YES 0 +max_iops bigint(20) NO 0 +max_bandwidth bigint(20) NO 0 select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_backup_storage_info_history; IF(count(*) >= 0, 1, 0) 1 diff --git a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_sys.result b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_sys.result index 2012d9367a..a8eca7d4c9 100644 --- a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_sys.result +++ b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_sys.result @@ -5411,6 +5411,8 @@ authorization varchar(1024) NO NULL extension varchar(512) NO NULL check_file_name varchar(256) YES last_check_time bigint(20) YES 0 +max_iops bigint(20) NO 0 +max_bandwidth bigint(20) NO 0 select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_backup_storage_info; IF(count(*) >= 0, 1, 0) 1 @@ -6957,6 +6959,8 @@ authorization varchar(1024) NO NULL extension varchar(512) NO NULL check_file_name varchar(256) YES last_check_time bigint(20) YES 0 +max_iops bigint(20) NO 0 +max_bandwidth bigint(20) NO 0 select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_backup_storage_info_history; IF(count(*) >= 0, 1, 0) 1