diff --git a/src/share/inner_table/ob_inner_table_schema.101_150.cpp b/src/share/inner_table/ob_inner_table_schema.101_150.cpp index a83d3dfb29..4b392fedc7 100644 --- a/src/share/inner_table/ob_inner_table_schema.101_150.cpp +++ b/src/share/inner_table/ob_inner_table_schema.101_150.cpp @@ -6887,6 +6887,21 @@ int ObInnerTableSchema::all_table_history_schema(ObTableSchema &table_schema) auto_increment_cache_size_default); //default_value } + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("external_properties", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_BINARY, //column_collation_type + OB_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + if (OB_SUCC(ret)) { ADD_COLUMN_SCHEMA("local_session_vars", //column_name ++column_id, //column_id @@ -6921,21 +6936,6 @@ int ObInnerTableSchema::all_table_history_schema(ObTableSchema &table_schema) duplicate_read_consistency_default); //default_value } - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("external_properties", //column_name - ++column_id, //column_id - 0, //rowkey_id - 0, //index_id - 0, //part_key_pos - ObVarcharType, //column_type - CS_TYPE_BINARY, //column_collation_type - OB_MAX_VARCHAR_LENGTH, //column_length - -1, //column_precision - -1, //column_scale - true, //is_nullable - false); //is_autoincrement - } - if (OB_SUCC(ret)) { ObObj index_params_default; index_params_default.set_varchar(ObString::make_string("")); diff --git a/src/share/inner_table/ob_inner_table_schema.11001_11050.cpp b/src/share/inner_table/ob_inner_table_schema.11001_11050.cpp index 2e42b4613d..409608d630 100644 --- a/src/share/inner_table/ob_inner_table_schema.11001_11050.cpp +++ b/src/share/inner_table/ob_inner_table_schema.11001_11050.cpp @@ -14522,6 +14522,21 @@ int ObInnerTableSchema::all_virtual_core_all_table_schema(ObTableSchema &table_s auto_increment_cache_size_default); //default_value } + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("external_properties", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_BINARY, //column_collation_type + OB_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + if (OB_SUCC(ret)) { ADD_COLUMN_SCHEMA("local_session_vars", //column_name ++column_id, //column_id @@ -14556,21 +14571,6 @@ int ObInnerTableSchema::all_virtual_core_all_table_schema(ObTableSchema &table_s duplicate_read_consistency_default); //default_value } - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("external_properties", //column_name - ++column_id, //column_id - 0, //rowkey_id - 0, //index_id - 0, //part_key_pos - ObVarcharType, //column_type - CS_TYPE_BINARY, //column_collation_type - OB_MAX_VARCHAR_LENGTH, //column_length - -1, //column_precision - -1, //column_scale - true, //is_nullable - false); //is_autoincrement - } - if (OB_SUCC(ret)) { ObObj index_params_default; index_params_default.set_varchar(ObString::make_string("")); diff --git a/src/share/inner_table/ob_inner_table_schema.12051_12100.cpp b/src/share/inner_table/ob_inner_table_schema.12051_12100.cpp index c0defe55be..95792c9687 100644 --- a/src/share/inner_table/ob_inner_table_schema.12051_12100.cpp +++ b/src/share/inner_table/ob_inner_table_schema.12051_12100.cpp @@ -6797,6 +6797,21 @@ int ObInnerTableSchema::all_virtual_table_schema(ObTableSchema &table_schema) auto_increment_cache_size_default); //default_value } + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("external_properties", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_BINARY, //column_collation_type + OB_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + if (OB_SUCC(ret)) { ADD_COLUMN_SCHEMA("local_session_vars", //column_name ++column_id, //column_id @@ -6831,21 +6846,6 @@ int ObInnerTableSchema::all_virtual_table_schema(ObTableSchema &table_schema) duplicate_read_consistency_default); //default_value } - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("external_properties", //column_name - ++column_id, //column_id - 0, //rowkey_id - 0, //index_id - 0, //part_key_pos - ObVarcharType, //column_type - CS_TYPE_BINARY, //column_collation_type - OB_MAX_VARCHAR_LENGTH, //column_length - -1, //column_precision - -1, //column_scale - true, //is_nullable - false); //is_autoincrement - } - if (OB_SUCC(ret)) { ObObj index_params_default; index_params_default.set_varchar(ObString::make_string("")); @@ -8346,6 +8346,21 @@ int ObInnerTableSchema::all_virtual_table_history_schema(ObTableSchema &table_sc auto_increment_cache_size_default); //default_value } + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("external_properties", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_BINARY, //column_collation_type + OB_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + if (OB_SUCC(ret)) { ADD_COLUMN_SCHEMA("local_session_vars", //column_name ++column_id, //column_id @@ -8380,21 +8395,6 @@ int ObInnerTableSchema::all_virtual_table_history_schema(ObTableSchema &table_sc duplicate_read_consistency_default); //default_value } - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("external_properties", //column_name - ++column_id, //column_id - 0, //rowkey_id - 0, //index_id - 0, //part_key_pos - ObVarcharType, //column_type - CS_TYPE_BINARY, //column_collation_type - OB_MAX_VARCHAR_LENGTH, //column_length - -1, //column_precision - -1, //column_scale - true, //is_nullable - false); //is_autoincrement - } - if (OB_SUCC(ret)) { ObObj index_params_default; index_params_default.set_varchar(ObString::make_string("")); diff --git a/src/share/inner_table/ob_inner_table_schema.15101_15150.cpp b/src/share/inner_table/ob_inner_table_schema.15101_15150.cpp index 1035fe35b6..c7e0637c73 100644 --- a/src/share/inner_table/ob_inner_table_schema.15101_15150.cpp +++ b/src/share/inner_table/ob_inner_table_schema.15101_15150.cpp @@ -6676,6 +6676,21 @@ int ObInnerTableSchema::all_virtual_table_real_agent_ora_schema(ObTableSchema &t false); //is_autoincrement } + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("EXTERNAL_PROPERTIES", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_BINARY, //column_collation_type + OB_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + if (OB_SUCC(ret)) { ADD_COLUMN_SCHEMA("LOCAL_SESSION_VARS", //column_name ++column_id, //column_id @@ -6706,21 +6721,6 @@ int ObInnerTableSchema::all_virtual_table_real_agent_ora_schema(ObTableSchema &t false); //is_autoincrement } - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXTERNAL_PROPERTIES", //column_name - ++column_id, //column_id - 0, //rowkey_id - 0, //index_id - 0, //part_key_pos - ObVarcharType, //column_type - CS_TYPE_BINARY, //column_collation_type - OB_MAX_VARCHAR_LENGTH, //column_length - -1, //column_precision - -1, //column_scale - true, //is_nullable - false); //is_autoincrement - } - if (OB_SUCC(ret)) { ADD_COLUMN_SCHEMA("INDEX_PARAMS", //column_name ++column_id, //column_id diff --git a/src/share/inner_table/ob_inner_table_schema.15201_15250.cpp b/src/share/inner_table/ob_inner_table_schema.15201_15250.cpp index d8e97822fc..53fc211847 100644 --- a/src/share/inner_table/ob_inner_table_schema.15201_15250.cpp +++ b/src/share/inner_table/ob_inner_table_schema.15201_15250.cpp @@ -6482,6 +6482,21 @@ int ObInnerTableSchema::all_virtual_core_all_table_ora_schema(ObTableSchema &tab false); //is_autoincrement } + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("EXTERNAL_PROPERTIES", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_BINARY, //column_collation_type + OB_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + if (OB_SUCC(ret)) { ADD_COLUMN_SCHEMA("LOCAL_SESSION_VARS", //column_name ++column_id, //column_id @@ -6512,21 +6527,6 @@ int ObInnerTableSchema::all_virtual_core_all_table_ora_schema(ObTableSchema &tab false); //is_autoincrement } - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXTERNAL_PROPERTIES", //column_name - ++column_id, //column_id - 0, //rowkey_id - 0, //index_id - 0, //part_key_pos - ObVarcharType, //column_type - CS_TYPE_BINARY, //column_collation_type - OB_MAX_VARCHAR_LENGTH, //column_length - -1, //column_precision - -1, //column_scale - true, //is_nullable - false); //is_autoincrement - } - if (OB_SUCC(ret)) { ADD_COLUMN_SCHEMA("INDEX_PARAMS", //column_name ++column_id, //column_id diff --git a/src/share/inner_table/ob_inner_table_schema.1_50.cpp b/src/share/inner_table/ob_inner_table_schema.1_50.cpp index a2c6db2c22..8d2f04ba8d 100644 --- a/src/share/inner_table/ob_inner_table_schema.1_50.cpp +++ b/src/share/inner_table/ob_inner_table_schema.1_50.cpp @@ -1645,6 +1645,21 @@ int ObInnerTableSchema::all_table_schema(ObTableSchema &table_schema) auto_increment_cache_size_default); //default_value } + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("external_properties", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_BINARY, //column_collation_type + OB_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + if (OB_SUCC(ret)) { ADD_COLUMN_SCHEMA("local_session_vars", //column_name ++column_id, //column_id @@ -1679,21 +1694,6 @@ int ObInnerTableSchema::all_table_schema(ObTableSchema &table_schema) duplicate_read_consistency_default); //default_value } - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("external_properties", //column_name - ++column_id, //column_id - 0, //rowkey_id - 0, //index_id - 0, //part_key_pos - ObVarcharType, //column_type - CS_TYPE_BINARY, //column_collation_type - OB_MAX_VARCHAR_LENGTH, //column_length - -1, //column_precision - -1, //column_scale - true, //is_nullable - false); //is_autoincrement - } - if (OB_SUCC(ret)) { ObObj index_params_default; index_params_default.set_varchar(ObString::make_string("")); 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 abd17ce7c5..daf86175a7 100644 --- a/src/share/inner_table/ob_inner_table_schema_def.py +++ b/src/share/inner_table/ob_inner_table_schema_def.py @@ -313,9 +313,9 @@ all_table_def = dict( ('max_used_column_group_id', 'int', 'false', '1000'), ('column_store', 'int', 'false', '0'), ('auto_increment_cache_size', 'int', 'false', '0'), + ('external_properties', 'varbinary:OB_MAX_VARCHAR_LENGTH', 'true'), ('local_session_vars', 'longtext', 'true'), ('duplicate_read_consistency', 'int', 'false', '0'), - ('external_properties', 'varbinary:OB_MAX_VARCHAR_LENGTH', 'true'), ('index_params', 'varchar:OB_MAX_INDEX_PARAMS_LENGTH', '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 286690729a..d9934d903d 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 @@ -882,9 +882,9 @@ lob_inrow_threshold bigint(20) NO 4096 max_used_column_group_id bigint(20) NO 1000 column_store bigint(20) NO 0 auto_increment_cache_size bigint(20) NO 0 +external_properties varbinary(1048576) YES NULL local_session_vars longtext YES NULL duplicate_read_consistency bigint(20) NO 0 -external_properties varbinary(1048576) YES NULL index_params varchar(256) NO select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_core_all_table; IF(count(*) >= 0, 1, 0) @@ -1811,9 +1811,9 @@ lob_inrow_threshold bigint(20) NO 4096 max_used_column_group_id bigint(20) NO 1000 column_store bigint(20) NO 0 auto_increment_cache_size bigint(20) NO 0 +external_properties varbinary(1048576) YES NULL local_session_vars longtext YES NULL duplicate_read_consistency bigint(20) NO 0 -external_properties varbinary(1048576) YES NULL index_params varchar(256) NO select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_table; IF(count(*) >= 0, 1, 0) 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 2ea818a9d0..d0c0d5c511 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 @@ -955,9 +955,9 @@ lob_inrow_threshold bigint(20) NO 4096 max_used_column_group_id bigint(20) NO 1000 column_store bigint(20) NO 0 auto_increment_cache_size bigint(20) NO 0 +external_properties varbinary(1048576) YES NULL local_session_vars longtext YES NULL duplicate_read_consistency bigint(20) NO 0 -external_properties varbinary(1048576) YES NULL index_params varchar(256) NO select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_core_all_table; IF(count(*) >= 0, 1, 0) @@ -2703,9 +2703,9 @@ lob_inrow_threshold bigint(20) NO 4096 max_used_column_group_id bigint(20) NO 1000 column_store bigint(20) NO 0 auto_increment_cache_size bigint(20) NO 0 +external_properties varbinary(1048576) YES NULL local_session_vars longtext YES NULL duplicate_read_consistency bigint(20) NO 0 -external_properties varbinary(1048576) YES NULL index_params varchar(256) NO select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_table; IF(count(*) >= 0, 1, 0) @@ -2797,9 +2797,9 @@ lob_inrow_threshold bigint(20) YES 4096 max_used_column_group_id bigint(20) YES 1000 column_store bigint(20) YES 0 auto_increment_cache_size bigint(20) YES 0 +external_properties varbinary(1048576) YES NULL local_session_vars longtext YES NULL duplicate_read_consistency bigint(20) YES 0 -external_properties varbinary(1048576) YES NULL index_params varchar(256) YES select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_table_history; IF(count(*) >= 0, 1, 0)