diff --git a/src/share/inner_table/ob_inner_table_schema.12251_12300.cpp b/src/share/inner_table/ob_inner_table_schema.12251_12300.cpp index b9b43af5a7..e4e31cddbc 100644 --- a/src/share/inner_table/ob_inner_table_schema.12251_12300.cpp +++ b/src/share/inner_table/ob_inner_table_schema.12251_12300.cpp @@ -1633,6 +1633,44 @@ int ObInnerTableSchema::all_virtual_ls_recovery_stat_schema(ObTableSchema &table drop_scn_default, drop_scn_default); //default_value } + + if (OB_SUCC(ret)) { + ObObj config_version_default; + config_version_default.set_varchar(ObString::make_string("")); + ADD_COLUMN_SCHEMA_T("config_version", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + 128, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + config_version_default, + config_version_default); //default_value + } + + if (OB_SUCC(ret)) { + ObObj bconfig_version_default; + bconfig_version_default.set_varchar(ObString::make_string("")); + ADD_COLUMN_SCHEMA_T("bconfig_version", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1024, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + bconfig_version_default, + bconfig_version_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 3606069790..6ee712aa6d 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 @@ -4479,6 +4479,36 @@ int ObInnerTableSchema::all_virtual_ls_recovery_stat_ora_schema(ObTableSchema &t false, //is_nullable false); //is_autoincrement } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("CONFIG_VERSION", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + 128, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("BCONFIG_VERSION", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + 1024, //column_length + 2, //column_precision + -1, //column_scale + true, //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 ffde912688..44fbc02b10 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 @@ -6265,6 +6265,44 @@ int ObInnerTableSchema::all_ls_recovery_stat_schema(ObTableSchema &table_schema) drop_scn_default, drop_scn_default); //default_value } + + if (OB_SUCC(ret)) { + ObObj config_version_default; + config_version_default.set_varchar(ObString::make_string("")); + ADD_COLUMN_SCHEMA_T("config_version", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + 128, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + config_version_default, + config_version_default); //default_value + } + + if (OB_SUCC(ret)) { + ObObj bconfig_version_default; + bconfig_version_default.set_varchar(ObString::make_string("")); + ADD_COLUMN_SCHEMA_T("bconfig_version", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1024, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + bconfig_version_default, + bconfig_version_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 db9de59bb8..cecc49d99b 100644 --- a/src/share/inner_table/ob_inner_table_schema_def.py +++ b/src/share/inner_table/ob_inner_table_schema_def.py @@ -4142,6 +4142,8 @@ def_table_schema( ('readable_scn', 'uint', 'false', '0'), ('sync_scn', 'uint', 'false', '0'), ('drop_scn', 'uint', 'false', '0'), + ('config_version', 'varchar:128', "false", ""), + ('bconfig_version', 'varchar:1024', "false", ""), ], ) 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 2a5fd55315..842a3ce4e8 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 @@ -2493,6 +2493,8 @@ create_scn bigint(20) unsigned NO 0 readable_scn bigint(20) unsigned NO 0 sync_scn bigint(20) unsigned NO 0 drop_scn bigint(20) unsigned NO 0 +config_version varchar(128) NO +bconfig_version varchar(1024) NO select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_ls_recovery_stat; 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 22ce050912..0f7ac0b7b1 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 @@ -5806,6 +5806,8 @@ create_scn bigint(20) unsigned NO 0 readable_scn bigint(20) unsigned NO 0 sync_scn bigint(20) unsigned NO 0 drop_scn bigint(20) unsigned NO 0 +config_version varchar(128) NO +bconfig_version varchar(1024) NO select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_ls_recovery_stat; IF(count(*) >= 0, 1, 0) 1