From ae0ace666f1a5c4ac7ae2080fabf7fd35c580d2c Mon Sep 17 00:00:00 2001 From: obdev Date: Mon, 19 Jul 2021 23:12:15 +0800 Subject: [PATCH] cherry-pick omitted fixs to open-source branch --- deps/oblib/src/common/ob_store_range.cpp | 53 +- .../virtual_table/ob_gv_partition_info.cpp | 4 + .../ob_inner_table_schema.10001_10050.cpp | 3637 ++- .../ob_inner_table_schema.101_150.cpp | 20867 +++++++------ .../ob_inner_table_schema.11001_11050.cpp | 23631 ++++++++------- .../ob_inner_table_schema.11051_11100.cpp | 15183 +++++----- .../ob_inner_table_schema.12001_12050.cpp | 10668 ++++--- .../ob_inner_table_schema.12051_12100.cpp | 24595 ++++++++-------- .../ob_inner_table_schema.12101_12150.cpp | 15441 +++++----- .../ob_inner_table_schema.12151_12200.cpp | 16654 ++++++----- .../ob_inner_table_schema.12201_12250.cpp | 3225 +- .../ob_inner_table_schema.15001_15050.cpp | 23979 ++++++++------- .../ob_inner_table_schema.15051_15100.cpp | 16575 ++++++----- .../ob_inner_table_schema.15101_15150.cpp | 19640 ++++++------ .../ob_inner_table_schema.15151_15200.cpp | 9082 +++--- .../ob_inner_table_schema.151_200.cpp | 14017 +++++---- .../ob_inner_table_schema.1_50.cpp | 5905 ++-- .../ob_inner_table_schema.20001_20050.cpp | 158 +- .../ob_inner_table_schema.201_250.cpp | 11649 ++++---- .../ob_inner_table_schema.21001_21050.cpp | 509 +- .../ob_inner_table_schema.21051_21100.cpp | 355 +- .../ob_inner_table_schema.21101_21150.cpp | 341 +- .../ob_inner_table_schema.25001_25050.cpp | 506 +- .../ob_inner_table_schema.25051_25100.cpp | 515 +- .../ob_inner_table_schema.25101_25150.cpp | 372 +- .../ob_inner_table_schema.25151_25200.cpp | 135 +- .../ob_inner_table_schema.251_300.cpp | 19992 +++++++------ .../ob_inner_table_schema.28001_28050.cpp | 482 +- .../ob_inner_table_schema.28051_28100.cpp | 231 +- .../ob_inner_table_schema.301_350.cpp | 4002 ++- src/share/inner_table/ob_inner_table_schema.h | 7255 ++--- .../inner_table/ob_inner_table_schema.vt.cpp | 860 +- .../ob_inner_table_schema_constants.h | 4175 ++- .../inner_table/ob_inner_table_schema_def.py | 1 + .../ob_inner_table_schema_misc.ipp | 7310 ++--- .../ob_micro_block_index_transformer.cpp | 157 +- .../ob_micro_block_index_transformer.h | 11 +- .../compaction/ob_partition_merge_util.cpp | 22 +- .../compaction/ob_partition_merge_util.h | 7 +- src/storage/ob_partition_merge_task.cpp | 8 +- src/storage/ob_partition_merge_task.h | 33 +- src/storage/ob_partition_migrator.cpp | 2 +- src/storage/ob_partition_storage.cpp | 49 + src/storage/ob_partition_storage.h | 1 + src/storage/ob_partition_store.cpp | 38 +- src/storage/ob_partition_store.h | 1 + src/storage/ob_pg_storage.cpp | 55 +- src/storage/ob_pg_storage.h | 4 + src/storage/ob_sstable.cpp | 32 +- src/storage/ob_table_store.cpp | 28 +- ...ock_row_scanner_with_special_uncom_row.cpp | 231 +- 51 files changed, 141004 insertions(+), 141679 deletions(-) diff --git a/deps/oblib/src/common/ob_store_range.cpp b/deps/oblib/src/common/ob_store_range.cpp index 18b3f3aba..bf59d69d5 100644 --- a/deps/oblib/src/common/ob_store_range.cpp +++ b/deps/oblib/src/common/ob_store_range.cpp @@ -404,9 +404,12 @@ void ObExtStoreRange::set_range_array_idx(const int64_t range_array_idx) } // for multi version get, the rowkey would be converted into a range (with trans version), -// e.g. rowkey1 -> [(rowkey1, -read_snapshot), (rowkey1, MIN_VERSION)) -int ObVersionStoreRangeConversionHelper::store_rowkey_to_multi_version_range(const ObExtStoreRowkey& src_rowkey, - const ObVersionRange& version_range, ObIAllocator& allocator, ObExtStoreRange& multi_version_range) +// e.g. rowkey1 -> [(rowkey1, -read_snapshot), (rowkey1, MAX_VERSION)] +int ObVersionStoreRangeConversionHelper::store_rowkey_to_multi_version_range( + const ObExtStoreRowkey &src_rowkey, + const ObVersionRange &version_range, + ObIAllocator &allocator, + ObExtStoreRange &multi_version_range) { int ret = OB_SUCCESS; // FIXME: hard coding @@ -420,24 +423,28 @@ int ObVersionStoreRangeConversionHelper::store_rowkey_to_multi_version_range(con multi_version_range.get_range().get_start_key()))) { COMMON_LOG(WARN, "build multi version store rowkey failed", K(ret), K(src_rowkey), K(version_range)); } else if (OB_FAIL(build_multi_version_store_rowkey(src_rowkey.get_store_rowkey(), - ObVersionRange::MIN_VERSION, - allocator, - multi_version_range.get_range().get_end_key()))) { - COMMON_LOG(WARN, "build multi version store rowkey failed", K(ret), K(src_rowkey), K(version_range)); + ObVersionRange::MAX_VERSION, + allocator, + multi_version_range.get_range().get_end_key()))) { + COMMON_LOG(WARN, "build multi version store rowkey failed", + K(ret), K(src_rowkey), K(version_range)); } else if (OB_FAIL(multi_version_range.to_collation_free_range_on_demand_and_cutoff_range(allocator))) { COMMON_LOG(WARN, "fail to get colllation free rowkey and range cutoff", K(ret)); } else { multi_version_range.get_range().set_left_closed(); - multi_version_range.get_range().set_right_open(); + multi_version_range.get_range().set_right_closed(); } return ret; } // for multi version scan, the range would be converted into a range (with trans version), -// e.g. case 1 : (rowkey1, rowkey2) -> ((rowkey1, MIN_VERSION), (rowkey2, -MAX_VERSION)) -// case 2 : [rowkey1, rowkey2] -> [(rowkey1, -read_snapshot), (rowkey2, MIN_VERSION)) -int ObVersionStoreRangeConversionHelper::range_to_multi_version_range(const ObExtStoreRange& src_range, - const ObVersionRange& version_range, ObIAllocator& allocator, ObExtStoreRange& multi_version_range) +// e.g. case 1 : (rowkey1, rowkey2) -> ((rowkey1, MAX_VERSION), (rowkey2, -MAX_VERSION)) +// case 2 : [rowkey1, rowkey2] -> [(rowkey1, -MAX_VERSION), (rowkey2, MAX_VERSION)] +int ObVersionStoreRangeConversionHelper::range_to_multi_version_range( + const ObExtStoreRange &src_range, + const ObVersionRange &version_range, + ObIAllocator &allocator, + ObExtStoreRange &multi_version_range) { int ret = OB_SUCCESS; const bool include_start = src_range.get_range().get_border_flag().inclusive_start(); @@ -448,15 +455,15 @@ int ObVersionStoreRangeConversionHelper::range_to_multi_version_range(const ObEx ret = OB_INVALID_ARGUMENT; COMMON_LOG(WARN, "version_range is not valid", K(ret), K(version_range)); } else if (OB_FAIL(build_multi_version_store_rowkey(src_range.get_range().get_start_key(), - include_start ? -INT64_MAX : ObVersionRange::MIN_VERSION, - allocator, - multi_version_range.get_range().get_start_key()))) { - COMMON_LOG(WARN, "build multi version store rowkey failed", K(ret), K(src_range), K(version_range)); + include_start ? -INT64_MAX : ObVersionRange::MAX_VERSION, + allocator, multi_version_range.get_range().get_start_key()))) { + COMMON_LOG(WARN, "build multi version store rowkey failed", + K(ret), K(src_range), K(version_range)); } else if (OB_FAIL(build_multi_version_store_rowkey(src_range.get_range().get_end_key(), - include_end ? ObVersionRange::MIN_VERSION : -ObVersionRange::MAX_VERSION, - allocator, - multi_version_range.get_range().get_end_key()))) { - COMMON_LOG(WARN, "build multi version store rowkey failed", K(ret), K(src_range), K(version_range)); + include_end ? ObVersionRange::MAX_VERSION : - ObVersionRange::MAX_VERSION, + allocator, multi_version_range.get_range().get_end_key()))) { + COMMON_LOG(WARN, "build multi version store rowkey failed", + K(ret), K(src_range), K(version_range)); } else if (OB_FAIL(multi_version_range.to_collation_free_range_on_demand_and_cutoff_range(allocator))) { COMMON_LOG(WARN, "fail to get collation free rowkey", K(ret)); } else { @@ -466,7 +473,11 @@ int ObVersionStoreRangeConversionHelper::range_to_multi_version_range(const ObEx } else { multi_version_range.get_range().set_left_open(); } - multi_version_range.get_range().set_right_open(); + if (include_end) { + multi_version_range.get_range().set_right_closed(); + } else { + multi_version_range.get_range().set_right_open(); + } } return ret; } diff --git a/src/observer/virtual_table/ob_gv_partition_info.cpp b/src/observer/virtual_table/ob_gv_partition_info.cpp index f4dc2af9b..34c390be1 100644 --- a/src/observer/virtual_table/ob_gv_partition_info.cpp +++ b/src/observer/virtual_table/ob_gv_partition_info.cpp @@ -298,6 +298,10 @@ int ObGVPartitionInfo::inner_get_next_row(ObNewRow*& row) // schema_version cur_row_.cells_[i].set_int(info.get_data_info().get_schema_version()); break; + case OB_APP_MIN_COLUMN_ID + 33: + // last_replay_log_ts + cur_row_.cells_[i].set_int(info.get_data_info().get_last_replay_log_ts()); + break; default: ret = OB_ERR_UNEXPECTED; SERVER_LOG(WARN, "invalid column id", K(ret), K(col_id)); diff --git a/src/share/inner_table/ob_inner_table_schema.10001_10050.cpp b/src/share/inner_table/ob_inner_table_schema.10001_10050.cpp index 9b854bec2..3a979e4b0 100644 --- a/src/share/inner_table/ob_inner_table_schema.10001_10050.cpp +++ b/src/share/inner_table/ob_inner_table_schema.10001_10050.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::tenant_virtual_all_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_all_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -58,306 +60,306 @@ int ObInnerTableSchema::tenant_virtual_all_table_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("database_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_type", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_type", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("engine", // 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 - MAX_ENGINE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("engine", //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 + MAX_ENGINE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("version", // 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 + ADD_COLUMN_SCHEMA("version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_format", // 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 - ROW_FORMAT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("row_format", //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 + ROW_FORMAT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rows", // 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 + ADD_COLUMN_SCHEMA("rows", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("avg_row_length", // 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 + ADD_COLUMN_SCHEMA("avg_row_length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_length", // 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 + ADD_COLUMN_SCHEMA("data_length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_data_length", // 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 + ADD_COLUMN_SCHEMA("max_data_length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_length", // 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 + ADD_COLUMN_SCHEMA("index_length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_free", // 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 + ADD_COLUMN_SCHEMA("data_free", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("auto_increment", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("auto_increment", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("create_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("create_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("update_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("update_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("check_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("check_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation", // 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 - MAX_COLLATION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation", //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 + MAX_COLLATION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("checksum", // 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 + ADD_COLUMN_SCHEMA("checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_options", // 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 - MAX_TABLE_STATUS_CREATE_OPTION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_options", //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 + MAX_TABLE_STATUS_CREATE_OPTION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -367,17 +369,16 @@ int ObInnerTableSchema::tenant_virtual_all_table_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_table_column_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_table_column_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -408,153 +409,153 @@ int ObInnerTableSchema::tenant_virtual_table_column_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("field", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("field", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 - COLUMN_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type", //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 + COLUMN_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation", // 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 - MAX_COLLATION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation", //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 + MAX_COLLATION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("null", // 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 - COLUMN_NULLABLE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("null", //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 + COLUMN_NULLABLE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("key", // 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 - COLUMN_KEY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("key", //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 + COLUMN_KEY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("default", // 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 - COLUMN_DEFAULT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("default", //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 + COLUMN_DEFAULT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("extra", // 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 - COLUMN_EXTRA_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("extra", //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 + COLUMN_EXTRA_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("privileges", // 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 - MAX_COLUMN_PRIVILEGE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("privileges", //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 + MAX_COLUMN_PRIVILEGE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_COLUMN_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_COLUMN_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -564,17 +565,16 @@ int ObInnerTableSchema::tenant_virtual_table_column_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_table_index_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_table_index_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -605,302 +605,302 @@ int ObInnerTableSchema::tenant_virtual_table_index_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { ObObj key_name_default; key_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("key_name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - key_name_default, - key_name_default); // default_value + ADD_COLUMN_SCHEMA_T("key_name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + key_name_default, + key_name_default); //default_value } if (OB_SUCC(ret)) { ObObj seq_in_index_default; seq_in_index_default.set_int(0); - ADD_COLUMN_SCHEMA_T("seq_in_index", // column_name - ++column_id, // column_id - 3, // 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 - seq_in_index_default, - seq_in_index_default); // default_value + ADD_COLUMN_SCHEMA_T("seq_in_index", //column_name + ++column_id, //column_id + 3, //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 + seq_in_index_default, + seq_in_index_default); //default_value } if (OB_SUCC(ret)) { ObObj table_schema_default; table_schema_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("table_schema", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_schema_default, - table_schema_default); // default_value + ADD_COLUMN_SCHEMA_T("table_schema", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_schema_default, + table_schema_default); //default_value } if (OB_SUCC(ret)) { ObObj table_default; table_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("table", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_default, - table_default); // default_value + ADD_COLUMN_SCHEMA_T("table", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_default, + table_default); //default_value } if (OB_SUCC(ret)) { ObObj non_unique_default; non_unique_default.set_int(0); - ADD_COLUMN_SCHEMA_T("non_unique", // 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 - non_unique_default, - non_unique_default); // default_value + ADD_COLUMN_SCHEMA_T("non_unique", //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 + non_unique_default, + non_unique_default); //default_value } if (OB_SUCC(ret)) { ObObj index_schema_default; index_schema_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("index_schema", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - index_schema_default, - index_schema_default); // default_value + ADD_COLUMN_SCHEMA_T("index_schema", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + index_schema_default, + index_schema_default); //default_value } if (OB_SUCC(ret)) { ObObj column_name_default; column_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("column_name", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - column_name_default, - column_name_default); // default_value + ADD_COLUMN_SCHEMA_T("column_name", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + column_name_default, + column_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation", // 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 - MAX_COLLATION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation", //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 + MAX_COLLATION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cardinality", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cardinality", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part", // 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 - INDEX_SUB_PART_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part", //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 + INDEX_SUB_PART_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("packed", // 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 - INDEX_PACKED_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("packed", //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 + INDEX_PACKED_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj null_default; null_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("null", // 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 - INDEX_NULL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - null_default, - null_default); // default_value + ADD_COLUMN_SCHEMA_T("null", //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 + INDEX_NULL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + null_default, + null_default); //default_value } if (OB_SUCC(ret)) { ObObj index_type_default; index_type_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("index_type", // 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 - INDEX_NULL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - index_type_default, - index_type_default); // default_value + ADD_COLUMN_SCHEMA_T("index_type", //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 + INDEX_NULL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + index_type_default, + index_type_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj index_comment_default; index_comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("index_comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - index_comment_default, - index_comment_default); // default_value + ADD_COLUMN_SCHEMA_T("index_comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + index_comment_default, + index_comment_default); //default_value } if (OB_SUCC(ret)) { ObObj is_visible_default; is_visible_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("is_visible", // 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 - MAX_COLUMN_YES_NO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_visible_default, - is_visible_default); // default_value + ADD_COLUMN_SCHEMA_T("is_visible", //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 + MAX_COLUMN_YES_NO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_visible_default, + is_visible_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -910,17 +910,16 @@ int ObInnerTableSchema::tenant_virtual_table_index_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_show_create_database_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_show_create_database_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -951,63 +950,63 @@ int ObInnerTableSchema::tenant_virtual_show_create_database_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("database_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_name", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_name", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_database", // 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 - DATABASE_DEFINE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_database", //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 + DATABASE_DEFINE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_database_with_if_not_exists", // 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 - DATABASE_DEFINE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_database_with_if_not_exists", //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 + DATABASE_DEFINE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1017,17 +1016,16 @@ int ObInnerTableSchema::tenant_virtual_show_create_database_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_show_create_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_show_create_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1058,78 +1056,78 @@ int ObInnerTableSchema::tenant_virtual_show_create_table_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_table", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_table", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("character_set_client", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("character_set_client", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_connection", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation_connection", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1139,17 +1137,16 @@ int ObInnerTableSchema::tenant_virtual_show_create_table_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_session_variable_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_session_variable_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1182,35 +1179,35 @@ int ObInnerTableSchema::tenant_virtual_session_variable_schema(ObTableSchema& ta if (OB_SUCC(ret)) { ObObj variable_name_default; variable_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("variable_name", // 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 - OB_MAX_CONFIG_NAME_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - variable_name_default, - variable_name_default); // default_value + ADD_COLUMN_SCHEMA_T("variable_name", //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 + OB_MAX_CONFIG_NAME_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + variable_name_default, + variable_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1220,17 +1217,16 @@ int ObInnerTableSchema::tenant_virtual_session_variable_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_privilege_grant_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_privilege_grant_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1261,33 +1257,33 @@ int ObInnerTableSchema::tenant_virtual_privilege_grant_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grants", // 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 - MAX_GRANT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("grants", //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 + MAX_GRANT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1297,17 +1293,16 @@ int ObInnerTableSchema::tenant_virtual_privilege_grant_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_processlist_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_processlist_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1340,325 +1335,325 @@ int ObInnerTableSchema::all_virtual_processlist_schema(ObTableSchema& table_sche if (OB_SUCC(ret)) { ObObj id_default; id_default.set_uint64(0); - ADD_COLUMN_SCHEMA_T("id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - id_default, - id_default); // default_value + ADD_COLUMN_SCHEMA_T("id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + id_default, + id_default); //default_value } if (OB_SUCC(ret)) { ObObj user_default; user_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("user", // 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 - OB_MAX_USERNAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - user_default, - user_default); // default_value + ADD_COLUMN_SCHEMA_T("user", //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 + OB_MAX_USERNAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + user_default, + user_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj host_default; host_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("host", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - host_default, - host_default); // default_value + ADD_COLUMN_SCHEMA_T("host", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + host_default, + host_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("db", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("db", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj command_default; command_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("command", // 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 - OB_MAX_COMMAND_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - command_default, - command_default); // default_value + ADD_COLUMN_SCHEMA_T("command", //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 + OB_MAX_COMMAND_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + command_default, + command_default); //default_value } if (OB_SUCC(ret)) { ObObj sql_id_default; sql_id_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sql_id", // 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 - OB_MAX_SQL_ID_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - sql_id_default, - sql_id_default); // default_value + ADD_COLUMN_SCHEMA_T("sql_id", //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 + OB_MAX_SQL_ID_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + sql_id_default, + sql_id_default); //default_value } if (OB_SUCC(ret)) { ObObj time_default; time_default.set_int(0); - ADD_COLUMN_SCHEMA_T("time", // 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 - time_default, - time_default); // default_value + ADD_COLUMN_SCHEMA_T("time", //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 + time_default, + time_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("state", // 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 - OB_MAX_SESSION_STATE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("state", //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 + OB_MAX_SESSION_STATE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - MAX_COLUMN_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + MAX_COLUMN_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_port", // 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 + ADD_COLUMN_SCHEMA("sql_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("proxy_sessid", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("proxy_sessid", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("master_sessid", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("master_sessid", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_client_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_client_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_host", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_host", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trans_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("thread_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("thread_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ssl_cipher", // 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 - OB_MAX_COMMAND_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ssl_cipher", //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 + OB_MAX_COMMAND_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -1676,17 +1671,16 @@ int ObInnerTableSchema::all_virtual_processlist_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_warning_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_warning_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1717,48 +1711,48 @@ int ObInnerTableSchema::tenant_virtual_warning_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("level", // 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 - 32, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("level", //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 + 32, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("code", // 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 + ADD_COLUMN_SCHEMA("code", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("message", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("message", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1768,17 +1762,16 @@ int ObInnerTableSchema::tenant_virtual_warning_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_current_tenant_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_current_tenant_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1809,48 +1802,48 @@ int ObInnerTableSchema::tenant_virtual_current_tenant_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_stmt", // 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 - TENANT_DEFINE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_stmt", //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 + TENANT_DEFINE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1860,17 +1853,16 @@ int ObInnerTableSchema::tenant_virtual_current_tenant_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_database_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_database_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1901,63 +1893,63 @@ int ObInnerTableSchema::tenant_virtual_database_status_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("db", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("db", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("read_only", // 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 + ADD_COLUMN_SCHEMA("read_only", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -1975,17 +1967,16 @@ int ObInnerTableSchema::tenant_virtual_database_status_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_tenant_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_tenant_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2016,63 +2007,63 @@ int ObInnerTableSchema::tenant_virtual_tenant_status_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant", // 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 - OB_MAX_TENANT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant", //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 + OB_MAX_TENANT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("read_only", // 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 + ADD_COLUMN_SCHEMA("read_only", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -2090,17 +2081,16 @@ int ObInnerTableSchema::tenant_virtual_tenant_status_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_interm_result_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_interm_result_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2131,203 +2121,202 @@ int ObInnerTableSchema::tenant_virtual_interm_result_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // 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 + ADD_COLUMN_SCHEMA("job_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_id", // 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 + ADD_COLUMN_SCHEMA("task_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("slice_id", // 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 + ADD_COLUMN_SCHEMA("slice_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("execution_id", // 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 + ADD_COLUMN_SCHEMA("execution_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("expire_time", // 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 + ADD_COLUMN_SCHEMA("expire_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_count", // 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 + ADD_COLUMN_SCHEMA("row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scanner_count", // 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 + ADD_COLUMN_SCHEMA("scanner_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("used_memory_size", // 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 + ADD_COLUMN_SCHEMA("used_memory_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("used_disk_size", // 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 + ADD_COLUMN_SCHEMA("used_disk_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("partition_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); - if (OB_FAIL(table_schema.get_part_option().set_part_expr( - "hash (addr_to_partition_id(partition_ip, partition_port))"))) { + if (OB_FAIL(table_schema.get_part_option().set_part_expr("hash (addr_to_partition_id(partition_ip, partition_port))"))) { LOG_WARN("set_part_expr failed", K(ret)); } table_schema.get_part_option().set_part_num(65536); @@ -2341,17 +2330,16 @@ int ObInnerTableSchema::tenant_virtual_interm_result_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_partition_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_partition_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2382,78 +2370,78 @@ int ObInnerTableSchema::tenant_virtual_partition_stat_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 + ADD_COLUMN_SCHEMA("partition_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_count", // 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 + ADD_COLUMN_SCHEMA("row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("diff_percentage", // 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 + ADD_COLUMN_SCHEMA("diff_percentage", //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 } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2463,17 +2451,16 @@ int ObInnerTableSchema::tenant_virtual_partition_stat_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_statname_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_statname_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2504,93 +2491,93 @@ int ObInnerTableSchema::tenant_virtual_statname_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("stat_id", // 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 + ADD_COLUMN_SCHEMA("stat_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("statistic#", // 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 + ADD_COLUMN_SCHEMA("statistic#", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("display_name", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("display_name", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("class", // 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 + ADD_COLUMN_SCHEMA("class", //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 } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2600,17 +2587,16 @@ int ObInnerTableSchema::tenant_virtual_statname_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_event_name_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_event_name_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2641,168 +2627,168 @@ int ObInnerTableSchema::tenant_virtual_event_name_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event_id", // 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 + ADD_COLUMN_SCHEMA("event_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event#", // 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 + ADD_COLUMN_SCHEMA("event#", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("display_name", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("display_name", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parameter1", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parameter1", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parameter2", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parameter2", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parameter3", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parameter3", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_class_id", // 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 + ADD_COLUMN_SCHEMA("wait_class_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_class#", // 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 + ADD_COLUMN_SCHEMA("wait_class#", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_class", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("wait_class", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2812,17 +2798,16 @@ int ObInnerTableSchema::tenant_virtual_event_name_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_global_variable_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_global_variable_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2855,35 +2840,35 @@ int ObInnerTableSchema::tenant_virtual_global_variable_schema(ObTableSchema& tab if (OB_SUCC(ret)) { ObObj variable_name_default; variable_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("variable_name", // 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 - OB_MAX_CONFIG_NAME_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - variable_name_default, - variable_name_default); // default_value + ADD_COLUMN_SCHEMA_T("variable_name", //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 + OB_MAX_CONFIG_NAME_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + variable_name_default, + variable_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2893,17 +2878,16 @@ int ObInnerTableSchema::tenant_virtual_global_variable_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_show_tables_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_show_tables_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2934,48 +2918,48 @@ int ObInnerTableSchema::tenant_virtual_show_tables_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("database_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_type", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_type", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2985,17 +2969,16 @@ int ObInnerTableSchema::tenant_virtual_show_tables_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_show_create_procedure_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_show_create_procedure_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3026,123 +3009,123 @@ int ObInnerTableSchema::tenant_virtual_show_create_procedure_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("routine_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_name", // 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 - OB_MAX_ROUTINE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("routine_name", //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 + OB_MAX_ROUTINE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_routine", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_routine", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("proc_type", // 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 + ADD_COLUMN_SCHEMA("proc_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("character_set_client", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("character_set_client", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_connection", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation_connection", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_database", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation_database", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_mode", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_mode", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3152,10 +3135,10 @@ int ObInnerTableSchema::tenant_virtual_show_create_procedure_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase 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 75ca0490b..5055aa31e 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 @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::all_meta_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_meta_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -63,21 +65,21 @@ int ObInnerTableSchema::all_meta_table_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -86,519 +88,519 @@ int ObInnerTableSchema::all_meta_table_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_port", // 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 + ADD_COLUMN_SCHEMA("sql_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_id", // 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 + ADD_COLUMN_SCHEMA("unit_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role", // 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 + ADD_COLUMN_SCHEMA("role", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("member_list", // 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 - MAX_MEMBER_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("member_list", //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 + MAX_MEMBER_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_count", // 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 + ADD_COLUMN_SCHEMA("row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_size", // 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 + ADD_COLUMN_SCHEMA("data_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_version", // 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 + ADD_COLUMN_SCHEMA("data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_checksum", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_checksum", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_checksum", // 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 + ADD_COLUMN_SCHEMA("row_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_checksum", // 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 - COLUMN_CHECKSUM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("column_checksum", //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 + COLUMN_CHECKSUM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj is_original_leader_default; is_original_leader_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_original_leader", // 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 - is_original_leader_default, - is_original_leader_default); // default_value + ADD_COLUMN_SCHEMA_T("is_original_leader", //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 + is_original_leader_default, + is_original_leader_default); //default_value } if (OB_SUCC(ret)) { ObObj is_previous_leader_default; is_previous_leader_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_previous_leader", // 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 - is_previous_leader_default, - is_previous_leader_default); // default_value + ADD_COLUMN_SCHEMA_T("is_previous_leader", //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 + is_previous_leader_default, + is_previous_leader_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_time", // 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 + ADD_COLUMN_SCHEMA("create_time", //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 } if (OB_SUCC(ret)) { ObObj rebuild_default; rebuild_default.set_int(0); - ADD_COLUMN_SCHEMA_T("rebuild", // 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 - rebuild_default, - rebuild_default); // default_value + ADD_COLUMN_SCHEMA_T("rebuild", //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 + rebuild_default, + rebuild_default); //default_value } if (OB_SUCC(ret)) { ObObj replica_type_default; replica_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("replica_type", // 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 - replica_type_default, - replica_type_default); // default_value + ADD_COLUMN_SCHEMA_T("replica_type", //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 + replica_type_default, + replica_type_default); //default_value } if (OB_SUCC(ret)) { ObObj required_size_default; required_size_default.set_int(0); - ADD_COLUMN_SCHEMA_T("required_size", // 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 - required_size_default, - required_size_default); // default_value + ADD_COLUMN_SCHEMA_T("required_size", //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 + required_size_default, + required_size_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("REPLICA_STATUS_NORMAL")); - ADD_COLUMN_SCHEMA_T("status", // 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 - MAX_REPLICA_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + MAX_REPLICA_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { ObObj is_restore_default; is_restore_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_restore", // 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 - is_restore_default, - is_restore_default); // default_value + ADD_COLUMN_SCHEMA_T("is_restore", //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 + is_restore_default, + is_restore_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_checksum_default; partition_checksum_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_checksum", // 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 - partition_checksum_default, - partition_checksum_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_checksum", //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 + partition_checksum_default, + partition_checksum_default); //default_value } if (OB_SUCC(ret)) { ObObj quorum_default; quorum_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("quorum", // 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 - quorum_default, - quorum_default); // default_value + ADD_COLUMN_SCHEMA_T("quorum", //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 + quorum_default, + quorum_default); //default_value } if (OB_SUCC(ret)) { ObObj fail_list_default; fail_list_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("fail_list", // 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 - OB_MAX_FAILLIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - fail_list_default, - fail_list_default); // default_value + ADD_COLUMN_SCHEMA_T("fail_list", //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 + OB_MAX_FAILLIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + fail_list_default, + fail_list_default); //default_value } if (OB_SUCC(ret)) { ObObj recovery_timestamp_default; recovery_timestamp_default.set_int(0); - ADD_COLUMN_SCHEMA_T("recovery_timestamp", // 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 - recovery_timestamp_default, - recovery_timestamp_default); // default_value + ADD_COLUMN_SCHEMA_T("recovery_timestamp", //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 + recovery_timestamp_default, + recovery_timestamp_default); //default_value } if (OB_SUCC(ret)) { ObObj memstore_percent_default; memstore_percent_default.set_int(100); - ADD_COLUMN_SCHEMA_T("memstore_percent", // 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 - memstore_percent_default, - memstore_percent_default); // default_value + ADD_COLUMN_SCHEMA_T("memstore_percent", //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 + memstore_percent_default, + memstore_percent_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -616,17 +618,16 @@ int ObInnerTableSchema::all_meta_table_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_user_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_user_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -662,21 +663,21 @@ int ObInnerTableSchema::all_user_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -685,659 +686,659 @@ int ObInnerTableSchema::all_user_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_name", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_name", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj host_default; host_default.set_varchar(ObString::make_string("%")); - ADD_COLUMN_SCHEMA_T("host", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - host_default, - host_default); // default_value + ADD_COLUMN_SCHEMA_T("host", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + host_default, + host_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("passwd", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("passwd", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_USER_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_USER_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj priv_alter_default; priv_alter_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter", // 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 - priv_alter_default, - priv_alter_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter", //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 + priv_alter_default, + priv_alter_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_default; priv_create_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create", // 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 - priv_create_default, - priv_create_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create", //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 + priv_create_default, + priv_create_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_delete_default; priv_delete_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_delete", // 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 - priv_delete_default, - priv_delete_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_delete", //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 + priv_delete_default, + priv_delete_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_drop_default; priv_drop_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_drop", // 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 - priv_drop_default, - priv_drop_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_drop", //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 + priv_drop_default, + priv_drop_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_grant_option_default; priv_grant_option_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_grant_option", // 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 - priv_grant_option_default, - priv_grant_option_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_grant_option", //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 + priv_grant_option_default, + priv_grant_option_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_insert_default; priv_insert_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_insert", // 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 - priv_insert_default, - priv_insert_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_insert", //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 + priv_insert_default, + priv_insert_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_update_default; priv_update_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_update", // 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 - priv_update_default, - priv_update_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_update", //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 + priv_update_default, + priv_update_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_select_default; priv_select_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_select", // 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 - priv_select_default, - priv_select_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_select", //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 + priv_select_default, + priv_select_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_index_default; priv_index_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_index", // 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 - priv_index_default, - priv_index_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_index", //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 + priv_index_default, + priv_index_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_view_default; priv_create_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_view", // 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 - priv_create_view_default, - priv_create_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_view", //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 + priv_create_view_default, + priv_create_view_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_show_view_default; priv_show_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_show_view", // 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 - priv_show_view_default, - priv_show_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_show_view", //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 + priv_show_view_default, + priv_show_view_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_show_db_default; priv_show_db_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_show_db", // 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 - priv_show_db_default, - priv_show_db_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_show_db", //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 + priv_show_db_default, + priv_show_db_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_user_default; priv_create_user_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_user", // 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 - priv_create_user_default, - priv_create_user_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_user", //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 + priv_create_user_default, + priv_create_user_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_super_default; priv_super_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_super", // 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 - priv_super_default, - priv_super_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_super", //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 + priv_super_default, + priv_super_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_locked", // 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 + ADD_COLUMN_SCHEMA("is_locked", //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 } if (OB_SUCC(ret)) { ObObj priv_process_default; priv_process_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_process", // 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 - priv_process_default, - priv_process_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_process", //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 + priv_process_default, + priv_process_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_synonym_default; priv_create_synonym_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_synonym", // 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 - priv_create_synonym_default, - priv_create_synonym_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_synonym", //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 + priv_create_synonym_default, + priv_create_synonym_default); //default_value } if (OB_SUCC(ret)) { ObObj ssl_type_default; ssl_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("ssl_type", // 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 - ssl_type_default, - ssl_type_default); // default_value + ADD_COLUMN_SCHEMA_T("ssl_type", //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 + ssl_type_default, + ssl_type_default); //default_value } if (OB_SUCC(ret)) { ObObj ssl_cipher_default; ssl_cipher_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("ssl_cipher", // 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 - ssl_cipher_default, - ssl_cipher_default); // default_value + ADD_COLUMN_SCHEMA_T("ssl_cipher", //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 + ssl_cipher_default, + ssl_cipher_default); //default_value } if (OB_SUCC(ret)) { ObObj x509_issuer_default; x509_issuer_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("x509_issuer", // 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 - x509_issuer_default, - x509_issuer_default); // default_value + ADD_COLUMN_SCHEMA_T("x509_issuer", //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 + x509_issuer_default, + x509_issuer_default); //default_value } if (OB_SUCC(ret)) { ObObj x509_subject_default; x509_subject_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("x509_subject", // 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 - x509_subject_default, - x509_subject_default); // default_value + ADD_COLUMN_SCHEMA_T("x509_subject", //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 + x509_subject_default, + x509_subject_default); //default_value } if (OB_SUCC(ret)) { ObObj type_default; type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("type", // 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 - true, // is_nullable - false, // is_autoincrement - type_default, - type_default); // default_value + ADD_COLUMN_SCHEMA_T("type", //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 + true, //is_nullable + false, //is_autoincrement + type_default, + type_default); //default_value } if (OB_SUCC(ret)) { ObObj profile_id_default; profile_id_default.set_int(OB_INVALID_ID); - ADD_COLUMN_SCHEMA_T("profile_id", // 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 - profile_id_default, - profile_id_default); // default_value + ADD_COLUMN_SCHEMA_T("profile_id", //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 + profile_id_default, + profile_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("password_last_changed", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("password_last_changed", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj priv_file_default; priv_file_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_file", // 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 - priv_file_default, - priv_file_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_file", //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 + priv_file_default, + priv_file_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_alter_tenant_default; priv_alter_tenant_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter_tenant", // 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 - priv_alter_tenant_default, - priv_alter_tenant_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter_tenant", //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 + priv_alter_tenant_default, + priv_alter_tenant_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_alter_system_default; priv_alter_system_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter_system", // 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 - priv_alter_system_default, - priv_alter_system_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter_system", //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 + priv_alter_system_default, + priv_alter_system_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_resource_pool_default; priv_create_resource_pool_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_resource_pool", // 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 - priv_create_resource_pool_default, - priv_create_resource_pool_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_resource_pool", //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 + priv_create_resource_pool_default, + priv_create_resource_pool_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_resource_unit_default; priv_create_resource_unit_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_resource_unit", // 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 - priv_create_resource_unit_default, - priv_create_resource_unit_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_resource_unit", //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 + priv_create_resource_unit_default, + priv_create_resource_unit_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -1355,17 +1356,16 @@ int ObInnerTableSchema::all_user_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_user_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_user_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1401,21 +1401,21 @@ int ObInnerTableSchema::all_user_history_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -1424,689 +1424,689 @@ int ObInnerTableSchema::all_user_history_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_name", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_name", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj host_default; host_default.set_varchar(ObString::make_string("%")); - ADD_COLUMN_SCHEMA_T("host", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - host_default, - host_default); // default_value + ADD_COLUMN_SCHEMA_T("host", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + host_default, + host_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("passwd", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("passwd", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_USER_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_USER_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj priv_alter_default; priv_alter_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter", // 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 - true, // is_nullable - false, // is_autoincrement - priv_alter_default, - priv_alter_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter", //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 + true, //is_nullable + false, //is_autoincrement + priv_alter_default, + priv_alter_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_default; priv_create_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_default, - priv_create_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_default, + priv_create_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_delete_default; priv_delete_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_delete", // 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 - true, // is_nullable - false, // is_autoincrement - priv_delete_default, - priv_delete_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_delete", //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 + true, //is_nullable + false, //is_autoincrement + priv_delete_default, + priv_delete_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_drop_default; priv_drop_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_drop", // 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 - true, // is_nullable - false, // is_autoincrement - priv_drop_default, - priv_drop_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_drop", //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 + true, //is_nullable + false, //is_autoincrement + priv_drop_default, + priv_drop_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_grant_option_default; priv_grant_option_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_grant_option", // 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 - true, // is_nullable - false, // is_autoincrement - priv_grant_option_default, - priv_grant_option_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_grant_option", //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 + true, //is_nullable + false, //is_autoincrement + priv_grant_option_default, + priv_grant_option_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_insert_default; priv_insert_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_insert", // 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 - true, // is_nullable - false, // is_autoincrement - priv_insert_default, - priv_insert_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_insert", //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 + true, //is_nullable + false, //is_autoincrement + priv_insert_default, + priv_insert_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_update_default; priv_update_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_update", // 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 - true, // is_nullable - false, // is_autoincrement - priv_update_default, - priv_update_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_update", //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 + true, //is_nullable + false, //is_autoincrement + priv_update_default, + priv_update_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_select_default; priv_select_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_select", // 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 - true, // is_nullable - false, // is_autoincrement - priv_select_default, - priv_select_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_select", //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 + true, //is_nullable + false, //is_autoincrement + priv_select_default, + priv_select_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_index_default; priv_index_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_index", // 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 - true, // is_nullable - false, // is_autoincrement - priv_index_default, - priv_index_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_index", //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 + true, //is_nullable + false, //is_autoincrement + priv_index_default, + priv_index_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_view_default; priv_create_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_view", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_view_default, - priv_create_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_view", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_view_default, + priv_create_view_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_show_view_default; priv_show_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_show_view", // 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 - true, // is_nullable - false, // is_autoincrement - priv_show_view_default, - priv_show_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_show_view", //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 + true, //is_nullable + false, //is_autoincrement + priv_show_view_default, + priv_show_view_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_show_db_default; priv_show_db_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_show_db", // 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 - true, // is_nullable - false, // is_autoincrement - priv_show_db_default, - priv_show_db_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_show_db", //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 + true, //is_nullable + false, //is_autoincrement + priv_show_db_default, + priv_show_db_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_user_default; priv_create_user_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_user", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_user_default, - priv_create_user_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_user", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_user_default, + priv_create_user_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_super_default; priv_super_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_super", // 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 - true, // is_nullable - false, // is_autoincrement - priv_super_default, - priv_super_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_super", //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 + true, //is_nullable + false, //is_autoincrement + priv_super_default, + priv_super_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_locked", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_locked", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj priv_process_default; priv_process_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_process", // 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 - true, // is_nullable - false, // is_autoincrement - priv_process_default, - priv_process_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_process", //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 + true, //is_nullable + false, //is_autoincrement + priv_process_default, + priv_process_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_synonym_default; priv_create_synonym_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_synonym", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_synonym_default, - priv_create_synonym_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_synonym", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_synonym_default, + priv_create_synonym_default); //default_value } if (OB_SUCC(ret)) { ObObj ssl_type_default; ssl_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("ssl_type", // 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 - true, // is_nullable - false, // is_autoincrement - ssl_type_default, - ssl_type_default); // default_value + ADD_COLUMN_SCHEMA_T("ssl_type", //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 + true, //is_nullable + false, //is_autoincrement + ssl_type_default, + ssl_type_default); //default_value } if (OB_SUCC(ret)) { ObObj ssl_cipher_default; ssl_cipher_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("ssl_cipher", // 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 - true, // is_nullable - false, // is_autoincrement - ssl_cipher_default, - ssl_cipher_default); // default_value + ADD_COLUMN_SCHEMA_T("ssl_cipher", //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 + true, //is_nullable + false, //is_autoincrement + ssl_cipher_default, + ssl_cipher_default); //default_value } if (OB_SUCC(ret)) { ObObj x509_issuer_default; x509_issuer_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("x509_issuer", // 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 - true, // is_nullable - false, // is_autoincrement - x509_issuer_default, - x509_issuer_default); // default_value + ADD_COLUMN_SCHEMA_T("x509_issuer", //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 + true, //is_nullable + false, //is_autoincrement + x509_issuer_default, + x509_issuer_default); //default_value } if (OB_SUCC(ret)) { ObObj x509_subject_default; x509_subject_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("x509_subject", // 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 - true, // is_nullable - false, // is_autoincrement - x509_subject_default, - x509_subject_default); // default_value + ADD_COLUMN_SCHEMA_T("x509_subject", //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 + true, //is_nullable + false, //is_autoincrement + x509_subject_default, + x509_subject_default); //default_value } if (OB_SUCC(ret)) { ObObj type_default; type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("type", // 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 - true, // is_nullable - false, // is_autoincrement - type_default, - type_default); // default_value + ADD_COLUMN_SCHEMA_T("type", //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 + true, //is_nullable + false, //is_autoincrement + type_default, + type_default); //default_value } if (OB_SUCC(ret)) { ObObj profile_id_default; profile_id_default.set_int(OB_INVALID_ID); - ADD_COLUMN_SCHEMA_T("profile_id", // 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 - true, // is_nullable - false, // is_autoincrement - profile_id_default, - profile_id_default); // default_value + ADD_COLUMN_SCHEMA_T("profile_id", //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 + true, //is_nullable + false, //is_autoincrement + profile_id_default, + profile_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("password_last_changed", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("password_last_changed", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj priv_file_default; priv_file_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_file", // 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 - true, // is_nullable - false, // is_autoincrement - priv_file_default, - priv_file_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_file", //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 + true, //is_nullable + false, //is_autoincrement + priv_file_default, + priv_file_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_alter_tenant_default; priv_alter_tenant_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter_tenant", // 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 - true, // is_nullable - false, // is_autoincrement - priv_alter_tenant_default, - priv_alter_tenant_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter_tenant", //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 + true, //is_nullable + false, //is_autoincrement + priv_alter_tenant_default, + priv_alter_tenant_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_alter_system_default; priv_alter_system_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter_system", // 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 - true, // is_nullable - false, // is_autoincrement - priv_alter_system_default, - priv_alter_system_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter_system", //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 + true, //is_nullable + false, //is_autoincrement + priv_alter_system_default, + priv_alter_system_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_resource_pool_default; priv_create_resource_pool_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_resource_pool", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_resource_pool_default, - priv_create_resource_pool_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_resource_pool", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_resource_pool_default, + priv_create_resource_pool_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_resource_unit_default; priv_create_resource_unit_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_resource_unit", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_resource_unit_default, - priv_create_resource_unit_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_resource_unit", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_resource_unit_default, + priv_create_resource_unit_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -2124,17 +2124,16 @@ int ObInnerTableSchema::all_user_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_database_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_database_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2170,21 +2169,21 @@ int ObInnerTableSchema::all_database_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2193,217 +2192,217 @@ int ObInnerTableSchema::all_database_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("database_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { ObObj database_name_default; database_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("database_name", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - database_name_default, - database_name_default); // default_value + ADD_COLUMN_SCHEMA_T("database_name", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + database_name_default, + database_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 + ADD_COLUMN_SCHEMA("replica_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_list", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone_list", //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 + MAX_ZONE_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 + ADD_COLUMN_SCHEMA("collation_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_DATABASE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_DATABASE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("read_only", // 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 + ADD_COLUMN_SCHEMA("read_only", //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 } if (OB_SUCC(ret)) { ObObj default_tablegroup_id_default; default_tablegroup_id_default.set_int(OB_INVALID_ID); - ADD_COLUMN_SCHEMA_T("default_tablegroup_id", // 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 - default_tablegroup_id_default, - default_tablegroup_id_default); // default_value + ADD_COLUMN_SCHEMA_T("default_tablegroup_id", //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 + default_tablegroup_id_default, + default_tablegroup_id_default); //default_value } if (OB_SUCC(ret)) { ObObj in_recyclebin_default; in_recyclebin_default.set_int(0); - ADD_COLUMN_SCHEMA_T("in_recyclebin", // 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 - in_recyclebin_default, - in_recyclebin_default); // default_value + ADD_COLUMN_SCHEMA_T("in_recyclebin", //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 + in_recyclebin_default, + in_recyclebin_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -2421,17 +2420,16 @@ int ObInnerTableSchema::all_database_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_database_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_database_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2467,21 +2465,21 @@ int ObInnerTableSchema::all_database_history_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2490,247 +2488,247 @@ int ObInnerTableSchema::all_database_history_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("database_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj database_name_default; database_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("database_name", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - database_name_default, - database_name_default); // default_value + ADD_COLUMN_SCHEMA_T("database_name", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + database_name_default, + database_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_list", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone_list", //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 + MAX_ZONE_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_DATABASE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_DATABASE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("read_only", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("read_only", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj default_tablegroup_id_default; default_tablegroup_id_default.set_int(OB_INVALID_ID); - ADD_COLUMN_SCHEMA_T("default_tablegroup_id", // 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 - true, // is_nullable - false, // is_autoincrement - default_tablegroup_id_default, - default_tablegroup_id_default); // default_value + ADD_COLUMN_SCHEMA_T("default_tablegroup_id", //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 + true, //is_nullable + false, //is_autoincrement + default_tablegroup_id_default, + default_tablegroup_id_default); //default_value } if (OB_SUCC(ret)) { ObObj in_recyclebin_default; in_recyclebin_default.set_int(0); - ADD_COLUMN_SCHEMA_T("in_recyclebin", // 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 - true, // is_nullable - false, // is_autoincrement - in_recyclebin_default, - in_recyclebin_default); // default_value + ADD_COLUMN_SCHEMA_T("in_recyclebin", //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 + true, //is_nullable + false, //is_autoincrement + in_recyclebin_default, + in_recyclebin_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -2748,17 +2746,16 @@ int ObInnerTableSchema::all_database_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tablegroup_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tablegroup_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2794,21 +2791,21 @@ int ObInnerTableSchema::all_tablegroup_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2817,396 +2814,396 @@ int ObInnerTableSchema::all_tablegroup_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("tablegroup_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_name", // 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 - OB_MAX_TABLEGROUP_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tablegroup_name", //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 + OB_MAX_TABLEGROUP_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TABLEGROUP_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TABLEGROUP_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj locality_default; locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - locality_default, - locality_default); // default_value + ADD_COLUMN_SCHEMA_T("locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + locality_default, + locality_default); //default_value } if (OB_SUCC(ret)) { ObObj part_level_default; part_level_default.set_int(0); - ADD_COLUMN_SCHEMA_T("part_level", // 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 - part_level_default, - part_level_default); // default_value + ADD_COLUMN_SCHEMA_T("part_level", //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 + part_level_default, + part_level_default); //default_value } if (OB_SUCC(ret)) { ObObj part_func_type_default; part_func_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("part_func_type", // 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 - part_func_type_default, - part_func_type_default); // default_value + ADD_COLUMN_SCHEMA_T("part_func_type", //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 + part_func_type_default, + part_func_type_default); //default_value } if (OB_SUCC(ret)) { ObObj part_func_expr_num_default; part_func_expr_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("part_func_expr_num", // 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 - part_func_expr_num_default, - part_func_expr_num_default); // default_value + ADD_COLUMN_SCHEMA_T("part_func_expr_num", //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 + part_func_expr_num_default, + part_func_expr_num_default); //default_value } if (OB_SUCC(ret)) { ObObj part_num_default; part_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("part_num", // 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 - part_num_default, - part_num_default); // default_value + ADD_COLUMN_SCHEMA_T("part_num", //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 + part_num_default, + part_num_default); //default_value } if (OB_SUCC(ret)) { ObObj sub_part_func_type_default; sub_part_func_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sub_part_func_type", // 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 - sub_part_func_type_default, - sub_part_func_type_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_func_type", //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 + sub_part_func_type_default, + sub_part_func_type_default); //default_value } if (OB_SUCC(ret)) { ObObj sub_part_func_expr_num_default; sub_part_func_expr_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sub_part_func_expr_num", // 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 - sub_part_func_expr_num_default, - sub_part_func_expr_num_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_func_expr_num", //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 + sub_part_func_expr_num_default, + sub_part_func_expr_num_default); //default_value } if (OB_SUCC(ret)) { ObObj sub_part_num_default; sub_part_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sub_part_num", // 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 - sub_part_num_default, - sub_part_num_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_num", //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 + sub_part_num_default, + sub_part_num_default); //default_value } if (OB_SUCC(ret)) { ObObj max_used_part_id_default; max_used_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("max_used_part_id", // 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_used_part_id_default, - max_used_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("max_used_part_id", //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_used_part_id_default, + max_used_part_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { ObObj partition_status_default; partition_status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_status", // 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 - true, // is_nullable - false, // is_autoincrement - partition_status_default, - partition_status_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_status", //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 + true, //is_nullable + false, //is_autoincrement + partition_status_default, + partition_status_default); //default_value } if (OB_SUCC(ret)) { ObObj previous_locality_default; previous_locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("previous_locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - previous_locality_default, - previous_locality_default); // default_value + ADD_COLUMN_SCHEMA_T("previous_locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + previous_locality_default, + previous_locality_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_schema_version_default; partition_schema_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - partition_schema_version_default, - partition_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + partition_schema_version_default, + partition_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj binding_default; binding_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("binding", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - binding_default, - binding_default); // default_value + ADD_COLUMN_SCHEMA_T("binding", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + binding_default, + binding_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj is_sub_part_template_default; is_sub_part_template_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("is_sub_part_template", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_sub_part_template_default, - is_sub_part_template_default); // default_value + ADD_COLUMN_SCHEMA_T("is_sub_part_template", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_sub_part_template_default, + is_sub_part_template_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -3224,17 +3221,16 @@ int ObInnerTableSchema::all_tablegroup_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tablegroup_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tablegroup_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3270,21 +3266,21 @@ int ObInnerTableSchema::all_tablegroup_history_schema(ObTableSchema& table_schem gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -3293,411 +3289,411 @@ int ObInnerTableSchema::all_tablegroup_history_schema(ObTableSchema& table_schem gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("tablegroup_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_name", // 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 - OB_MAX_TABLEGROUP_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tablegroup_name", //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 + OB_MAX_TABLEGROUP_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TABLEGROUP_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TABLEGROUP_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj locality_default; locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - locality_default, - locality_default); // default_value + ADD_COLUMN_SCHEMA_T("locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + locality_default, + locality_default); //default_value } if (OB_SUCC(ret)) { ObObj part_level_default; part_level_default.set_int(0); - ADD_COLUMN_SCHEMA_T("part_level", // 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 - true, // is_nullable - false, // is_autoincrement - part_level_default, - part_level_default); // default_value + ADD_COLUMN_SCHEMA_T("part_level", //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 + true, //is_nullable + false, //is_autoincrement + part_level_default, + part_level_default); //default_value } if (OB_SUCC(ret)) { ObObj part_func_type_default; part_func_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("part_func_type", // 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 - true, // is_nullable - false, // is_autoincrement - part_func_type_default, - part_func_type_default); // default_value + ADD_COLUMN_SCHEMA_T("part_func_type", //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 + true, //is_nullable + false, //is_autoincrement + part_func_type_default, + part_func_type_default); //default_value } if (OB_SUCC(ret)) { ObObj part_func_expr_num_default; part_func_expr_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("part_func_expr_num", // 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 - true, // is_nullable - false, // is_autoincrement - part_func_expr_num_default, - part_func_expr_num_default); // default_value + ADD_COLUMN_SCHEMA_T("part_func_expr_num", //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 + true, //is_nullable + false, //is_autoincrement + part_func_expr_num_default, + part_func_expr_num_default); //default_value } if (OB_SUCC(ret)) { ObObj part_num_default; part_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("part_num", // 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 - true, // is_nullable - false, // is_autoincrement - part_num_default, - part_num_default); // default_value + ADD_COLUMN_SCHEMA_T("part_num", //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 + true, //is_nullable + false, //is_autoincrement + part_num_default, + part_num_default); //default_value } if (OB_SUCC(ret)) { ObObj sub_part_func_type_default; sub_part_func_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sub_part_func_type", // 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 - true, // is_nullable - false, // is_autoincrement - sub_part_func_type_default, - sub_part_func_type_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_func_type", //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 + true, //is_nullable + false, //is_autoincrement + sub_part_func_type_default, + sub_part_func_type_default); //default_value } if (OB_SUCC(ret)) { ObObj sub_part_func_expr_num_default; sub_part_func_expr_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sub_part_func_expr_num", // 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 - true, // is_nullable - false, // is_autoincrement - sub_part_func_expr_num_default, - sub_part_func_expr_num_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_func_expr_num", //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 + true, //is_nullable + false, //is_autoincrement + sub_part_func_expr_num_default, + sub_part_func_expr_num_default); //default_value } if (OB_SUCC(ret)) { ObObj sub_part_num_default; sub_part_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sub_part_num", // 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 - true, // is_nullable - false, // is_autoincrement - sub_part_num_default, - sub_part_num_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_num", //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 + true, //is_nullable + false, //is_autoincrement + sub_part_num_default, + sub_part_num_default); //default_value } if (OB_SUCC(ret)) { ObObj max_used_part_id_default; max_used_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("max_used_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - max_used_part_id_default, - max_used_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("max_used_part_id", //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 + true, //is_nullable + false, //is_autoincrement + max_used_part_id_default, + max_used_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_status_default; partition_status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_status", // 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 - true, // is_nullable - false, // is_autoincrement - partition_status_default, - partition_status_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_status", //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 + true, //is_nullable + false, //is_autoincrement + partition_status_default, + partition_status_default); //default_value } if (OB_SUCC(ret)) { ObObj previous_locality_default; previous_locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("previous_locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - previous_locality_default, - previous_locality_default); // default_value + ADD_COLUMN_SCHEMA_T("previous_locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + previous_locality_default, + previous_locality_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_schema_version_default; partition_schema_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - partition_schema_version_default, - partition_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + partition_schema_version_default, + partition_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj binding_default; binding_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("binding", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - binding_default, - binding_default); // default_value + ADD_COLUMN_SCHEMA_T("binding", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + binding_default, + binding_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj is_sub_part_template_default; is_sub_part_template_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("is_sub_part_template", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - is_sub_part_template_default, - is_sub_part_template_default); // default_value + ADD_COLUMN_SCHEMA_T("is_sub_part_template", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + is_sub_part_template_default, + is_sub_part_template_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -3715,17 +3711,16 @@ int ObInnerTableSchema::all_tablegroup_history_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3761,21 +3756,21 @@ int ObInnerTableSchema::all_tenant_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -3784,365 +3779,365 @@ int ObInnerTableSchema::all_tenant_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 + ADD_COLUMN_SCHEMA("replica_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_list", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone_list", //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 + MAX_ZONE_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("locked", // 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 + ADD_COLUMN_SCHEMA("locked", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 + ADD_COLUMN_SCHEMA("collation_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_TENANT_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_TENANT_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("read_only", // 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 + ADD_COLUMN_SCHEMA("read_only", //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 } if (OB_SUCC(ret)) { ObObj rewrite_merge_version_default; rewrite_merge_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("rewrite_merge_version", // 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 - rewrite_merge_version_default, - rewrite_merge_version_default); // default_value + ADD_COLUMN_SCHEMA_T("rewrite_merge_version", //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 + rewrite_merge_version_default, + rewrite_merge_version_default); //default_value } if (OB_SUCC(ret)) { ObObj locality_default; locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - locality_default, - locality_default); // default_value + ADD_COLUMN_SCHEMA_T("locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + locality_default, + locality_default); //default_value } if (OB_SUCC(ret)) { ObObj logonly_replica_num_default; logonly_replica_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("logonly_replica_num", // 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 - logonly_replica_num_default, - logonly_replica_num_default); // default_value + ADD_COLUMN_SCHEMA_T("logonly_replica_num", //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 + logonly_replica_num_default, + logonly_replica_num_default); //default_value } if (OB_SUCC(ret)) { ObObj previous_locality_default; previous_locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("previous_locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - previous_locality_default, - previous_locality_default); // default_value + ADD_COLUMN_SCHEMA_T("previous_locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + previous_locality_default, + previous_locality_default); //default_value } if (OB_SUCC(ret)) { ObObj storage_format_version_default; storage_format_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("storage_format_version", // 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 - storage_format_version_default, - storage_format_version_default); // default_value + ADD_COLUMN_SCHEMA_T("storage_format_version", //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 + storage_format_version_default, + storage_format_version_default); //default_value } if (OB_SUCC(ret)) { ObObj storage_format_work_version_default; storage_format_work_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("storage_format_work_version", // 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 - storage_format_work_version_default, - storage_format_work_version_default); // default_value + ADD_COLUMN_SCHEMA_T("storage_format_work_version", //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 + storage_format_work_version_default, + storage_format_work_version_default); //default_value } if (OB_SUCC(ret)) { ObObj default_tablegroup_id_default; default_tablegroup_id_default.set_int(OB_INVALID_ID); - ADD_COLUMN_SCHEMA_T("default_tablegroup_id", // 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 - default_tablegroup_id_default, - default_tablegroup_id_default); // default_value + ADD_COLUMN_SCHEMA_T("default_tablegroup_id", //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 + default_tablegroup_id_default, + default_tablegroup_id_default); //default_value } if (OB_SUCC(ret)) { ObObj compatibility_mode_default; compatibility_mode_default.set_int(0); - ADD_COLUMN_SCHEMA_T("compatibility_mode", // 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 - compatibility_mode_default, - compatibility_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("compatibility_mode", //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 + compatibility_mode_default, + compatibility_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_tenant_time_default; drop_tenant_time_default.set_int(OB_INVALID_TIMESTAMP); - ADD_COLUMN_SCHEMA_T("drop_tenant_time", // 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 - drop_tenant_time_default, - drop_tenant_time_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_tenant_time", //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 + drop_tenant_time_default, + drop_tenant_time_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("TENANT_STATUS_NORMAL")); - ADD_COLUMN_SCHEMA_T("status", // 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 - MAX_TENANT_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + MAX_TENANT_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { ObObj in_recyclebin_default; in_recyclebin_default.set_int(0); - ADD_COLUMN_SCHEMA_T("in_recyclebin", // 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 - in_recyclebin_default, - in_recyclebin_default); // default_value + ADD_COLUMN_SCHEMA_T("in_recyclebin", //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 + in_recyclebin_default, + in_recyclebin_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4152,17 +4147,16 @@ int ObInnerTableSchema::all_tenant_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4198,21 +4192,21 @@ int ObInnerTableSchema::all_tenant_history_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -4221,395 +4215,395 @@ int ObInnerTableSchema::all_tenant_history_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_list", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone_list", //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 + MAX_ZONE_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("locked", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("locked", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_TENANT_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_TENANT_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("read_only", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("read_only", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj rewrite_merge_version_default; rewrite_merge_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("rewrite_merge_version", // 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 - true, // is_nullable - false, // is_autoincrement - rewrite_merge_version_default, - rewrite_merge_version_default); // default_value + ADD_COLUMN_SCHEMA_T("rewrite_merge_version", //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 + true, //is_nullable + false, //is_autoincrement + rewrite_merge_version_default, + rewrite_merge_version_default); //default_value } if (OB_SUCC(ret)) { ObObj locality_default; locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - locality_default, - locality_default); // default_value + ADD_COLUMN_SCHEMA_T("locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + locality_default, + locality_default); //default_value } if (OB_SUCC(ret)) { ObObj logonly_replica_num_default; logonly_replica_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("logonly_replica_num", // 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 - true, // is_nullable - false, // is_autoincrement - logonly_replica_num_default, - logonly_replica_num_default); // default_value + ADD_COLUMN_SCHEMA_T("logonly_replica_num", //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 + true, //is_nullable + false, //is_autoincrement + logonly_replica_num_default, + logonly_replica_num_default); //default_value } if (OB_SUCC(ret)) { ObObj previous_locality_default; previous_locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("previous_locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - previous_locality_default, - previous_locality_default); // default_value + ADD_COLUMN_SCHEMA_T("previous_locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + previous_locality_default, + previous_locality_default); //default_value } if (OB_SUCC(ret)) { ObObj storage_format_version_default; storage_format_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("storage_format_version", // 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 - true, // is_nullable - false, // is_autoincrement - storage_format_version_default, - storage_format_version_default); // default_value + ADD_COLUMN_SCHEMA_T("storage_format_version", //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 + true, //is_nullable + false, //is_autoincrement + storage_format_version_default, + storage_format_version_default); //default_value } if (OB_SUCC(ret)) { ObObj storage_format_work_version_default; storage_format_work_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("storage_format_work_version", // 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 - true, // is_nullable - false, // is_autoincrement - storage_format_work_version_default, - storage_format_work_version_default); // default_value + ADD_COLUMN_SCHEMA_T("storage_format_work_version", //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 + true, //is_nullable + false, //is_autoincrement + storage_format_work_version_default, + storage_format_work_version_default); //default_value } if (OB_SUCC(ret)) { ObObj default_tablegroup_id_default; default_tablegroup_id_default.set_int(OB_INVALID_ID); - ADD_COLUMN_SCHEMA_T("default_tablegroup_id", // 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 - true, // is_nullable - false, // is_autoincrement - default_tablegroup_id_default, - default_tablegroup_id_default); // default_value + ADD_COLUMN_SCHEMA_T("default_tablegroup_id", //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 + true, //is_nullable + false, //is_autoincrement + default_tablegroup_id_default, + default_tablegroup_id_default); //default_value } if (OB_SUCC(ret)) { ObObj compatibility_mode_default; compatibility_mode_default.set_int(0); - ADD_COLUMN_SCHEMA_T("compatibility_mode", // 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 - true, // is_nullable - false, // is_autoincrement - compatibility_mode_default, - compatibility_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("compatibility_mode", //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 + true, //is_nullable + false, //is_autoincrement + compatibility_mode_default, + compatibility_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_tenant_time_default; drop_tenant_time_default.set_int(OB_INVALID_TIMESTAMP); - ADD_COLUMN_SCHEMA_T("drop_tenant_time", // 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 - true, // is_nullable - false, // is_autoincrement - drop_tenant_time_default, - drop_tenant_time_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_tenant_time", //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 + true, //is_nullable + false, //is_autoincrement + drop_tenant_time_default, + drop_tenant_time_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("TENANT_STATUS_NORMAL")); - ADD_COLUMN_SCHEMA_T("status", // 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 - MAX_TENANT_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + MAX_TENANT_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { ObObj in_recyclebin_default; in_recyclebin_default.set_int(0); - ADD_COLUMN_SCHEMA_T("in_recyclebin", // 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 - true, // is_nullable - false, // is_autoincrement - in_recyclebin_default, - in_recyclebin_default); // default_value + ADD_COLUMN_SCHEMA_T("in_recyclebin", //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 + true, //is_nullable + false, //is_autoincrement + in_recyclebin_default, + in_recyclebin_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4619,17 +4613,16 @@ int ObInnerTableSchema::all_tenant_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_table_privilege_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_table_privilege_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4665,21 +4658,21 @@ int ObInnerTableSchema::all_table_privilege_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -4688,290 +4681,290 @@ int ObInnerTableSchema::all_table_privilege_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_name", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_CORE_TALBE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_name", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_CORE_TALBE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj priv_alter_default; priv_alter_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter", // 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 - priv_alter_default, - priv_alter_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter", //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 + priv_alter_default, + priv_alter_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_default; priv_create_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create", // 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 - priv_create_default, - priv_create_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create", //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 + priv_create_default, + priv_create_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_delete_default; priv_delete_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_delete", // 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 - priv_delete_default, - priv_delete_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_delete", //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 + priv_delete_default, + priv_delete_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_drop_default; priv_drop_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_drop", // 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 - priv_drop_default, - priv_drop_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_drop", //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 + priv_drop_default, + priv_drop_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_grant_option_default; priv_grant_option_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_grant_option", // 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 - priv_grant_option_default, - priv_grant_option_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_grant_option", //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 + priv_grant_option_default, + priv_grant_option_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_insert_default; priv_insert_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_insert", // 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 - priv_insert_default, - priv_insert_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_insert", //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 + priv_insert_default, + priv_insert_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_update_default; priv_update_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_update", // 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 - priv_update_default, - priv_update_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_update", //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 + priv_update_default, + priv_update_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_select_default; priv_select_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_select", // 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 - priv_select_default, - priv_select_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_select", //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 + priv_select_default, + priv_select_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_index_default; priv_index_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_index", // 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 - priv_index_default, - priv_index_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_index", //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 + priv_index_default, + priv_index_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_view_default; priv_create_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_view", // 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 - priv_create_view_default, - priv_create_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_view", //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 + priv_create_view_default, + priv_create_view_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_show_view_default; priv_show_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_show_view", // 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 - priv_show_view_default, - priv_show_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_show_view", //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 + priv_show_view_default, + priv_show_view_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -4989,17 +4982,16 @@ int ObInnerTableSchema::all_table_privilege_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_table_privilege_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_table_privilege_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5035,21 +5027,21 @@ int ObInnerTableSchema::all_table_privilege_history_schema(ObTableSchema& table_ gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -5058,320 +5050,320 @@ int ObInnerTableSchema::all_table_privilege_history_schema(ObTableSchema& table_ gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_name", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_CORE_TALBE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_name", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_CORE_TALBE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj priv_alter_default; priv_alter_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter", // 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 - true, // is_nullable - false, // is_autoincrement - priv_alter_default, - priv_alter_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter", //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 + true, //is_nullable + false, //is_autoincrement + priv_alter_default, + priv_alter_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_default; priv_create_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_default, - priv_create_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_default, + priv_create_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_delete_default; priv_delete_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_delete", // 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 - true, // is_nullable - false, // is_autoincrement - priv_delete_default, - priv_delete_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_delete", //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 + true, //is_nullable + false, //is_autoincrement + priv_delete_default, + priv_delete_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_drop_default; priv_drop_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_drop", // 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 - true, // is_nullable - false, // is_autoincrement - priv_drop_default, - priv_drop_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_drop", //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 + true, //is_nullable + false, //is_autoincrement + priv_drop_default, + priv_drop_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_grant_option_default; priv_grant_option_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_grant_option", // 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 - true, // is_nullable - false, // is_autoincrement - priv_grant_option_default, - priv_grant_option_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_grant_option", //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 + true, //is_nullable + false, //is_autoincrement + priv_grant_option_default, + priv_grant_option_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_insert_default; priv_insert_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_insert", // 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 - true, // is_nullable - false, // is_autoincrement - priv_insert_default, - priv_insert_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_insert", //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 + true, //is_nullable + false, //is_autoincrement + priv_insert_default, + priv_insert_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_update_default; priv_update_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_update", // 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 - true, // is_nullable - false, // is_autoincrement - priv_update_default, - priv_update_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_update", //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 + true, //is_nullable + false, //is_autoincrement + priv_update_default, + priv_update_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_select_default; priv_select_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_select", // 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 - true, // is_nullable - false, // is_autoincrement - priv_select_default, - priv_select_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_select", //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 + true, //is_nullable + false, //is_autoincrement + priv_select_default, + priv_select_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_index_default; priv_index_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_index", // 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 - true, // is_nullable - false, // is_autoincrement - priv_index_default, - priv_index_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_index", //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 + true, //is_nullable + false, //is_autoincrement + priv_index_default, + priv_index_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_view_default; priv_create_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_view", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_view_default, - priv_create_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_view", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_view_default, + priv_create_view_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_show_view_default; priv_show_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_show_view", // 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 - true, // is_nullable - false, // is_autoincrement - priv_show_view_default, - priv_show_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_show_view", //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 + true, //is_nullable + false, //is_autoincrement + priv_show_view_default, + priv_show_view_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -5389,17 +5381,16 @@ int ObInnerTableSchema::all_table_privilege_history_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_database_privilege_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_database_privilege_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5435,21 +5426,21 @@ int ObInnerTableSchema::all_database_privilege_schema(ObTableSchema& table_schem gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -5458,275 +5449,275 @@ int ObInnerTableSchema::all_database_privilege_schema(ObTableSchema& table_schem gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj priv_alter_default; priv_alter_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter", // 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 - priv_alter_default, - priv_alter_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter", //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 + priv_alter_default, + priv_alter_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_default; priv_create_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create", // 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 - priv_create_default, - priv_create_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create", //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 + priv_create_default, + priv_create_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_delete_default; priv_delete_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_delete", // 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 - priv_delete_default, - priv_delete_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_delete", //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 + priv_delete_default, + priv_delete_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_drop_default; priv_drop_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_drop", // 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 - priv_drop_default, - priv_drop_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_drop", //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 + priv_drop_default, + priv_drop_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_grant_option_default; priv_grant_option_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_grant_option", // 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 - priv_grant_option_default, - priv_grant_option_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_grant_option", //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 + priv_grant_option_default, + priv_grant_option_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_insert_default; priv_insert_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_insert", // 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 - priv_insert_default, - priv_insert_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_insert", //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 + priv_insert_default, + priv_insert_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_update_default; priv_update_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_update", // 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 - priv_update_default, - priv_update_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_update", //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 + priv_update_default, + priv_update_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_select_default; priv_select_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_select", // 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 - priv_select_default, - priv_select_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_select", //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 + priv_select_default, + priv_select_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_index_default; priv_index_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_index", // 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 - priv_index_default, - priv_index_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_index", //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 + priv_index_default, + priv_index_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_view_default; priv_create_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_view", // 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 - priv_create_view_default, - priv_create_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_view", //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 + priv_create_view_default, + priv_create_view_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_show_view_default; priv_show_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_show_view", // 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 - priv_show_view_default, - priv_show_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_show_view", //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 + priv_show_view_default, + priv_show_view_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -5744,17 +5735,16 @@ int ObInnerTableSchema::all_database_privilege_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_database_privilege_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_database_privilege_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5790,21 +5780,21 @@ int ObInnerTableSchema::all_database_privilege_history_schema(ObTableSchema& tab gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -5813,305 +5803,305 @@ int ObInnerTableSchema::all_database_privilege_history_schema(ObTableSchema& tab gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj priv_alter_default; priv_alter_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter", // 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 - true, // is_nullable - false, // is_autoincrement - priv_alter_default, - priv_alter_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter", //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 + true, //is_nullable + false, //is_autoincrement + priv_alter_default, + priv_alter_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_default; priv_create_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_default, - priv_create_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_default, + priv_create_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_delete_default; priv_delete_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_delete", // 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 - true, // is_nullable - false, // is_autoincrement - priv_delete_default, - priv_delete_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_delete", //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 + true, //is_nullable + false, //is_autoincrement + priv_delete_default, + priv_delete_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_drop_default; priv_drop_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_drop", // 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 - true, // is_nullable - false, // is_autoincrement - priv_drop_default, - priv_drop_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_drop", //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 + true, //is_nullable + false, //is_autoincrement + priv_drop_default, + priv_drop_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_grant_option_default; priv_grant_option_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_grant_option", // 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 - true, // is_nullable - false, // is_autoincrement - priv_grant_option_default, - priv_grant_option_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_grant_option", //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 + true, //is_nullable + false, //is_autoincrement + priv_grant_option_default, + priv_grant_option_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_insert_default; priv_insert_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_insert", // 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 - true, // is_nullable - false, // is_autoincrement - priv_insert_default, - priv_insert_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_insert", //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 + true, //is_nullable + false, //is_autoincrement + priv_insert_default, + priv_insert_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_update_default; priv_update_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_update", // 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 - true, // is_nullable - false, // is_autoincrement - priv_update_default, - priv_update_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_update", //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 + true, //is_nullable + false, //is_autoincrement + priv_update_default, + priv_update_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_select_default; priv_select_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_select", // 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 - true, // is_nullable - false, // is_autoincrement - priv_select_default, - priv_select_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_select", //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 + true, //is_nullable + false, //is_autoincrement + priv_select_default, + priv_select_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_index_default; priv_index_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_index", // 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 - true, // is_nullable - false, // is_autoincrement - priv_index_default, - priv_index_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_index", //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 + true, //is_nullable + false, //is_autoincrement + priv_index_default, + priv_index_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_view_default; priv_create_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_view", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_view_default, - priv_create_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_view", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_view_default, + priv_create_view_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_show_view_default; priv_show_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_show_view", // 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 - true, // is_nullable - false, // is_autoincrement - priv_show_view_default, - priv_show_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_show_view", //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 + true, //is_nullable + false, //is_autoincrement + priv_show_view_default, + priv_show_view_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -6129,17 +6119,16 @@ int ObInnerTableSchema::all_database_privilege_history_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_table_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_table_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6175,21 +6164,21 @@ int ObInnerTableSchema::all_table_history_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -6198,1229 +6187,1229 @@ int ObInnerTableSchema::all_table_history_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj table_name_default; table_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("table_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - table_name_default, - table_name_default); // default_value + ADD_COLUMN_SCHEMA_T("table_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + table_name_default, + table_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("load_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("load_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey_column_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("rowkey_column_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_column_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("index_column_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_used_column_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_used_column_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("autoinc_column_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("autoinc_column_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj auto_increment_default; auto_increment_default.set_uint64(1); - ADD_COLUMN_SCHEMA_T("auto_increment", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - auto_increment_default, - auto_increment_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_increment", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + auto_increment_default, + auto_increment_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("read_only", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("read_only", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey_split_pos", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("rowkey_split_pos", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("expire_condition", // 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 - OB_MAX_EXPIRE_INFO_STRING_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("expire_condition", //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 + OB_MAX_EXPIRE_INFO_STRING_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_use_bloomfilter", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_use_bloomfilter", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj comment_default; comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - comment_default, - comment_default); // default_value + ADD_COLUMN_SCHEMA_T("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + comment_default, + comment_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_table_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_table_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_status", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("index_status", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tablegroup_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("progressive_merge_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("progressive_merge_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("index_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_level", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_level", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_func_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_func_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_func_expr", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_func_expr", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_func_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_func_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_func_expr", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_func_expr", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_mem_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_mem_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_definition", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("view_definition", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_check_option", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("view_check_option", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_is_updatable", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("view_is_updatable", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_list", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone_list", //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 + MAX_ZONE_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj index_using_type_default; index_using_type_default.set_int(USING_BTREE); - ADD_COLUMN_SCHEMA_T("index_using_type", // 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 - true, // is_nullable - false, // is_autoincrement - index_using_type_default, - index_using_type_default); // default_value + ADD_COLUMN_SCHEMA_T("index_using_type", //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 + true, //is_nullable + false, //is_autoincrement + index_using_type_default, + index_using_type_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parser_name", // 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 - OB_MAX_PARSER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parser_name", //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 + OB_MAX_PARSER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj index_attributes_set_default; index_attributes_set_default.set_int(0); - ADD_COLUMN_SCHEMA_T("index_attributes_set", // 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 - true, // is_nullable - false, // is_autoincrement - index_attributes_set_default, - index_attributes_set_default); // default_value + ADD_COLUMN_SCHEMA_T("index_attributes_set", //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 + true, //is_nullable + false, //is_autoincrement + index_attributes_set_default, + index_attributes_set_default); //default_value } if (OB_SUCC(ret)) { ObObj locality_default; locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - locality_default, - locality_default); // default_value + ADD_COLUMN_SCHEMA_T("locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + locality_default, + locality_default); //default_value } if (OB_SUCC(ret)) { ObObj tablet_size_default; tablet_size_default.set_int(OB_DEFAULT_TABLET_SIZE); - ADD_COLUMN_SCHEMA_T("tablet_size", // 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 - true, // is_nullable - false, // is_autoincrement - tablet_size_default, - tablet_size_default); // default_value + ADD_COLUMN_SCHEMA_T("tablet_size", //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 + true, //is_nullable + false, //is_autoincrement + tablet_size_default, + tablet_size_default); //default_value } if (OB_SUCC(ret)) { ObObj pctfree_default; pctfree_default.set_int(OB_DEFAULT_PCTFREE); - ADD_COLUMN_SCHEMA_T("pctfree", // 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 - true, // is_nullable - false, // is_autoincrement - pctfree_default, - pctfree_default); // default_value + ADD_COLUMN_SCHEMA_T("pctfree", //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 + true, //is_nullable + false, //is_autoincrement + pctfree_default, + pctfree_default); //default_value } if (OB_SUCC(ret)) { ObObj previous_locality_default; previous_locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("previous_locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - previous_locality_default, - previous_locality_default); // default_value + ADD_COLUMN_SCHEMA_T("previous_locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + previous_locality_default, + previous_locality_default); //default_value } if (OB_SUCC(ret)) { ObObj max_used_part_id_default; max_used_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("max_used_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - max_used_part_id_default, - max_used_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("max_used_part_id", //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 + true, //is_nullable + false, //is_autoincrement + max_used_part_id_default, + max_used_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_cnt_within_partition_table_default; partition_cnt_within_partition_table_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("partition_cnt_within_partition_table", // 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 - true, // is_nullable - false, // is_autoincrement - partition_cnt_within_partition_table_default, - partition_cnt_within_partition_table_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_cnt_within_partition_table", //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 + true, //is_nullable + false, //is_autoincrement + partition_cnt_within_partition_table_default, + partition_cnt_within_partition_table_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_status_default; partition_status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_status", // 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 - true, // is_nullable - false, // is_autoincrement - partition_status_default, - partition_status_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_status", //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 + true, //is_nullable + false, //is_autoincrement + partition_status_default, + partition_status_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_schema_version_default; partition_schema_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - partition_schema_version_default, - partition_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + partition_schema_version_default, + partition_schema_version_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_used_constraint_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_used_constraint_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj session_id_default; session_id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("session_id", // 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 - true, // is_nullable - false, // is_autoincrement - session_id_default, - session_id_default); // default_value + ADD_COLUMN_SCHEMA_T("session_id", //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 + true, //is_nullable + false, //is_autoincrement + session_id_default, + session_id_default); //default_value } if (OB_SUCC(ret)) { ObObj pk_comment_default; pk_comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("pk_comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - pk_comment_default, - pk_comment_default); // default_value + ADD_COLUMN_SCHEMA_T("pk_comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + pk_comment_default, + pk_comment_default); //default_value } if (OB_SUCC(ret)) { ObObj sess_active_time_default; sess_active_time_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sess_active_time", // 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 - true, // is_nullable - false, // is_autoincrement - sess_active_time_default, - sess_active_time_default); // default_value + ADD_COLUMN_SCHEMA_T("sess_active_time", //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 + true, //is_nullable + false, //is_autoincrement + sess_active_time_default, + sess_active_time_default); //default_value } if (OB_SUCC(ret)) { ObObj row_store_type_default; row_store_type_default.set_varchar(ObString::make_string("FLAT_ROW_STORE")); - ADD_COLUMN_SCHEMA_T("row_store_type", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - row_store_type_default, - row_store_type_default); // default_value + ADD_COLUMN_SCHEMA_T("row_store_type", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + row_store_type_default, + row_store_type_default); //default_value } if (OB_SUCC(ret)) { ObObj store_format_default; store_format_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("store_format", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - store_format_default, - store_format_default); // default_value + ADD_COLUMN_SCHEMA_T("store_format", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + store_format_default, + store_format_default); //default_value } if (OB_SUCC(ret)) { ObObj duplicate_scope_default; duplicate_scope_default.set_int(0); - ADD_COLUMN_SCHEMA_T("duplicate_scope", // 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 - true, // is_nullable - false, // is_autoincrement - duplicate_scope_default, - duplicate_scope_default); // default_value + ADD_COLUMN_SCHEMA_T("duplicate_scope", //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 + true, //is_nullable + false, //is_autoincrement + duplicate_scope_default, + duplicate_scope_default); //default_value } if (OB_SUCC(ret)) { ObObj binding_default; binding_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("binding", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - binding_default, - binding_default); // default_value + ADD_COLUMN_SCHEMA_T("binding", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + binding_default, + binding_default); //default_value } if (OB_SUCC(ret)) { ObObj progressive_merge_round_default; progressive_merge_round_default.set_int(0); - ADD_COLUMN_SCHEMA_T("progressive_merge_round", // 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 - true, // is_nullable - false, // is_autoincrement - progressive_merge_round_default, - progressive_merge_round_default); // default_value + ADD_COLUMN_SCHEMA_T("progressive_merge_round", //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 + true, //is_nullable + false, //is_autoincrement + progressive_merge_round_default, + progressive_merge_round_default); //default_value } if (OB_SUCC(ret)) { ObObj storage_format_version_default; storage_format_version_default.set_int(2); - ADD_COLUMN_SCHEMA_T("storage_format_version", // 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 - true, // is_nullable - false, // is_autoincrement - storage_format_version_default, - storage_format_version_default); // default_value + ADD_COLUMN_SCHEMA_T("storage_format_version", //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 + true, //is_nullable + false, //is_autoincrement + storage_format_version_default, + storage_format_version_default); //default_value } if (OB_SUCC(ret)) { ObObj table_mode_default; table_mode_default.set_int(0); - ADD_COLUMN_SCHEMA_T("table_mode", // 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 - true, // is_nullable - false, // is_autoincrement - table_mode_default, - table_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("table_mode", //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 + true, //is_nullable + false, //is_autoincrement + table_mode_default, + table_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj encryption_default; encryption_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("encryption", // 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 - OB_MAX_ENCRYPTION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - encryption_default, - encryption_default); // default_value + ADD_COLUMN_SCHEMA_T("encryption", //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 + OB_MAX_ENCRYPTION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + encryption_default, + encryption_default); //default_value } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - true, // is_nullable - false, // is_autoincrement - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + true, //is_nullable + false, //is_autoincrement + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj is_sub_part_template_default; is_sub_part_template_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("is_sub_part_template", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - is_sub_part_template_default, - is_sub_part_template_default); // default_value + ADD_COLUMN_SCHEMA_T("is_sub_part_template", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + is_sub_part_template_default, + is_sub_part_template_default); //default_value } if (OB_SUCC(ret)) { ObObj dop_default; dop_default.set_int(1); - ADD_COLUMN_SCHEMA_T("dop", // 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 - true, // is_nullable - false, // is_autoincrement - dop_default, - dop_default); // default_value + ADD_COLUMN_SCHEMA_T("dop", //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 + true, //is_nullable + false, //is_autoincrement + dop_default, + dop_default); //default_value } if (OB_SUCC(ret)) { ObObj character_set_client_default; character_set_client_default.set_int(0); - ADD_COLUMN_SCHEMA_T("character_set_client", // 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 - true, // is_nullable - false, // is_autoincrement - character_set_client_default, - character_set_client_default); // default_value + ADD_COLUMN_SCHEMA_T("character_set_client", //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 + true, //is_nullable + false, //is_autoincrement + character_set_client_default, + character_set_client_default); //default_value } if (OB_SUCC(ret)) { ObObj collation_connection_default; collation_connection_default.set_int(0); - ADD_COLUMN_SCHEMA_T("collation_connection", // 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 - true, // is_nullable - false, // is_autoincrement - collation_connection_default, - collation_connection_default); // default_value + ADD_COLUMN_SCHEMA_T("collation_connection", //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 + true, //is_nullable + false, //is_autoincrement + collation_connection_default, + collation_connection_default); //default_value } if (OB_SUCC(ret)) { ObObj auto_part_size_default; auto_part_size_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("auto_part_size", // 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 - true, // is_nullable - false, // is_autoincrement - auto_part_size_default, - auto_part_size_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_part_size", //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 + true, //is_nullable + false, //is_autoincrement + auto_part_size_default, + auto_part_size_default); //default_value } if (OB_SUCC(ret)) { ObObj auto_part_default; auto_part_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("auto_part", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - auto_part_default, - auto_part_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_part", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + auto_part_default, + auto_part_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -7438,17 +7427,16 @@ int ObInnerTableSchema::all_table_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_column_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_column_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7484,21 +7472,21 @@ int ObInnerTableSchema::all_column_history_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -7507,461 +7495,461 @@ int ObInnerTableSchema::all_column_history_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj column_name_default; column_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("column_name", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - column_name_default, - column_name_default); // default_value + ADD_COLUMN_SCHEMA_T("column_name", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + column_name_default, + column_name_default); //default_value } if (OB_SUCC(ret)) { ObObj rowkey_position_default; rowkey_position_default.set_int(0); - ADD_COLUMN_SCHEMA_T("rowkey_position", // 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 - true, // is_nullable - false, // is_autoincrement - rowkey_position_default, - rowkey_position_default); // default_value + ADD_COLUMN_SCHEMA_T("rowkey_position", //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 + true, //is_nullable + false, //is_autoincrement + rowkey_position_default, + rowkey_position_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_position", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("index_position", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("order_in_rowkey", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("order_in_rowkey", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_key_position", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition_key_position", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_length", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_length", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_precision", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_precision", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_scale", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_scale", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zero_fill", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zero_fill", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("nullable", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("nullable", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("on_update_current_timestamp", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("on_update_current_timestamp", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("autoincrement", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("autoincrement", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj is_hidden_default; is_hidden_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_hidden", // 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 - true, // is_nullable - false, // is_autoincrement - is_hidden_default, - is_hidden_default); // default_value + ADD_COLUMN_SCHEMA_T("is_hidden", //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 + true, //is_nullable + false, //is_autoincrement + is_hidden_default, + is_hidden_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("orig_default_value", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("orig_default_value", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_default_value", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cur_default_value", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj column_flags_default; column_flags_default.set_int(0); - ADD_COLUMN_SCHEMA_T("column_flags", // 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 - true, // is_nullable - false, // is_autoincrement - column_flags_default, - column_flags_default); // default_value + ADD_COLUMN_SCHEMA_T("column_flags", //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 + true, //is_nullable + false, //is_autoincrement + column_flags_default, + column_flags_default); //default_value } if (OB_SUCC(ret)) { ObObj prev_column_id_default; prev_column_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("prev_column_id", // 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 - true, // is_nullable - false, // is_autoincrement - prev_column_id_default, - prev_column_id_default); // default_value + ADD_COLUMN_SCHEMA_T("prev_column_id", //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 + true, //is_nullable + false, //is_autoincrement + prev_column_id_default, + prev_column_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("extended_type_info", // 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_VARBINARY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("extended_type_info", //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_VARBINARY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("orig_default_value_v2", // 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_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("orig_default_value_v2", //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_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_default_value_v2", // 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_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cur_default_value_v2", //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_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -7979,17 +7967,16 @@ int ObInnerTableSchema::all_column_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_zone_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_zone_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8025,21 +8012,21 @@ int ObInnerTableSchema::all_zone_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -8048,81 +8035,81 @@ int ObInnerTableSchema::all_zone_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - TABLE_MAX_KEY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + TABLE_MAX_KEY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 + ADD_COLUMN_SCHEMA("value", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - MAX_ZONE_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + MAX_ZONE_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8132,17 +8119,16 @@ int ObInnerTableSchema::all_zone_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_server_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_server_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8178,21 +8164,21 @@ int ObInnerTableSchema::all_server_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -8201,247 +8187,247 @@ int ObInnerTableSchema::all_server_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("id", // 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 + ADD_COLUMN_SCHEMA("id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("inner_port", // 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 + ADD_COLUMN_SCHEMA("inner_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("with_rootserver", // 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 + ADD_COLUMN_SCHEMA("with_rootserver", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_SERVER_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_SERVER_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_migrate_in_time", // 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 + ADD_COLUMN_SCHEMA("block_migrate_in_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("build_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 - OB_SERVER_VERSION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("build_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 + OB_SERVER_VERSION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj stop_time_default; stop_time_default.set_int(0); - ADD_COLUMN_SCHEMA_T("stop_time", // 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 - stop_time_default, - stop_time_default); // default_value + ADD_COLUMN_SCHEMA_T("stop_time", //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 + stop_time_default, + stop_time_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_service_time", // 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 + ADD_COLUMN_SCHEMA("start_service_time", //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 } if (OB_SUCC(ret)) { ObObj first_sessid_default; first_sessid_default.set_int(0); - ADD_COLUMN_SCHEMA_T("first_sessid", // 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 - first_sessid_default, - first_sessid_default); // default_value + ADD_COLUMN_SCHEMA_T("first_sessid", //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 + first_sessid_default, + first_sessid_default); //default_value } if (OB_SUCC(ret)) { ObObj with_partition_default; with_partition_default.set_int(0); - ADD_COLUMN_SCHEMA_T("with_partition", // 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 - with_partition_default, - with_partition_default); // default_value + ADD_COLUMN_SCHEMA_T("with_partition", //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 + with_partition_default, + with_partition_default); //default_value } if (OB_SUCC(ret)) { ObObj last_offline_time_default; last_offline_time_default.set_int(0); - ADD_COLUMN_SCHEMA_T("last_offline_time", // 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 - last_offline_time_default, - last_offline_time_default); // default_value + ADD_COLUMN_SCHEMA_T("last_offline_time", //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 + last_offline_time_default, + last_offline_time_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8451,17 +8437,16 @@ int ObInnerTableSchema::all_server_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_sys_parameter_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_sys_parameter_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8497,21 +8482,21 @@ int ObInnerTableSchema::all_sys_parameter_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -8520,261 +8505,261 @@ int ObInnerTableSchema::all_sys_parameter_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_type", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - SERVER_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_type", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + SERVER_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // column_name - ++column_id, // column_id - 5, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_CONFIG_NAME_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //column_name + ++column_id, //column_id + 5, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_CONFIG_NAME_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 - OB_MAX_CONFIG_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_type", //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 + OB_MAX_CONFIG_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value_strict", // 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 - OB_MAX_EXTRA_CONFIG_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value_strict", //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 + OB_MAX_EXTRA_CONFIG_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_CONFIG_INFO_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_CONFIG_INFO_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("need_reboot", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("need_reboot", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("section", // 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 - OB_MAX_CONFIG_SECTION_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("section", //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 + OB_MAX_CONFIG_SECTION_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("visible_level", // 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 - OB_MAX_CONFIG_VISIBLE_LEVEL_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("visible_level", //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 + OB_MAX_CONFIG_VISIBLE_LEVEL_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //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 - 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 + ADD_COLUMN_SCHEMA("config_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scope", // 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 - OB_MAX_CONFIG_SCOPE_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("scope", //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 + OB_MAX_CONFIG_SCOPE_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("source", // 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 - OB_MAX_CONFIG_SOURCE_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("source", //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 + OB_MAX_CONFIG_SOURCE_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("edit_level", // 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 - OB_MAX_CONFIG_EDIT_LEVEL_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("edit_level", //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 + OB_MAX_CONFIG_EDIT_LEVEL_LEN, //column_length + -1, //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(FLAT_ROW_STORE); @@ -8784,17 +8769,16 @@ int ObInnerTableSchema::all_sys_parameter_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_parameter_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_parameter_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8830,21 +8814,21 @@ int ObInnerTableSchema::tenant_parameter_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -8853,216 +8837,216 @@ int ObInnerTableSchema::tenant_parameter_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_type", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - SERVER_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_type", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + SERVER_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // column_name - ++column_id, // column_id - 5, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_CONFIG_NAME_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //column_name + ++column_id, //column_id + 5, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_CONFIG_NAME_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 - OB_MAX_CONFIG_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_type", //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 + OB_MAX_CONFIG_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_CONFIG_INFO_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_CONFIG_INFO_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("section", // 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 - OB_MAX_CONFIG_SECTION_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("section", //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 + OB_MAX_CONFIG_SECTION_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scope", // 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 - OB_MAX_CONFIG_SCOPE_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("scope", //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 + OB_MAX_CONFIG_SCOPE_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("source", // 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 - OB_MAX_CONFIG_SOURCE_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("source", //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 + OB_MAX_CONFIG_SOURCE_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("edit_level", // 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 - OB_MAX_CONFIG_EDIT_LEVEL_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("edit_level", //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 + OB_MAX_CONFIG_EDIT_LEVEL_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //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 - 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 + ADD_COLUMN_SCHEMA("config_version", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9072,17 +9056,16 @@ int ObInnerTableSchema::tenant_parameter_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_sys_variable_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_sys_variable_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9118,21 +9101,21 @@ int ObInnerTableSchema::all_sys_variable_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -9141,168 +9124,168 @@ int ObInnerTableSchema::all_sys_variable_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj name_default; name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_CONFIG_NAME_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - name_default, - name_default); // default_value + ADD_COLUMN_SCHEMA_T("name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_CONFIG_NAME_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + name_default, + name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 + ADD_COLUMN_SCHEMA("data_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_CONFIG_INFO_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_CONFIG_INFO_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flags", // 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 + ADD_COLUMN_SCHEMA("flags", //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 } if (OB_SUCC(ret)) { ObObj min_val_default; min_val_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("min_val", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - min_val_default, - min_val_default); // default_value + ADD_COLUMN_SCHEMA_T("min_val", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + min_val_default, + min_val_default); //default_value } if (OB_SUCC(ret)) { ObObj max_val_default; max_val_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("max_val", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - max_val_default, - max_val_default); // default_value + ADD_COLUMN_SCHEMA_T("max_val", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + max_val_default, + max_val_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -9320,17 +9303,16 @@ int ObInnerTableSchema::all_sys_variable_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_sys_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_sys_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9366,21 +9348,21 @@ int ObInnerTableSchema::all_sys_stat_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -9389,111 +9371,111 @@ int ObInnerTableSchema::all_sys_stat_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_CONFIG_NAME_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_CONFIG_NAME_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 + ADD_COLUMN_SCHEMA("data_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_CONFIG_INFO_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_CONFIG_INFO_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -9511,17 +9493,16 @@ int ObInnerTableSchema::all_sys_stat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_column_statistic_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_column_statistic_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9557,21 +9538,21 @@ int ObInnerTableSchema::all_column_statistic_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -9580,201 +9561,201 @@ int ObInnerTableSchema::all_column_statistic_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("num_distinct", // 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 + ADD_COLUMN_SCHEMA("num_distinct", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("num_null", // 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 + ADD_COLUMN_SCHEMA("num_null", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_value", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("min_value", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_value", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_value", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("llc_bitmap", // 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 - MAX_LLC_BITMAP_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("llc_bitmap", //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 + MAX_LLC_BITMAP_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("llc_bitmap_size", // 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 + ADD_COLUMN_SCHEMA("llc_bitmap_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("version", // 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 + ADD_COLUMN_SCHEMA("version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_rebuild_version", // 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 + ADD_COLUMN_SCHEMA("last_rebuild_version", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -9792,17 +9773,16 @@ int ObInnerTableSchema::all_column_statistic_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_unit_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_unit_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9838,21 +9818,21 @@ int ObInnerTableSchema::all_unit_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -9861,206 +9841,206 @@ int ObInnerTableSchema::all_unit_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("unit_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("resource_pool_id", // 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 + ADD_COLUMN_SCHEMA("resource_pool_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("group_id", // 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 + ADD_COLUMN_SCHEMA("group_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("migrate_from_svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("migrate_from_svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("migrate_from_svr_port", // 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 + ADD_COLUMN_SCHEMA("migrate_from_svr_port", //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 } if (OB_SUCC(ret)) { - ++column_id; // for [discard]temporary_unit_svr_ip + ++column_id; // for [discard]temporary_unit_svr_ip } if (OB_SUCC(ret)) { - ++column_id; // for [discard]temporary_unit_svr_port + ++column_id; // for [discard]temporary_unit_svr_port } if (OB_SUCC(ret)) { ObObj manual_migrate_default; manual_migrate_default.set_tinyint(0); - ADD_COLUMN_SCHEMA_T("manual_migrate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - manual_migrate_default, - manual_migrate_default); // default_value + ADD_COLUMN_SCHEMA_T("manual_migrate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + manual_migrate_default, + manual_migrate_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("ACTIVE")); - ADD_COLUMN_SCHEMA_T("status", // 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 - MAX_UNIT_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + MAX_UNIT_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { ObObj replica_type_default; replica_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("replica_type", // 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 - replica_type_default, - replica_type_default); // default_value + ADD_COLUMN_SCHEMA_T("replica_type", //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 + replica_type_default, + replica_type_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10070,17 +10050,16 @@ int ObInnerTableSchema::all_unit_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_unit_config_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_unit_config_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10116,21 +10095,21 @@ int ObInnerTableSchema::all_unit_config_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -10139,171 +10118,171 @@ int ObInnerTableSchema::all_unit_config_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_config_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("unit_config_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - MAX_UNIT_CONFIG_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + MAX_UNIT_CONFIG_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_cpu", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_cpu", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_cpu", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("min_cpu", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_memory", // 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 + ADD_COLUMN_SCHEMA("max_memory", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_memory", // 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 + ADD_COLUMN_SCHEMA("min_memory", //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 } 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 - 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 + ADD_COLUMN_SCHEMA("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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_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 + ADD_COLUMN_SCHEMA("min_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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_disk_size", // 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 + ADD_COLUMN_SCHEMA("max_disk_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_session_num", // 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 + ADD_COLUMN_SCHEMA("max_session_num", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10313,17 +10292,16 @@ int ObInnerTableSchema::all_unit_config_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_resource_pool_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_resource_pool_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10359,21 +10337,21 @@ int ObInnerTableSchema::all_resource_pool_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -10382,149 +10360,149 @@ int ObInnerTableSchema::all_resource_pool_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("resource_pool_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("resource_pool_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - MAX_RESOURCE_POOL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + MAX_RESOURCE_POOL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_count", // 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 + ADD_COLUMN_SCHEMA("unit_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_config_id", // 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 + ADD_COLUMN_SCHEMA("unit_config_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_list", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone_list", //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 + MAX_ZONE_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { ObObj replica_type_default; replica_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("replica_type", // 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 - replica_type_default, - replica_type_default); // default_value + ADD_COLUMN_SCHEMA_T("replica_type", //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 + replica_type_default, + replica_type_default); //default_value } if (OB_SUCC(ret)) { ObObj is_tenant_sys_pool_default; is_tenant_sys_pool_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("is_tenant_sys_pool", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_tenant_sys_pool_default, - is_tenant_sys_pool_default); // default_value + ADD_COLUMN_SCHEMA_T("is_tenant_sys_pool", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_tenant_sys_pool_default, + is_tenant_sys_pool_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10534,17 +10512,16 @@ int ObInnerTableSchema::all_resource_pool_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_resource_usage_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_resource_usage_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10575,184 +10552,184 @@ int ObInnerTableSchema::all_tenant_resource_usage_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("report_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("report_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_quota", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_quota", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_quota_used", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_quota_used", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mem_quota", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("mem_quota", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mem_quota_used", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("mem_quota_used", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_quota", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("disk_quota", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_quota_used", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("disk_quota_used", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("iops_quota", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("iops_quota", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("iops_quota_used", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("iops_quota_used", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10762,17 +10739,16 @@ int ObInnerTableSchema::all_tenant_resource_usage_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_sequence_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_sequence_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10808,21 +10784,21 @@ int ObInnerTableSchema::all_sequence_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -10831,130 +10807,130 @@ int ObInnerTableSchema::all_sequence_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_key", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("sequence_key", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_name", // 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 - OB_MAX_SEQUENCE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sequence_name", //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 + OB_MAX_SEQUENCE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_value", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sequence_value", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sync_value", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sync_value", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj migrated_default; migrated_default.set_int(0); - ADD_COLUMN_SCHEMA_T("migrated", // 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 - migrated_default, - migrated_default); // default_value + ADD_COLUMN_SCHEMA_T("migrated", //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 + migrated_default, + migrated_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -10972,17 +10948,16 @@ int ObInnerTableSchema::all_sequence_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_charset_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_charset_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11015,77 +10990,77 @@ int ObInnerTableSchema::all_charset_schema(ObTableSchema& table_schema) if (OB_SUCC(ret)) { ObObj charset_default; charset_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("charset", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - charset_default, - charset_default); // default_value + ADD_COLUMN_SCHEMA_T("charset", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + charset_default, + charset_default); //default_value } if (OB_SUCC(ret)) { ObObj description_default; description_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("description", // 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 - MAX_CHARSET_DESCRIPTION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - description_default, - description_default); // default_value + ADD_COLUMN_SCHEMA_T("description", //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 + MAX_CHARSET_DESCRIPTION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + description_default, + description_default); //default_value } if (OB_SUCC(ret)) { ObObj default_collation_default; default_collation_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("default_collation", // 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 - MAX_COLLATION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - default_collation_default, - default_collation_default); // default_value + ADD_COLUMN_SCHEMA_T("default_collation", //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 + MAX_COLLATION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + default_collation_default, + default_collation_default); //default_value } if (OB_SUCC(ret)) { ObObj max_length_default; max_length_default.set_int(0); - ADD_COLUMN_SCHEMA_T("max_length", // 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_length_default, - max_length_default); // default_value + ADD_COLUMN_SCHEMA_T("max_length", //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_length_default, + max_length_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11095,17 +11070,16 @@ int ObInnerTableSchema::all_charset_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_collation_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_collation_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11138,115 +11112,115 @@ int ObInnerTableSchema::all_collation_schema(ObTableSchema& table_schema) if (OB_SUCC(ret)) { ObObj collation_default; collation_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("collation", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_COLLATION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - collation_default, - collation_default); // default_value + ADD_COLUMN_SCHEMA_T("collation", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_COLLATION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + collation_default, + collation_default); //default_value } if (OB_SUCC(ret)) { ObObj charset_default; charset_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("charset", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - charset_default, - charset_default); // default_value + ADD_COLUMN_SCHEMA_T("charset", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + charset_default, + charset_default); //default_value } if (OB_SUCC(ret)) { ObObj id_default; id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("id", // 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 - id_default, - id_default); // default_value + ADD_COLUMN_SCHEMA_T("id", //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 + id_default, + id_default); //default_value } if (OB_SUCC(ret)) { ObObj is_default_default; is_default_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("is_default", // 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 - MAX_BOOL_STR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_default_default, - is_default_default); // default_value + ADD_COLUMN_SCHEMA_T("is_default", //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 + MAX_BOOL_STR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_default_default, + is_default_default); //default_value } if (OB_SUCC(ret)) { ObObj is_compiled_default; is_compiled_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("is_compiled", // 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 - MAX_BOOL_STR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_compiled_default, - is_compiled_default); // default_value + ADD_COLUMN_SCHEMA_T("is_compiled", //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 + MAX_BOOL_STR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_compiled_default, + is_compiled_default); //default_value } if (OB_SUCC(ret)) { ObObj sortlen_default; sortlen_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sortlen", // 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 - sortlen_default, - sortlen_default); // default_value + ADD_COLUMN_SCHEMA_T("sortlen", //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 + sortlen_default, + sortlen_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11256,17 +11230,16 @@ int ObInnerTableSchema::all_collation_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_local_index_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_local_index_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11302,21 +11275,21 @@ int ObInnerTableSchema::all_local_index_status_schema(ObTableSchema& table_schem gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -11325,145 +11298,145 @@ int ObInnerTableSchema::all_local_index_status_schema(ObTableSchema& table_schem gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("index_table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_status", // 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 + ADD_COLUMN_SCHEMA("index_status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ret_code", // 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 + ADD_COLUMN_SCHEMA("ret_code", //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 } if (OB_SUCC(ret)) { ObObj role_default; role_default.set_int(2); - ADD_COLUMN_SCHEMA_T("role", // 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 - role_default, - role_default); // default_value + ADD_COLUMN_SCHEMA_T("role", //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 + role_default, + role_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -11481,17 +11454,16 @@ int ObInnerTableSchema::all_local_index_status_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_dummy_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_dummy_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11522,18 +11494,18 @@ int ObInnerTableSchema::all_dummy_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("key", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("key", //column_name + ++column_id, //column_id + 1, //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11543,17 +11515,16 @@ int ObInnerTableSchema::all_dummy_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_frozen_map_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_frozen_map_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11584,33 +11555,33 @@ int ObInnerTableSchema::all_frozen_map_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("frozen_version", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("frozen_version", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("frozen_timestamp", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("frozen_timestamp", //column_name + ++column_id, //column_id + 2, //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11620,17 +11591,16 @@ int ObInnerTableSchema::all_frozen_map_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_clog_history_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_clog_history_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11661,138 +11631,138 @@ int ObInnerTableSchema::all_clog_history_info_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("partition_idx", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_log_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("start_log_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_log_timestamp", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("start_log_timestamp", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 6, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 6, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 7, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 7, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("end_log_id", // 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 + ADD_COLUMN_SCHEMA("end_log_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("end_log_timestamp", // 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 + ADD_COLUMN_SCHEMA("end_log_timestamp", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -11810,17 +11780,16 @@ int ObInnerTableSchema::all_clog_history_info_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_clog_history_info_v2_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_clog_history_info_v2_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11856,21 +11825,21 @@ int ObInnerTableSchema::all_clog_history_info_v2_schema(ObTableSchema& table_sch gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -11879,156 +11848,156 @@ int ObInnerTableSchema::all_clog_history_info_v2_schema(ObTableSchema& table_sch gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("partition_idx", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_log_id", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("start_log_id", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_log_timestamp", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("start_log_timestamp", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 6, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 6, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 7, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("end_log_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("end_log_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("end_log_timestamp", // 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 + ADD_COLUMN_SCHEMA("end_log_timestamp", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -12046,17 +12015,16 @@ int ObInnerTableSchema::all_clog_history_info_v2_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_rootservice_event_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_rootservice_event_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -12092,336 +12060,336 @@ int ObInnerTableSchema::all_rootservice_event_history_schema(ObTableSchema& tabl gmt_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - 6, // column_scale - false, // is_nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_default_null, - gmt_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + 6, //column_scale + false, //is_nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_default_null, + gmt_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("module", // 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 - MAX_ROOTSERVICE_EVENT_DESC_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("module", //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 + MAX_ROOTSERVICE_EVENT_DESC_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event", // 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 - MAX_ROOTSERVICE_EVENT_DESC_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("event", //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 + MAX_ROOTSERVICE_EVENT_DESC_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj name1_default; name1_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name1", // 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 - MAX_ROOTSERVICE_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - name1_default, - name1_default); // default_value + ADD_COLUMN_SCHEMA_T("name1", //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 + MAX_ROOTSERVICE_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + name1_default, + name1_default); //default_value } if (OB_SUCC(ret)) { ObObj value1_default; value1_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("value1", // 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 - MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - value1_default, - value1_default); // default_value + ADD_COLUMN_SCHEMA_T("value1", //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 + MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + value1_default, + value1_default); //default_value } if (OB_SUCC(ret)) { ObObj name2_default; name2_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name2", // 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 - MAX_ROOTSERVICE_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - name2_default, - name2_default); // default_value + ADD_COLUMN_SCHEMA_T("name2", //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 + MAX_ROOTSERVICE_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + name2_default, + name2_default); //default_value } if (OB_SUCC(ret)) { ObObj value2_default; value2_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("value2", // 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 - MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - value2_default, - value2_default); // default_value + ADD_COLUMN_SCHEMA_T("value2", //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 + MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + value2_default, + value2_default); //default_value } if (OB_SUCC(ret)) { ObObj name3_default; name3_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name3", // 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 - MAX_ROOTSERVICE_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - name3_default, - name3_default); // default_value + ADD_COLUMN_SCHEMA_T("name3", //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 + MAX_ROOTSERVICE_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + name3_default, + name3_default); //default_value } if (OB_SUCC(ret)) { ObObj value3_default; value3_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("value3", // 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 - MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - value3_default, - value3_default); // default_value + ADD_COLUMN_SCHEMA_T("value3", //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 + MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + value3_default, + value3_default); //default_value } if (OB_SUCC(ret)) { ObObj name4_default; name4_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name4", // 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 - MAX_ROOTSERVICE_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - name4_default, - name4_default); // default_value + ADD_COLUMN_SCHEMA_T("name4", //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 + MAX_ROOTSERVICE_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + name4_default, + name4_default); //default_value } if (OB_SUCC(ret)) { ObObj value4_default; value4_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("value4", // 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 - MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - value4_default, - value4_default); // default_value + ADD_COLUMN_SCHEMA_T("value4", //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 + MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + value4_default, + value4_default); //default_value } if (OB_SUCC(ret)) { ObObj name5_default; name5_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name5", // 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 - MAX_ROOTSERVICE_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - name5_default, - name5_default); // default_value + ADD_COLUMN_SCHEMA_T("name5", //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 + MAX_ROOTSERVICE_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + name5_default, + name5_default); //default_value } if (OB_SUCC(ret)) { ObObj value5_default; value5_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("value5", // 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 - MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - value5_default, - value5_default); // default_value + ADD_COLUMN_SCHEMA_T("value5", //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 + MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + value5_default, + value5_default); //default_value } if (OB_SUCC(ret)) { ObObj name6_default; name6_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name6", // 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 - MAX_ROOTSERVICE_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - name6_default, - name6_default); // default_value + ADD_COLUMN_SCHEMA_T("name6", //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 + MAX_ROOTSERVICE_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + name6_default, + name6_default); //default_value } if (OB_SUCC(ret)) { ObObj value6_default; value6_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("value6", // 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 - MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - value6_default, - value6_default); // default_value + ADD_COLUMN_SCHEMA_T("value6", //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 + MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + value6_default, + value6_default); //default_value } if (OB_SUCC(ret)) { ObObj extra_info_default; extra_info_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("extra_info", // 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 - MAX_ROOTSERVICE_EVENT_EXTRA_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - extra_info_default, - extra_info_default); // default_value + ADD_COLUMN_SCHEMA_T("extra_info", //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 + MAX_ROOTSERVICE_EVENT_EXTRA_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + extra_info_default, + extra_info_default); //default_value } if (OB_SUCC(ret)) { ObObj rs_svr_ip_default; rs_svr_ip_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("rs_svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - rs_svr_ip_default, - rs_svr_ip_default); // default_value + ADD_COLUMN_SCHEMA_T("rs_svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + rs_svr_ip_default, + rs_svr_ip_default); //default_value } if (OB_SUCC(ret)) { ObObj rs_svr_port_default; rs_svr_port_default.set_int(0); - ADD_COLUMN_SCHEMA_T("rs_svr_port", // 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 - true, // is_nullable - false, // is_autoincrement - rs_svr_port_default, - rs_svr_port_default); // default_value + ADD_COLUMN_SCHEMA_T("rs_svr_port", //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 + true, //is_nullable + false, //is_autoincrement + rs_svr_port_default, + rs_svr_port_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -12431,17 +12399,16 @@ int ObInnerTableSchema::all_rootservice_event_history_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_privilege_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_privilege_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -12472,48 +12439,48 @@ int ObInnerTableSchema::all_privilege_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Privilege", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_COLUMN_PRIVILEGE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("Privilege", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_COLUMN_PRIVILEGE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Context", // 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 - MAX_PRIVILEGE_CONTEXT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("Context", //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 + MAX_PRIVILEGE_CONTEXT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Comment", // 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 - MAX_COLUMN_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("Comment", //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 + MAX_COLUMN_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -12523,17 +12490,16 @@ int ObInnerTableSchema::all_privilege_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_outline_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_outline_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -12569,21 +12535,21 @@ int ObInnerTableSchema::all_outline_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -12592,331 +12558,331 @@ int ObInnerTableSchema::all_outline_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("outline_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { ObObj name_default; name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name", // 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 - OB_MAX_OUTLINE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - name_default, - name_default); // default_value + ADD_COLUMN_SCHEMA_T("name", //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 + OB_MAX_OUTLINE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + name_default, + name_default); //default_value } if (OB_SUCC(ret)) { ObObj signature_default; signature_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("signature", // 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_OUTLINE_SIGNATURE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - signature_default, - signature_default); // default_value + ADD_COLUMN_SCHEMA_T("signature", //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_OUTLINE_SIGNATURE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + signature_default, + signature_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_content", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("outline_content", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_text", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_text", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj owner_default; owner_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("owner", // 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 - OB_MAX_USERNAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - owner_default, - owner_default); // default_value + ADD_COLUMN_SCHEMA_T("owner", //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 + OB_MAX_USERNAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + owner_default, + owner_default); //default_value } if (OB_SUCC(ret)) { ObObj used_default; used_default.set_int(0); - ADD_COLUMN_SCHEMA_T("used", // 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 - used_default, - used_default); // default_value + ADD_COLUMN_SCHEMA_T("used", //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 + used_default, + used_default); //default_value } if (OB_SUCC(ret)) { ObObj version_default; version_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("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 - OB_SERVER_VERSION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - version_default, - version_default); // default_value + ADD_COLUMN_SCHEMA_T("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 + OB_SERVER_VERSION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + version_default, + version_default); //default_value } if (OB_SUCC(ret)) { ObObj compatible_default; compatible_default.set_int(1); - ADD_COLUMN_SCHEMA_T("compatible", // 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 - compatible_default, - compatible_default); // default_value + ADD_COLUMN_SCHEMA_T("compatible", //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 + compatible_default, + compatible_default); //default_value } if (OB_SUCC(ret)) { ObObj enabled_default; enabled_default.set_int(1); - ADD_COLUMN_SCHEMA_T("enabled", // 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 - enabled_default, - enabled_default); // default_value + ADD_COLUMN_SCHEMA_T("enabled", //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 + enabled_default, + enabled_default); //default_value } if (OB_SUCC(ret)) { ObObj format_default; format_default.set_int(0); - ADD_COLUMN_SCHEMA_T("format", // 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 - format_default, - format_default); // default_value + ADD_COLUMN_SCHEMA_T("format", //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 + format_default, + format_default); //default_value } if (OB_SUCC(ret)) { ObObj outline_params_default; outline_params_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("outline_params", // 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_OUTLINE_PARAMS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - outline_params_default, - outline_params_default); // default_value + ADD_COLUMN_SCHEMA_T("outline_params", //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_OUTLINE_PARAMS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + outline_params_default, + outline_params_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_target", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("outline_target", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj sql_id_default; sql_id_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sql_id", // 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_SQL_ID_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - sql_id_default, - sql_id_default); // default_value + ADD_COLUMN_SCHEMA_T("sql_id", //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_SQL_ID_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + sql_id_default, + sql_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -12934,17 +12900,16 @@ int ObInnerTableSchema::all_outline_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_outline_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_outline_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -12980,21 +12945,21 @@ int ObInnerTableSchema::all_outline_history_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -13003,346 +12968,346 @@ int ObInnerTableSchema::all_outline_history_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("outline_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj name_default; name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name", // 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 - OB_MAX_OUTLINE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - name_default, - name_default); // default_value + ADD_COLUMN_SCHEMA_T("name", //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 + OB_MAX_OUTLINE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + name_default, + name_default); //default_value } if (OB_SUCC(ret)) { ObObj signature_default; signature_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("signature", // 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_OUTLINE_SIGNATURE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - signature_default, - signature_default); // default_value + ADD_COLUMN_SCHEMA_T("signature", //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_OUTLINE_SIGNATURE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + signature_default, + signature_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_content", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("outline_content", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_text", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_text", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj owner_default; owner_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("owner", // 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 - OB_MAX_USERNAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - owner_default, - owner_default); // default_value + ADD_COLUMN_SCHEMA_T("owner", //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 + OB_MAX_USERNAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + owner_default, + owner_default); //default_value } if (OB_SUCC(ret)) { ObObj used_default; used_default.set_int(0); - ADD_COLUMN_SCHEMA_T("used", // 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 - true, // is_nullable - false, // is_autoincrement - used_default, - used_default); // default_value + ADD_COLUMN_SCHEMA_T("used", //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 + true, //is_nullable + false, //is_autoincrement + used_default, + used_default); //default_value } if (OB_SUCC(ret)) { ObObj version_default; version_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("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 - OB_SERVER_VERSION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - version_default, - version_default); // default_value + ADD_COLUMN_SCHEMA_T("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 + OB_SERVER_VERSION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + version_default, + version_default); //default_value } if (OB_SUCC(ret)) { ObObj compatible_default; compatible_default.set_int(1); - ADD_COLUMN_SCHEMA_T("compatible", // 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 - true, // is_nullable - false, // is_autoincrement - compatible_default, - compatible_default); // default_value + ADD_COLUMN_SCHEMA_T("compatible", //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 + true, //is_nullable + false, //is_autoincrement + compatible_default, + compatible_default); //default_value } if (OB_SUCC(ret)) { ObObj enabled_default; enabled_default.set_int(1); - ADD_COLUMN_SCHEMA_T("enabled", // 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 - true, // is_nullable - false, // is_autoincrement - enabled_default, - enabled_default); // default_value + ADD_COLUMN_SCHEMA_T("enabled", //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 + true, //is_nullable + false, //is_autoincrement + enabled_default, + enabled_default); //default_value } if (OB_SUCC(ret)) { ObObj format_default; format_default.set_int(0); - ADD_COLUMN_SCHEMA_T("format", // 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 - true, // is_nullable - false, // is_autoincrement - format_default, - format_default); // default_value + ADD_COLUMN_SCHEMA_T("format", //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 + true, //is_nullable + false, //is_autoincrement + format_default, + format_default); //default_value } if (OB_SUCC(ret)) { ObObj outline_params_default; outline_params_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("outline_params", // 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_OUTLINE_PARAMS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - outline_params_default, - outline_params_default); // default_value + ADD_COLUMN_SCHEMA_T("outline_params", //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_OUTLINE_PARAMS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + outline_params_default, + outline_params_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_target", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("outline_target", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj sql_id_default; sql_id_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sql_id", // 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_SQL_ID_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - sql_id_default, - sql_id_default); // default_value + ADD_COLUMN_SCHEMA_T("sql_id", //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_SQL_ID_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + sql_id_default, + sql_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -13360,17 +13325,16 @@ int ObInnerTableSchema::all_outline_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_election_event_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_election_event_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -13406,149 +13370,149 @@ int ObInnerTableSchema::all_election_event_history_schema(ObTableSchema& table_s gmt_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - 6, // column_scale - false, // is_nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_default_null, - gmt_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + 6, //column_scale + false, //is_nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_default_null, + gmt_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_idx", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 5, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 5, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event", // 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 - MAX_ELECTION_EVENT_DESC_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("event", //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 + MAX_ELECTION_EVENT_DESC_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj leader_default; leader_default.set_varchar(ObString::make_string("0.0.0.0")); - ADD_COLUMN_SCHEMA_T("leader", // 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 - OB_IP_PORT_STR_BUFF, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - leader_default, - leader_default); // default_value + ADD_COLUMN_SCHEMA_T("leader", //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 + OB_IP_PORT_STR_BUFF, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + leader_default, + leader_default); //default_value } if (OB_SUCC(ret)) { ObObj info_default; info_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("info", // 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 - MAX_ELECTION_EVENT_EXTRA_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - info_default, - info_default); // default_value + ADD_COLUMN_SCHEMA_T("info", //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 + MAX_ELECTION_EVENT_EXTRA_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + info_default, + info_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -13558,17 +13522,16 @@ int ObInnerTableSchema::all_election_event_history_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_recyclebin_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_recyclebin_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -13604,126 +13567,126 @@ int ObInnerTableSchema::all_recyclebin_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_OBJECT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("object_name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_OBJECT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("type", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // 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 + ADD_COLUMN_SCHEMA("tablegroup_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("original_name", // 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 - OB_MAX_ORIGINAL_NANE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("original_name", //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 + OB_MAX_ORIGINAL_NANE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -13741,17 +13704,16 @@ int ObInnerTableSchema::all_recyclebin_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_part_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_part_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -13787,21 +13749,21 @@ int ObInnerTableSchema::all_part_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -13810,510 +13772,510 @@ int ObInnerTableSchema::all_part_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("part_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { ObObj part_name_default; part_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("part_name", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - part_name_default, - part_name_default); // default_value + ADD_COLUMN_SCHEMA_T("part_name", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + part_name_default, + part_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_bound_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("high_bound_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_high_bound_val", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_high_bound_val", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_space", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_space", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_sub_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_sub_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_sub_part_space", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_sub_part_space", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("list_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("list_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_list_val", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_list_val", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_idx", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_idx", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj source_partition_id_default; source_partition_id_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("source_partition_id", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - source_partition_id_default, - source_partition_id_default); // default_value + ADD_COLUMN_SCHEMA_T("source_partition_id", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + source_partition_id_default, + source_partition_id_default); //default_value } if (OB_SUCC(ret)) { ObObj mapping_pg_part_id_default; mapping_pg_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("mapping_pg_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - mapping_pg_part_id_default, - mapping_pg_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("mapping_pg_part_id", //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 + true, //is_nullable + false, //is_autoincrement + mapping_pg_part_id_default, + mapping_pg_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj max_used_sub_part_id_default; max_used_sub_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("max_used_sub_part_id", // 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_used_sub_part_id_default, - max_used_sub_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("max_used_sub_part_id", //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_used_sub_part_id_default, + max_used_sub_part_id_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -14331,17 +14293,16 @@ int ObInnerTableSchema::all_part_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_part_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_part_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -14377,21 +14338,21 @@ int ObInnerTableSchema::all_part_history_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -14400,525 +14361,525 @@ int ObInnerTableSchema::all_part_history_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("part_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj part_name_default; part_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("part_name", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - part_name_default, - part_name_default); // default_value + ADD_COLUMN_SCHEMA_T("part_name", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + part_name_default, + part_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_bound_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("high_bound_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_high_bound_val", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_high_bound_val", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_space", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_space", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_sub_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_sub_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_sub_part_space", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_sub_part_space", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("list_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("list_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_list_val", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_list_val", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_idx", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_idx", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj source_partition_id_default; source_partition_id_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("source_partition_id", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - source_partition_id_default, - source_partition_id_default); // default_value + ADD_COLUMN_SCHEMA_T("source_partition_id", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + source_partition_id_default, + source_partition_id_default); //default_value } if (OB_SUCC(ret)) { ObObj mapping_pg_part_id_default; mapping_pg_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("mapping_pg_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - mapping_pg_part_id_default, - mapping_pg_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("mapping_pg_part_id", //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 + true, //is_nullable + false, //is_autoincrement + mapping_pg_part_id_default, + mapping_pg_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - true, // is_nullable - false, // is_autoincrement - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + true, //is_nullable + false, //is_autoincrement + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj max_used_sub_part_id_default; max_used_sub_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("max_used_sub_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - max_used_sub_part_id_default, - max_used_sub_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("max_used_sub_part_id", //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 + true, //is_nullable + false, //is_autoincrement + max_used_sub_part_id_default, + max_used_sub_part_id_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -14936,17 +14897,16 @@ int ObInnerTableSchema::all_part_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_sub_part_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_sub_part_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -14982,21 +14942,21 @@ int ObInnerTableSchema::all_sub_part_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -15005,390 +14965,390 @@ int ObInnerTableSchema::all_sub_part_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("part_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("sub_part_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { ObObj sub_part_name_default; sub_part_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sub_part_name", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - sub_part_name_default, - sub_part_name_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_name", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + sub_part_name_default, + sub_part_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_bound_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("high_bound_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_high_bound_val", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_high_bound_val", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("list_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("list_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_list_val", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_list_val", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { ObObj sub_part_idx_default; sub_part_idx_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("sub_part_idx", // 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 - sub_part_idx_default, - sub_part_idx_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_idx", //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 + sub_part_idx_default, + sub_part_idx_default); //default_value } if (OB_SUCC(ret)) { ObObj source_partition_id_default; source_partition_id_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("source_partition_id", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - source_partition_id_default, - source_partition_id_default); // default_value + ADD_COLUMN_SCHEMA_T("source_partition_id", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + source_partition_id_default, + source_partition_id_default); //default_value } if (OB_SUCC(ret)) { ObObj mapping_pg_sub_part_id_default; mapping_pg_sub_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("mapping_pg_sub_part_id", // 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 - mapping_pg_sub_part_id_default, - mapping_pg_sub_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("mapping_pg_sub_part_id", //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 + mapping_pg_sub_part_id_default, + mapping_pg_sub_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -15406,17 +15366,16 @@ int ObInnerTableSchema::all_sub_part_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_sub_part_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_sub_part_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -15452,21 +15411,21 @@ int ObInnerTableSchema::all_sub_part_history_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -15475,405 +15434,405 @@ int ObInnerTableSchema::all_sub_part_history_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("part_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("sub_part_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj sub_part_name_default; sub_part_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sub_part_name", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - sub_part_name_default, - sub_part_name_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_name", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + sub_part_name_default, + sub_part_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_bound_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("high_bound_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_high_bound_val", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_high_bound_val", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("list_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("list_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_list_val", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_list_val", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - true, // is_nullable - false, // is_autoincrement - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + true, //is_nullable + false, //is_autoincrement + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { ObObj sub_part_idx_default; sub_part_idx_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("sub_part_idx", // 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 - true, // is_nullable - false, // is_autoincrement - sub_part_idx_default, - sub_part_idx_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_idx", //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 + true, //is_nullable + false, //is_autoincrement + sub_part_idx_default, + sub_part_idx_default); //default_value } if (OB_SUCC(ret)) { ObObj source_partition_id_default; source_partition_id_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("source_partition_id", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - source_partition_id_default, - source_partition_id_default); // default_value + ADD_COLUMN_SCHEMA_T("source_partition_id", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + source_partition_id_default, + source_partition_id_default); //default_value } if (OB_SUCC(ret)) { ObObj mapping_pg_sub_part_id_default; mapping_pg_sub_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("mapping_pg_sub_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - mapping_pg_sub_part_id_default, - mapping_pg_sub_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("mapping_pg_sub_part_id", //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 + true, //is_nullable + false, //is_autoincrement + mapping_pg_sub_part_id_default, + mapping_pg_sub_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -15891,10 +15850,10 @@ int ObInnerTableSchema::all_sub_part_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase 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 171a24832..52ec22deb 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 @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::all_virtual_core_meta_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_core_meta_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -58,501 +60,501 @@ int ObInnerTableSchema::all_virtual_core_meta_table_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 + ADD_COLUMN_SCHEMA("partition_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_port", // 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 + ADD_COLUMN_SCHEMA("sql_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_id", // 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 + ADD_COLUMN_SCHEMA("unit_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role", // 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 + ADD_COLUMN_SCHEMA("role", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("member_list", // 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 - MAX_MEMBER_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("member_list", //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 + MAX_MEMBER_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_count", // 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 + ADD_COLUMN_SCHEMA("row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_size", // 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 + ADD_COLUMN_SCHEMA("data_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_version", // 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 + ADD_COLUMN_SCHEMA("data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_checksum", // 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 + ADD_COLUMN_SCHEMA("data_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_checksum", // 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 + ADD_COLUMN_SCHEMA("row_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_checksum", // 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 - COLUMN_CHECKSUM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("column_checksum", //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 + COLUMN_CHECKSUM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj is_original_leader_default; is_original_leader_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_original_leader", // 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 - is_original_leader_default, - is_original_leader_default); // default_value + ADD_COLUMN_SCHEMA_T("is_original_leader", //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 + is_original_leader_default, + is_original_leader_default); //default_value } if (OB_SUCC(ret)) { ObObj is_previous_leader_default; is_previous_leader_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_previous_leader", // 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 - is_previous_leader_default, - is_previous_leader_default); // default_value + ADD_COLUMN_SCHEMA_T("is_previous_leader", //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 + is_previous_leader_default, + is_previous_leader_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_time", // 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 + ADD_COLUMN_SCHEMA("create_time", //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 } if (OB_SUCC(ret)) { ObObj rebuild_default; rebuild_default.set_int(0); - ADD_COLUMN_SCHEMA_T("rebuild", // 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 - rebuild_default, - rebuild_default); // default_value + ADD_COLUMN_SCHEMA_T("rebuild", //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 + rebuild_default, + rebuild_default); //default_value } if (OB_SUCC(ret)) { ObObj replica_type_default; replica_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("replica_type", // 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 - replica_type_default, - replica_type_default); // default_value + ADD_COLUMN_SCHEMA_T("replica_type", //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 + replica_type_default, + replica_type_default); //default_value } if (OB_SUCC(ret)) { ObObj required_size_default; required_size_default.set_int(0); - ADD_COLUMN_SCHEMA_T("required_size", // 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 - required_size_default, - required_size_default); // default_value + ADD_COLUMN_SCHEMA_T("required_size", //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 + required_size_default, + required_size_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("REPLICA_STATUS_NORMAL")); - ADD_COLUMN_SCHEMA_T("status", // 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 - MAX_REPLICA_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + MAX_REPLICA_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { ObObj is_restore_default; is_restore_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_restore", // 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 - is_restore_default, - is_restore_default); // default_value + ADD_COLUMN_SCHEMA_T("is_restore", //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 + is_restore_default, + is_restore_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_checksum_default; partition_checksum_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_checksum", // 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 - partition_checksum_default, - partition_checksum_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_checksum", //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 + partition_checksum_default, + partition_checksum_default); //default_value } if (OB_SUCC(ret)) { ObObj quorum_default; quorum_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("quorum", // 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 - quorum_default, - quorum_default); // default_value + ADD_COLUMN_SCHEMA_T("quorum", //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 + quorum_default, + quorum_default); //default_value } if (OB_SUCC(ret)) { ObObj fail_list_default; fail_list_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("fail_list", // 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 - OB_MAX_FAILLIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - fail_list_default, - fail_list_default); // default_value + ADD_COLUMN_SCHEMA_T("fail_list", //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 + OB_MAX_FAILLIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + fail_list_default, + fail_list_default); //default_value } if (OB_SUCC(ret)) { ObObj recovery_timestamp_default; recovery_timestamp_default.set_int(0); - ADD_COLUMN_SCHEMA_T("recovery_timestamp", // 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 - recovery_timestamp_default, - recovery_timestamp_default); // default_value + ADD_COLUMN_SCHEMA_T("recovery_timestamp", //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 + recovery_timestamp_default, + recovery_timestamp_default); //default_value } if (OB_SUCC(ret)) { ObObj memstore_percent_default; memstore_percent_default.set_int(100); - ADD_COLUMN_SCHEMA_T("memstore_percent", // 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 - memstore_percent_default, - memstore_percent_default); // default_value + ADD_COLUMN_SCHEMA_T("memstore_percent", //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 + memstore_percent_default, + memstore_percent_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -562,17 +564,16 @@ int ObInnerTableSchema::all_virtual_core_meta_table_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_zone_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_zone_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -603,213 +604,213 @@ int ObInnerTableSchema::all_virtual_zone_stat_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_merging", // 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 + ADD_COLUMN_SCHEMA("is_merging", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - MAX_ZONE_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + MAX_ZONE_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("server_count", // 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 + ADD_COLUMN_SCHEMA("server_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("resource_pool_count", // 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 + ADD_COLUMN_SCHEMA("resource_pool_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_count", // 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 + ADD_COLUMN_SCHEMA("unit_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster", // 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 - MAX_ZONE_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster", //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 + MAX_ZONE_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("region", // 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 - MAX_REGION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("region", //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 + MAX_REGION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 + ADD_COLUMN_SCHEMA("spare1", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 + ADD_COLUMN_SCHEMA("spare2", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 + ADD_COLUMN_SCHEMA("spare3", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare4", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare4", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare5", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare5", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare6", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare6", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -819,17 +820,16 @@ int ObInnerTableSchema::all_virtual_zone_stat_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_plan_cache_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_plan_cache_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -860,663 +860,663 @@ int ObInnerTableSchema::all_virtual_plan_cache_stat_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_num", // 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 + ADD_COLUMN_SCHEMA("sql_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mem_used", // 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 + ADD_COLUMN_SCHEMA("mem_used", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mem_hold", // 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 + ADD_COLUMN_SCHEMA("mem_hold", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("access_count", // 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 + ADD_COLUMN_SCHEMA("access_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hit_count", // 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 + ADD_COLUMN_SCHEMA("hit_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hit_rate", // 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 + ADD_COLUMN_SCHEMA("hit_rate", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_num", // 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 + ADD_COLUMN_SCHEMA("plan_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mem_limit", // 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 + ADD_COLUMN_SCHEMA("mem_limit", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hash_bucket", // 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 + ADD_COLUMN_SCHEMA("hash_bucket", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("stmtkey_num", // 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 + ADD_COLUMN_SCHEMA("stmtkey_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pc_ref_plan_local", // 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 + ADD_COLUMN_SCHEMA("pc_ref_plan_local", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pc_ref_plan_remote", // 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 + ADD_COLUMN_SCHEMA("pc_ref_plan_remote", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pc_ref_plan_dist", // 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 + ADD_COLUMN_SCHEMA("pc_ref_plan_dist", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pc_ref_plan_arr", // 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 + ADD_COLUMN_SCHEMA("pc_ref_plan_arr", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pc_ref_plan_stat", // 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 + ADD_COLUMN_SCHEMA("pc_ref_plan_stat", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pc_ref_pl", // 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 + ADD_COLUMN_SCHEMA("pc_ref_pl", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pc_ref_pl_stat", // 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 + ADD_COLUMN_SCHEMA("pc_ref_pl_stat", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_gen", // 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 + ADD_COLUMN_SCHEMA("plan_gen", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cli_query", // 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 + ADD_COLUMN_SCHEMA("cli_query", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_exec", // 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 + ADD_COLUMN_SCHEMA("outline_exec", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_explain", // 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 + ADD_COLUMN_SCHEMA("plan_explain", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("asyn_baseline", // 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 + ADD_COLUMN_SCHEMA("asyn_baseline", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("load_baseline", // 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 + ADD_COLUMN_SCHEMA("load_baseline", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ps_exec", // 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 + ADD_COLUMN_SCHEMA("ps_exec", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("gv_sql", // 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 + ADD_COLUMN_SCHEMA("gv_sql", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pl_anon", // 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 + ADD_COLUMN_SCHEMA("pl_anon", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pl_routine", // 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 + ADD_COLUMN_SCHEMA("pl_routine", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_var", // 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 + ADD_COLUMN_SCHEMA("package_var", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_type", // 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 + ADD_COLUMN_SCHEMA("package_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_spec", // 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 + ADD_COLUMN_SCHEMA("package_spec", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_body", // 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 + ADD_COLUMN_SCHEMA("package_body", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_resv", // 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 + ADD_COLUMN_SCHEMA("package_resv", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("get_pkg", // 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 + ADD_COLUMN_SCHEMA("get_pkg", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_builder", // 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 + ADD_COLUMN_SCHEMA("index_builder", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pcv_set", // 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 + ADD_COLUMN_SCHEMA("pcv_set", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pcv_rd", // 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 + ADD_COLUMN_SCHEMA("pcv_rd", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pcv_wr", // 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 + ADD_COLUMN_SCHEMA("pcv_wr", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pcv_get_plan_key", // 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 + ADD_COLUMN_SCHEMA("pcv_get_plan_key", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pcv_get_pl_key", // 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 + ADD_COLUMN_SCHEMA("pcv_get_pl_key", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pcv_expire_by_used", // 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 + ADD_COLUMN_SCHEMA("pcv_expire_by_used", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pcv_expire_by_mem", // 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 + ADD_COLUMN_SCHEMA("pcv_expire_by_mem", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -1534,22 +1534,20 @@ int ObInnerTableSchema::all_virtual_plan_cache_stat_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_plan_cache_stat_all_virtual_plan_cache_stat_i1_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_plan_cache_stat_all_virtual_plan_cache_stat_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID))); - table_schema.set_table_id( - combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TID)); + table_schema.set_table_id(combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TID)); table_schema.set_rowkey_split_pos(0); table_schema.set_is_use_bloomfilter(false); table_schema.set_progressive_merge_num(0); @@ -1589,48 +1587,48 @@ int ObInnerTableSchema::all_virtual_plan_cache_stat_all_virtual_plan_cache_stat_ table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - column_id + 1, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + column_id + 1, //column_id + 1, //rowkey_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - column_id + 2, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + column_id + 2, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - column_id + 3, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + column_id + 3, //column_id + 3, //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 } table_schema.set_index_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -1640,12 +1638,12 @@ int ObInnerTableSchema::all_virtual_plan_cache_stat_all_virtual_plan_cache_stat_ return ret; } -int ObInnerTableSchema::all_virtual_plan_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_plan_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1676,981 +1674,981 @@ int ObInnerTableSchema::all_virtual_plan_stat_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_id", // 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 + ADD_COLUMN_SCHEMA("plan_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_id", // 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 - OB_MAX_SQL_ID_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_id", //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 + OB_MAX_SQL_ID_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 + ADD_COLUMN_SCHEMA("type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_bind_sensitive", // 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 + ADD_COLUMN_SCHEMA("is_bind_sensitive", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_bind_aware", // 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 + ADD_COLUMN_SCHEMA("is_bind_aware", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("statement", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("statement", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("query_sql", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("query_sql", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("special_params", // 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 - OB_MAX_COMMAND_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("special_params", //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 + OB_MAX_COMMAND_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_infos", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_infos", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sys_vars", // 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 - OB_MAX_COMMAND_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sys_vars", //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 + OB_MAX_COMMAND_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_hash", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("plan_hash", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("first_load_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("first_load_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("merged_version", // 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 + ADD_COLUMN_SCHEMA("merged_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("last_active_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("last_active_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("avg_exe_usec", // 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 + ADD_COLUMN_SCHEMA("avg_exe_usec", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("slowest_exe_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("slowest_exe_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("slowest_exe_usec", // 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 + ADD_COLUMN_SCHEMA("slowest_exe_usec", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("slow_count", // 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 + ADD_COLUMN_SCHEMA("slow_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hit_count", // 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 + ADD_COLUMN_SCHEMA("hit_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_size", // 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 + ADD_COLUMN_SCHEMA("plan_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("executions", // 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 + ADD_COLUMN_SCHEMA("executions", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_reads", // 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 + ADD_COLUMN_SCHEMA("disk_reads", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("direct_writes", // 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 + ADD_COLUMN_SCHEMA("direct_writes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("buffer_gets", // 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 + ADD_COLUMN_SCHEMA("buffer_gets", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("application_wait_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("application_wait_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("concurrency_wait_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("concurrency_wait_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_io_wait_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_io_wait_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rows_processed", // 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 + ADD_COLUMN_SCHEMA("rows_processed", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("elapsed_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("elapsed_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("large_querys", // 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 + ADD_COLUMN_SCHEMA("large_querys", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("delayed_large_querys", // 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 + ADD_COLUMN_SCHEMA("delayed_large_querys", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_version", // 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 + ADD_COLUMN_SCHEMA("outline_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_id", // 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 + ADD_COLUMN_SCHEMA("outline_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_data", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("outline_data", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("acs_sel_info", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("acs_sel_info", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_scan", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_scan", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("db_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("db_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("evolution", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("evolution", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("evo_executions", // 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 + ADD_COLUMN_SCHEMA("evo_executions", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("evo_cpu_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("evo_cpu_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("timeout_count", // 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 + ADD_COLUMN_SCHEMA("timeout_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ps_stmt_id", // 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 + ADD_COLUMN_SCHEMA("ps_stmt_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("delayed_px_querys", // 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 + ADD_COLUMN_SCHEMA("delayed_px_querys", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sessid", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sessid", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("temp_tables", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("temp_tables", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_use_jit", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_use_jit", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_type", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("object_type", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("enable_bf_cache", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("enable_bf_cache", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("bf_filter_cnt", // 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 + ADD_COLUMN_SCHEMA("bf_filter_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("bf_access_cnt", // 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 + ADD_COLUMN_SCHEMA("bf_access_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("enable_row_cache", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("enable_row_cache", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_cache_hit_cnt", // 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 + ADD_COLUMN_SCHEMA("row_cache_hit_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_cache_miss_cnt", // 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 + ADD_COLUMN_SCHEMA("row_cache_miss_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("enable_fuse_row_cache", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("enable_fuse_row_cache", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("fuse_row_cache_hit_cnt", // 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 + ADD_COLUMN_SCHEMA("fuse_row_cache_hit_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("fuse_row_cache_miss_cnt", // 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 + ADD_COLUMN_SCHEMA("fuse_row_cache_miss_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hints_info", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("hints_info", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hints_all_worked", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("hints_all_worked", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pl_schema_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("pl_schema_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_batched_multi_stmt", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_batched_multi_stmt", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -2668,17 +2666,16 @@ int ObInnerTableSchema::all_virtual_plan_stat_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_mem_leak_checker_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_mem_leak_checker_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2709,108 +2706,108 @@ int ObInnerTableSchema::all_virtual_mem_leak_checker_info_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mod_name", // 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 - OB_MAX_CHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("mod_name", //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 + OB_MAX_CHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mod_type", // 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 - OB_MAX_CHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("mod_type", //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 + OB_MAX_CHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("alloc_count", // 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 + ADD_COLUMN_SCHEMA("alloc_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("alloc_size", // 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 + ADD_COLUMN_SCHEMA("alloc_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("back_trace", // 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 - DEFAULT_BUF_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("back_trace", //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 + DEFAULT_BUF_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -2828,17 +2825,16 @@ int ObInnerTableSchema::all_virtual_mem_leak_checker_info_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_latch_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_latch_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2869,228 +2865,228 @@ int ObInnerTableSchema::all_virtual_latch_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("latch_id", // 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 + ADD_COLUMN_SCHEMA("latch_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - OB_MAX_CHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + OB_MAX_CHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("addr", // 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 - OB_MAX_CHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("addr", //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 + OB_MAX_CHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("level", // 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 + ADD_COLUMN_SCHEMA("level", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hash", // 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 + ADD_COLUMN_SCHEMA("hash", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("gets", // 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 + ADD_COLUMN_SCHEMA("gets", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("misses", // 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 + ADD_COLUMN_SCHEMA("misses", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sleeps", // 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 + ADD_COLUMN_SCHEMA("sleeps", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("immediate_gets", // 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 + ADD_COLUMN_SCHEMA("immediate_gets", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("immediate_misses", // 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 + ADD_COLUMN_SCHEMA("immediate_misses", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spin_gets", // 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 + ADD_COLUMN_SCHEMA("spin_gets", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_time", // 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 + ADD_COLUMN_SCHEMA("wait_time", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -3108,17 +3104,16 @@ int ObInnerTableSchema::all_virtual_latch_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_kvcache_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_kvcache_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3149,228 +3144,228 @@ int ObInnerTableSchema::all_virtual_kvcache_info_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cache_name", // 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 - OB_MAX_KVCACHE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cache_name", //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 + OB_MAX_KVCACHE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cache_id", // 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 + ADD_COLUMN_SCHEMA("cache_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priority", // 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 + ADD_COLUMN_SCHEMA("priority", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cache_size", // 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 + ADD_COLUMN_SCHEMA("cache_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cache_store_size", // 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 + ADD_COLUMN_SCHEMA("cache_store_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cache_map_size", // 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 + ADD_COLUMN_SCHEMA("cache_map_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("kv_cnt", // 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 + ADD_COLUMN_SCHEMA("kv_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hit_ratio", // 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 - 3, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("hit_ratio", //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 + 3, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_put_cnt", // 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 + ADD_COLUMN_SCHEMA("total_put_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_hit_cnt", // 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 + ADD_COLUMN_SCHEMA("total_hit_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_miss_cnt", // 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 + ADD_COLUMN_SCHEMA("total_miss_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hold_size", // 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 + ADD_COLUMN_SCHEMA("hold_size", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -3388,17 +3383,16 @@ int ObInnerTableSchema::all_virtual_kvcache_info_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_data_type_class_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_data_type_class_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3429,33 +3423,33 @@ int ObInnerTableSchema::all_virtual_data_type_class_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type_class", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("data_type_class", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type_class_str", // 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 - OB_MAX_SYS_PARAM_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_type_class_str", //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 + OB_MAX_SYS_PARAM_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3465,17 +3459,16 @@ int ObInnerTableSchema::all_virtual_data_type_class_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_data_type_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_data_type_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3506,48 +3499,48 @@ int ObInnerTableSchema::all_virtual_data_type_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("data_type", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type_str", // 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 - OB_MAX_SYS_PARAM_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_type_str", //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 + OB_MAX_SYS_PARAM_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type_class", // 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 + ADD_COLUMN_SCHEMA("data_type_class", //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 } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3557,17 +3550,16 @@ int ObInnerTableSchema::all_virtual_data_type_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_server_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_server_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3598,667 +3590,667 @@ int ObInnerTableSchema::all_virtual_server_stat_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_total", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_total", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_assigned", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_assigned", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_assigned_percent", // 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 + ADD_COLUMN_SCHEMA("cpu_assigned_percent", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mem_total", // 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 + ADD_COLUMN_SCHEMA("mem_total", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mem_assigned", // 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 + ADD_COLUMN_SCHEMA("mem_assigned", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mem_assigned_percent", // 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 + ADD_COLUMN_SCHEMA("mem_assigned_percent", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_total", // 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 + ADD_COLUMN_SCHEMA("disk_total", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_assigned", // 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 + ADD_COLUMN_SCHEMA("disk_assigned", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_assigned_percent", // 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 + ADD_COLUMN_SCHEMA("disk_assigned_percent", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_num", // 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 + ADD_COLUMN_SCHEMA("unit_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("migrating_unit_num", // 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 + ADD_COLUMN_SCHEMA("migrating_unit_num", //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 } if (OB_SUCC(ret)) { - ++column_id; // for [discard]temporary_unit_num + ++column_id; // for [discard]temporary_unit_num } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("merged_version", // 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 + ADD_COLUMN_SCHEMA("merged_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("leader_count", // 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 + ADD_COLUMN_SCHEMA("leader_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("load", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("load", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_weight", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_weight", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memory_weight", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("memory_weight", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_weight", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("disk_weight", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("id", // 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 + ADD_COLUMN_SCHEMA("id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("inner_port", // 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 + ADD_COLUMN_SCHEMA("inner_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("build_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 - OB_SERVER_VERSION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("build_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 + OB_SERVER_VERSION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("register_time", // 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 + ADD_COLUMN_SCHEMA("register_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_heartbeat_time", // 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 + ADD_COLUMN_SCHEMA("last_heartbeat_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_migrate_in_time", // 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 + ADD_COLUMN_SCHEMA("block_migrate_in_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_service_time", // 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 + ADD_COLUMN_SCHEMA("start_service_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_offline_time", // 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 + ADD_COLUMN_SCHEMA("last_offline_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("stop_time", // 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 + ADD_COLUMN_SCHEMA("stop_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("force_stop_heartbeat", // 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 + ADD_COLUMN_SCHEMA("force_stop_heartbeat", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("admin_status", // 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 - OB_SERVER_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("admin_status", //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 + OB_SERVER_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("heartbeat_status", // 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 - OB_SERVER_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("heartbeat_status", //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 + OB_SERVER_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("with_rootserver", // 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 + ADD_COLUMN_SCHEMA("with_rootserver", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("with_partition", // 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 + ADD_COLUMN_SCHEMA("with_partition", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mem_in_use", // 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 + ADD_COLUMN_SCHEMA("mem_in_use", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_in_use", // 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 + ADD_COLUMN_SCHEMA("disk_in_use", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("clock_deviation", // 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 + ADD_COLUMN_SCHEMA("clock_deviation", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("heartbeat_latency", // 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 + ADD_COLUMN_SCHEMA("heartbeat_latency", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("clock_sync_status", // 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 - OB_SERVER_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("clock_sync_status", //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 + OB_SERVER_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_capacity", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_capacity", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_max_assigned", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_max_assigned", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mem_capacity", // 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 + ADD_COLUMN_SCHEMA("mem_capacity", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mem_max_assigned", // 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 + ADD_COLUMN_SCHEMA("mem_max_assigned", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ssl_key_expired_time", // 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 + ADD_COLUMN_SCHEMA("ssl_key_expired_time", //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 } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4268,17 +4260,16 @@ int ObInnerTableSchema::all_virtual_server_stat_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_rebalance_task_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_rebalance_task_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4309,213 +4300,213 @@ int ObInnerTableSchema::all_virtual_rebalance_task_stat_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 + ADD_COLUMN_SCHEMA("partition_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_count", // 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 + ADD_COLUMN_SCHEMA("partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("source", // 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 - OB_IP_PORT_STR_BUFF, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("source", //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 + OB_IP_PORT_STR_BUFF, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_source", // 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 - OB_IP_PORT_STR_BUFF, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_source", //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 + OB_IP_PORT_STR_BUFF, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("destination", // 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 - OB_IP_PORT_STR_BUFF, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("destination", //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 + OB_IP_PORT_STR_BUFF, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("offline", // 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 - OB_IP_PORT_STR_BUFF, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("offline", //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 + OB_IP_PORT_STR_BUFF, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_replicate", // 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 - MAX_BOOL_STR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_replicate", //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 + MAX_BOOL_STR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_type", // 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 + ADD_COLUMN_SCHEMA("task_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_scheduled", // 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 - MAX_BOOL_STR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_scheduled", //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 + MAX_BOOL_STR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_manual", // 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 - MAX_BOOL_STR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_manual", //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 + MAX_BOOL_STR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("waiting_time", // 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 + ADD_COLUMN_SCHEMA("waiting_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("executing_time", // 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 + ADD_COLUMN_SCHEMA("executing_time", //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 } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4525,17 +4516,16 @@ int ObInnerTableSchema::all_virtual_rebalance_task_stat_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_session_event_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_session_event_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4566,228 +4556,228 @@ int ObInnerTableSchema::all_virtual_session_event_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("session_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("event_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event", // 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 - OB_MAX_WAIT_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("event", //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 + OB_MAX_WAIT_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_class_id", // 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 + ADD_COLUMN_SCHEMA("wait_class_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_class#", // 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 + ADD_COLUMN_SCHEMA("wait_class#", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_class", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("wait_class", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_waits", // 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 + ADD_COLUMN_SCHEMA("total_waits", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_timeouts", // 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 + ADD_COLUMN_SCHEMA("total_timeouts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("time_waited", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("time_waited", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_wait", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_wait", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("average_wait", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("average_wait", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("time_waited_micro", // 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 + ADD_COLUMN_SCHEMA("time_waited_micro", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -4805,22 +4795,20 @@ int ObInnerTableSchema::all_virtual_session_event_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_session_event_all_virtual_session_event_i1_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_session_event_all_virtual_session_event_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID))); - table_schema.set_table_id( - combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_SESSION_EVENT_ALL_VIRTUAL_SESSION_EVENT_I1_TID)); + table_schema.set_table_id(combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_SESSION_EVENT_ALL_VIRTUAL_SESSION_EVENT_I1_TID)); table_schema.set_rowkey_split_pos(0); table_schema.set_is_use_bloomfilter(false); table_schema.set_progressive_merge_num(0); @@ -4860,63 +4848,63 @@ int ObInnerTableSchema::all_virtual_session_event_all_virtual_session_event_i1_s table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // column_name - column_id + 1, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("session_id", //column_name + column_id + 1, //column_id + 1, //rowkey_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - column_id + 2, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + column_id + 2, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - column_id + 3, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + column_id + 3, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event_id", // column_name - column_id + 4, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("event_id", //column_name + column_id + 4, //column_id + 4, //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 } table_schema.set_index_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -4926,12 +4914,12 @@ int ObInnerTableSchema::all_virtual_session_event_all_virtual_session_event_i1_s return ret; } -int ObInnerTableSchema::all_virtual_session_wait_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_session_wait_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4962,288 +4950,288 @@ int ObInnerTableSchema::all_virtual_session_wait_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("session_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event", // 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 - OB_MAX_WAIT_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("event", //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 + OB_MAX_WAIT_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p1text", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("p1text", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p1", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("p1", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p2text", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("p2text", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p2", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("p2", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p3text", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("p3text", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p3", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("p3", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("level", // 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 + ADD_COLUMN_SCHEMA("level", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_class_id", // 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 + ADD_COLUMN_SCHEMA("wait_class_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_class#", // 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 + ADD_COLUMN_SCHEMA("wait_class#", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_class", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("wait_class", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("state", // 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 - 19, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("state", //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 + 19, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_time_micro", // 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 + ADD_COLUMN_SCHEMA("wait_time_micro", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("time_remaining_micro", // 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 + ADD_COLUMN_SCHEMA("time_remaining_micro", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("time_since_last_wait_micro", // 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 + ADD_COLUMN_SCHEMA("time_since_last_wait_micro", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -5261,17 +5249,16 @@ int ObInnerTableSchema::all_virtual_session_wait_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_session_wait_all_virtual_session_wait_i1_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_session_wait_all_virtual_session_wait_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID))); @@ -5315,48 +5302,48 @@ int ObInnerTableSchema::all_virtual_session_wait_all_virtual_session_wait_i1_sch table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // column_name - column_id + 1, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("session_id", //column_name + column_id + 1, //column_id + 1, //rowkey_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - column_id + 2, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + column_id + 2, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - column_id + 3, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + column_id + 3, //column_id + 3, //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 } table_schema.set_index_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -5366,12 +5353,12 @@ int ObInnerTableSchema::all_virtual_session_wait_all_virtual_session_wait_i1_sch return ret; } -int ObInnerTableSchema::all_virtual_session_wait_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_session_wait_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5402,258 +5389,258 @@ int ObInnerTableSchema::all_virtual_session_wait_history_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("session_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("seq#", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("seq#", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event#", // 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 + ADD_COLUMN_SCHEMA("event#", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event", // 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 - OB_MAX_WAIT_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("event", //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 + OB_MAX_WAIT_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p1text", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("p1text", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p1", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("p1", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p2text", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("p2text", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p2", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("p2", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p3text", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("p3text", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p3", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("p3", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("level", // 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 + ADD_COLUMN_SCHEMA("level", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_time_micro", // 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 + ADD_COLUMN_SCHEMA("wait_time_micro", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("time_since_last_wait_micro", // 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 + ADD_COLUMN_SCHEMA("time_since_last_wait_micro", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("wait_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -5671,23 +5658,20 @@ int ObInnerTableSchema::all_virtual_session_wait_history_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_session_wait_history_all_virtual_session_wait_history_i1_schema( - ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_session_wait_history_all_virtual_session_wait_history_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID))); - table_schema.set_table_id( - combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TID)); + table_schema.set_table_id(combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TID)); table_schema.set_rowkey_split_pos(0); table_schema.set_is_use_bloomfilter(false); table_schema.set_progressive_merge_num(0); @@ -5698,8 +5682,7 @@ int ObInnerTableSchema::all_virtual_session_wait_history_all_virtual_session_wai table_schema.set_def_type(TABLE_DEF_TYPE_INTERNAL); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_table_name( - OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TNAME))) { + if (OB_FAIL(table_schema.set_table_name(OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TNAME))) { LOG_ERROR("fail to set table_name", K(ret)); } } @@ -5728,63 +5711,63 @@ int ObInnerTableSchema::all_virtual_session_wait_history_all_virtual_session_wai table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // column_name - column_id + 1, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("session_id", //column_name + column_id + 1, //column_id + 1, //rowkey_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - column_id + 2, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + column_id + 2, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - column_id + 3, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + column_id + 3, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("seq#", // column_name - column_id + 4, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("seq#", //column_name + column_id + 4, //column_id + 4, //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 } table_schema.set_index_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -5794,12 +5777,12 @@ int ObInnerTableSchema::all_virtual_session_wait_history_all_virtual_session_wai return ret; } -int ObInnerTableSchema::all_virtual_system_event_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_system_event_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5830,213 +5813,213 @@ int ObInnerTableSchema::all_virtual_system_event_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("event_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event", // 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 - OB_MAX_WAIT_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("event", //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 + OB_MAX_WAIT_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_class_id", // 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 + ADD_COLUMN_SCHEMA("wait_class_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_class#", // 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 + ADD_COLUMN_SCHEMA("wait_class#", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_class", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("wait_class", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_waits", // 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 + ADD_COLUMN_SCHEMA("total_waits", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_timeouts", // 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 + ADD_COLUMN_SCHEMA("total_timeouts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("time_waited", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("time_waited", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_wait", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_wait", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("average_wait", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("average_wait", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("time_waited_micro", // 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 + ADD_COLUMN_SCHEMA("time_waited_micro", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -6054,17 +6037,16 @@ int ObInnerTableSchema::all_virtual_system_event_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_system_event_all_virtual_system_event_i1_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_system_event_all_virtual_system_event_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID))); @@ -6108,63 +6090,63 @@ int ObInnerTableSchema::all_virtual_system_event_all_virtual_system_event_i1_sch table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - column_id + 1, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + column_id + 1, //column_id + 1, //rowkey_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - column_id + 2, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + column_id + 2, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - column_id + 3, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + column_id + 3, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event_id", // column_name - column_id + 4, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("event_id", //column_name + column_id + 4, //column_id + 4, //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 } table_schema.set_index_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -6174,12 +6156,12 @@ int ObInnerTableSchema::all_virtual_system_event_all_virtual_system_event_i1_sch return ret; } -int ObInnerTableSchema::all_virtual_tenant_memstore_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_memstore_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6210,123 +6192,123 @@ int ObInnerTableSchema::all_virtual_tenant_memstore_info_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("active_memstore_used", // 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 + ADD_COLUMN_SCHEMA("active_memstore_used", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_memstore_used", // 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 + ADD_COLUMN_SCHEMA("total_memstore_used", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("major_freeze_trigger", // 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 + ADD_COLUMN_SCHEMA("major_freeze_trigger", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memstore_limit", // 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 + ADD_COLUMN_SCHEMA("memstore_limit", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("freeze_cnt", // 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 + ADD_COLUMN_SCHEMA("freeze_cnt", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -6344,17 +6326,16 @@ int ObInnerTableSchema::all_virtual_tenant_memstore_info_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_concurrency_object_pool_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_concurrency_object_pool_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6385,138 +6366,138 @@ int ObInnerTableSchema::all_virtual_concurrency_object_pool_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("free_list_name", // 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 - OB_MAX_SYS_PARAM_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("free_list_name", //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 + OB_MAX_SYS_PARAM_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("allocated", // 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 + ADD_COLUMN_SCHEMA("allocated", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("in_use", // 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 + ADD_COLUMN_SCHEMA("in_use", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("count", // 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 + ADD_COLUMN_SCHEMA("count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_size", // 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 + ADD_COLUMN_SCHEMA("type_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("chunk_count", // 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 + ADD_COLUMN_SCHEMA("chunk_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("chunk_byte_size", // 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 + ADD_COLUMN_SCHEMA("chunk_byte_size", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -6534,17 +6515,16 @@ int ObInnerTableSchema::all_virtual_concurrency_object_pool_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sesstat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sesstat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6575,108 +6555,108 @@ int ObInnerTableSchema::all_virtual_sesstat_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("session_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("statistic#", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("statistic#", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 + ADD_COLUMN_SCHEMA("value", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("can_visible", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("can_visible", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -6694,17 +6674,16 @@ int ObInnerTableSchema::all_virtual_sesstat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sesstat_all_virtual_sesstat_i1_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sesstat_all_virtual_sesstat_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID))); @@ -6748,63 +6727,63 @@ int ObInnerTableSchema::all_virtual_sesstat_all_virtual_sesstat_i1_schema(ObTabl table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // column_name - column_id + 1, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("session_id", //column_name + column_id + 1, //column_id + 1, //rowkey_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - column_id + 2, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + column_id + 2, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - column_id + 3, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + column_id + 3, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("statistic#", // column_name - column_id + 4, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("statistic#", //column_name + column_id + 4, //column_id + 4, //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 } table_schema.set_index_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -6814,12 +6793,12 @@ int ObInnerTableSchema::all_virtual_sesstat_all_virtual_sesstat_i1_schema(ObTabl return ret; } -int ObInnerTableSchema::all_virtual_sysstat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sysstat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6850,138 +6829,138 @@ int ObInnerTableSchema::all_virtual_sysstat_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("statistic#", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("statistic#", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 + ADD_COLUMN_SCHEMA("value", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("stat_id", // 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 + ADD_COLUMN_SCHEMA("stat_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("class", // 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 + ADD_COLUMN_SCHEMA("class", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("can_visible", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("can_visible", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -6999,17 +6978,16 @@ int ObInnerTableSchema::all_virtual_sysstat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sysstat_all_virtual_sysstat_i1_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sysstat_all_virtual_sysstat_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID))); @@ -7053,63 +7031,63 @@ int ObInnerTableSchema::all_virtual_sysstat_all_virtual_sysstat_i1_schema(ObTabl table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - column_id + 1, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + column_id + 1, //column_id + 1, //rowkey_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - column_id + 2, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + column_id + 2, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - column_id + 3, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + column_id + 3, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("statistic#", // column_name - column_id + 4, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("statistic#", //column_name + column_id + 4, //column_id + 4, //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 } table_schema.set_index_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -7119,12 +7097,12 @@ int ObInnerTableSchema::all_virtual_sysstat_all_virtual_sysstat_i1_schema(ObTabl return ret; } -int ObInnerTableSchema::all_virtual_storage_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_storage_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7155,288 +7133,288 @@ int ObInnerTableSchema::all_virtual_storage_stat_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 + ADD_COLUMN_SCHEMA("partition_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("major_version", // 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 + ADD_COLUMN_SCHEMA("major_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("minor_version", // 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 + ADD_COLUMN_SCHEMA("minor_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sstable_id", // 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 + ADD_COLUMN_SCHEMA("sstable_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role", // 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 + ADD_COLUMN_SCHEMA("role", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_checksum", // 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 + ADD_COLUMN_SCHEMA("data_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_checksum", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("column_checksum", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_blocks", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("macro_blocks", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("occupy_size", // 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 + ADD_COLUMN_SCHEMA("occupy_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("used_size", // 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 + ADD_COLUMN_SCHEMA("used_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_count", // 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 + ADD_COLUMN_SCHEMA("row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("store_type", // 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 + ADD_COLUMN_SCHEMA("store_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("progressive_merge_start_version", // 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 + ADD_COLUMN_SCHEMA("progressive_merge_start_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("progressive_merge_end_version", // 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 + ADD_COLUMN_SCHEMA("progressive_merge_end_version", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -7454,17 +7432,16 @@ int ObInnerTableSchema::all_virtual_storage_stat_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_disk_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_disk_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7495,108 +7472,108 @@ int ObInnerTableSchema::all_virtual_disk_stat_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_size", // 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 + ADD_COLUMN_SCHEMA("total_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("used_size", // 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 + ADD_COLUMN_SCHEMA("used_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("free_size", // 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 + ADD_COLUMN_SCHEMA("free_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_disk_valid", // 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 + ADD_COLUMN_SCHEMA("is_disk_valid", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_error_begin_ts", // 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 + ADD_COLUMN_SCHEMA("disk_error_begin_ts", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -7614,17 +7591,16 @@ int ObInnerTableSchema::all_virtual_disk_stat_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_memstore_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_memstore_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7655,318 +7631,318 @@ int ObInnerTableSchema::all_virtual_memstore_info_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // 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 + ADD_COLUMN_SCHEMA("partition_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("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 - MAX_VERSION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("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 + MAX_VERSION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("base_version", // 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 + ADD_COLUMN_SCHEMA("base_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("multi_version_start", // 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 + ADD_COLUMN_SCHEMA("multi_version_start", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_active", // 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 + ADD_COLUMN_SCHEMA("is_active", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mem_used", // 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 + ADD_COLUMN_SCHEMA("mem_used", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hash_item_count", // 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 + ADD_COLUMN_SCHEMA("hash_item_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hash_mem_used", // 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 + ADD_COLUMN_SCHEMA("hash_mem_used", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("btree_item_count", // 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 + ADD_COLUMN_SCHEMA("btree_item_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("btree_mem_used", // 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 + ADD_COLUMN_SCHEMA("btree_mem_used", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("insert_row_count", // 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 + ADD_COLUMN_SCHEMA("insert_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("update_row_count", // 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 + ADD_COLUMN_SCHEMA("update_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("delete_row_count", // 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 + ADD_COLUMN_SCHEMA("delete_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("purge_row_count", // 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 + ADD_COLUMN_SCHEMA("purge_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("purge_queue_count", // 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 + ADD_COLUMN_SCHEMA("purge_queue_count", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -7984,17 +7960,16 @@ int ObInnerTableSchema::all_virtual_memstore_info_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_partition_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_partition_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8025,526 +8000,545 @@ int ObInnerTableSchema::all_virtual_partition_info_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // 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 + ADD_COLUMN_SCHEMA("partition_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_decided_trans_version", // 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 + ADD_COLUMN_SCHEMA("max_decided_trans_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_passed_trans_ts", // 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 + ADD_COLUMN_SCHEMA("max_passed_trans_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("freeze_ts", // 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 + ADD_COLUMN_SCHEMA("freeze_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("allow_gc", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("allow_gc", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_state", // 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 - TABLE_MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition_state", //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 + TABLE_MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sstable_read_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sstable_read_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sstable_read_bytes_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sstable_read_bytes_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sstable_write_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sstable_write_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sstable_write_bytes_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sstable_write_bytes_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_write_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("log_write_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_write_bytes_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("log_write_bytes_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memtable_bytes", // 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 + ADD_COLUMN_SCHEMA("memtable_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_utime_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_utime_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_stime_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_stime_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("net_in_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("net_in_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("net_in_bytes_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("net_in_bytes_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("net_out_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("net_out_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("net_out_bytes_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("net_out_bytes_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj min_log_service_ts_default; min_log_service_ts_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("min_log_service_ts", // 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 - min_log_service_ts_default, - min_log_service_ts_default); // default_value + ADD_COLUMN_SCHEMA_T("min_log_service_ts", //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 + min_log_service_ts_default, + min_log_service_ts_default); //default_value } if (OB_SUCC(ret)) { ObObj min_trans_service_ts_default; min_trans_service_ts_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("min_trans_service_ts", // 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 - min_trans_service_ts_default, - min_trans_service_ts_default); // default_value + ADD_COLUMN_SCHEMA_T("min_trans_service_ts", //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 + min_trans_service_ts_default, + min_trans_service_ts_default); //default_value } if (OB_SUCC(ret)) { ObObj min_replay_engine_ts_default; min_replay_engine_ts_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("min_replay_engine_ts", // 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 - min_replay_engine_ts_default, - min_replay_engine_ts_default); // default_value + ADD_COLUMN_SCHEMA_T("min_replay_engine_ts", //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 + min_replay_engine_ts_default, + min_replay_engine_ts_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_need_rebuild", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_need_rebuild", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pg_partition_count", // 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 + ADD_COLUMN_SCHEMA("pg_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_pg", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_pg", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj weak_read_timestamp_default; weak_read_timestamp_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("weak_read_timestamp", // 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 - weak_read_timestamp_default, - weak_read_timestamp_default); // default_value + ADD_COLUMN_SCHEMA_T("weak_read_timestamp", //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 + weak_read_timestamp_default, + weak_read_timestamp_default); //default_value } if (OB_SUCC(ret)) { ObObj replica_type_default; replica_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("replica_type", // 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 - replica_type_default, - replica_type_default); // default_value + ADD_COLUMN_SCHEMA_T("replica_type", //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 + replica_type_default, + replica_type_default); //default_value } if (OB_SUCC(ret)) { ObObj last_replay_log_id_default; last_replay_log_id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("last_replay_log_id", // 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 - last_replay_log_id_default, - last_replay_log_id_default); // default_value + ADD_COLUMN_SCHEMA_T("last_replay_log_id", //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 + last_replay_log_id_default, + last_replay_log_id_default); //default_value } if (OB_SUCC(ret)) { ObObj schema_version_default; schema_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("schema_version", // 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 - schema_version_default, - schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("schema_version", //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 + schema_version_default, + schema_version_default); //default_value + } + + if (OB_SUCC(ret)) { + ObObj last_replay_log_ts_default; + last_replay_log_ts_default.set_int(0); + ADD_COLUMN_SCHEMA_T("last_replay_log_ts", //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 + last_replay_log_ts_default, + last_replay_log_ts_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -8562,17 +8556,16 @@ int ObInnerTableSchema::all_virtual_partition_info_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_upgrade_inspection_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_upgrade_inspection_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8603,33 +8596,33 @@ int ObInnerTableSchema::all_virtual_upgrade_inspection_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - TABLE_MAX_KEY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + TABLE_MAX_KEY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - MAX_ZONE_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + MAX_ZONE_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8639,17 +8632,16 @@ int ObInnerTableSchema::all_virtual_upgrade_inspection_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_trans_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_trans_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8680,500 +8672,500 @@ int ObInnerTableSchema::all_virtual_trans_stat_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("inc_num", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("inc_num", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("session_id", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("proxy_id", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("proxy_id", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_type", // 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 + ADD_COLUMN_SCHEMA("trans_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_id", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trans_id", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_exiting", // 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 + ADD_COLUMN_SCHEMA("is_exiting", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_readonly", // 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 + ADD_COLUMN_SCHEMA("is_readonly", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_decided", // 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 + ADD_COLUMN_SCHEMA("is_decided", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_mode", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trans_mode", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("active_memstore_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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("active_memstore_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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("participants", // 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 + ADD_COLUMN_SCHEMA("participants", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("autocommit", // 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 + ADD_COLUMN_SCHEMA("autocommit", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_consistency", // 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 + ADD_COLUMN_SCHEMA("trans_consistency", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("ctx_create_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("ctx_create_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("expired_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("expired_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("refer", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("refer", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_no", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_no", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("state", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("state", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_trans_action", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_trans_action", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lock_for_read_retry_count", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("lock_for_read_retry_count", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ctx_addr", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ctx_addr", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_trans_arr", // 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 + ADD_COLUMN_SCHEMA("prev_trans_arr", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_trans_count", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("prev_trans_count", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("next_trans_arr", // 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 + ADD_COLUMN_SCHEMA("next_trans_arr", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("next_trans_count", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("next_trans_count", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_trans_commit_count", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("prev_trans_commit_count", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ctx_id", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ctx_id", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pending_log_size", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("pending_log_size", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flushed_log_size", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("flushed_log_size", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -9191,17 +9183,16 @@ int ObInnerTableSchema::all_virtual_trans_stat_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_trans_mgr_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_trans_mgr_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9232,273 +9223,273 @@ int ObInnerTableSchema::all_virtual_trans_mgr_stat_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_id", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition_idx", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ctx_type", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ctx_type", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_master", // 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 + ADD_COLUMN_SCHEMA("is_master", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_frozen", // 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 + ADD_COLUMN_SCHEMA("is_frozen", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_stopped", // 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 + ADD_COLUMN_SCHEMA("is_stopped", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("read_only_count", // 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 + ADD_COLUMN_SCHEMA("read_only_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("active_read_write_count", // 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 + ADD_COLUMN_SCHEMA("active_read_write_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("active_memstore_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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("active_memstore_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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_ctx_count", // 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 + ADD_COLUMN_SCHEMA("total_ctx_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("with_dep_trans_count", // 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 + ADD_COLUMN_SCHEMA("with_dep_trans_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("without_dep_trans_count", // 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 + ADD_COLUMN_SCHEMA("without_dep_trans_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("endtrans_by_prev_count", // 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 + ADD_COLUMN_SCHEMA("endtrans_by_prev_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("endtrans_by_checkpoint_count", // 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 + ADD_COLUMN_SCHEMA("endtrans_by_checkpoint_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("endtrans_by_self_count", // 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 + ADD_COLUMN_SCHEMA("endtrans_by_self_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mgr_addr", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("mgr_addr", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -9516,17 +9507,16 @@ int ObInnerTableSchema::all_virtual_trans_mgr_stat_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_election_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_election_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9557,333 +9547,333 @@ int ObInnerTableSchema::all_virtual_election_info_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_id", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition_idx", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_running", // 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 + ADD_COLUMN_SCHEMA("is_running", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_changing_leader", // 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 + ADD_COLUMN_SCHEMA("is_changing_leader", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("current_leader", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("current_leader", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("previous_leader", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("previous_leader", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("proposal_leader", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("proposal_leader", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("member_list", // 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 - MAX_MEMBER_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("member_list", //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 + MAX_MEMBER_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lease_start", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("lease_start", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lease_end", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("lease_end", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("time_offset", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("time_offset", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("active_timestamp", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("active_timestamp", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("T1_timestamp", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("T1_timestamp", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("leader_epoch", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("leader_epoch", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("state", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("state", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("role", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("stage", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("stage", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("eg_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("eg_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("remaining_time_in_blacklist", // 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 + ADD_COLUMN_SCHEMA("remaining_time_in_blacklist", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -9901,17 +9891,16 @@ int ObInnerTableSchema::all_virtual_election_info_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_election_mem_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_election_mem_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9942,78 +9931,78 @@ int ObInnerTableSchema::all_virtual_election_mem_stat_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("alloc_count", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("alloc_count", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("release_count", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("release_count", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -10031,17 +10020,16 @@ int ObInnerTableSchema::all_virtual_election_mem_stat_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_audit_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_audit_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10072,1248 +10060,1248 @@ int ObInnerTableSchema::all_virtual_sql_audit_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 3, // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("request_id", // column_name - ++column_id, // column_id - 4, // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trace_id", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("client_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("client_port", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("effective_tenant_id", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_name", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("db_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("db_name", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_id", // 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 - OB_MAX_SQL_ID_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("query_sql", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_id", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("affected_rows", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("return_rows", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ret_code", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("qc_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dfo_id", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sqc_id", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("worker_id", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event", // 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 - OB_MAX_WAIT_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p1text", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p1", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p2text", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p2", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p3text", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p3", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("level", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_class_id", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_class#", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_class", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("state", // 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 - 19, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_time_micro", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_wait_time_micro", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_waits", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rpc_count", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_type", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_inner_sql", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_executor_rpc", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_hit_plan", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("request_time", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("elapsed_time", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("net_time", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("net_wait_time", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("queue_time", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("decode_time", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("get_plan_time", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("execute_time", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("application_wait_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("concurrency_wait_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_io_wait_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schedule_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_cache_hit", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("bloom_filter_cache_hit", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_cache_hit", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_index_cache_hit", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_reads", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("execution_id", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("retry_cnt", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_scan", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("consistency_level", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memstore_read_row_count", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ssstore_read_row_count", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("request_memory_used", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("expected_worker_count", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("used_worker_count", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sched_info", // 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 - 16384, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("fuse_row_cache_hit", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_client_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ps_stmt_id", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("transaction_hash", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("request_type", // 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 - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_batched_multi_stmt", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ob_trace_info", // 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 - 4096, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_hash", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_group", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lock_for_read_time", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_trx_migrate_time", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 3, //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("request_id", //column_name + ++column_id, //column_id + 4, //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("trace_id", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("client_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("client_port", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("effective_tenant_id", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("user_id", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("user_name", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("db_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("db_name", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("sql_id", //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 + OB_MAX_SQL_ID_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("query_sql", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("plan_id", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("affected_rows", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("return_rows", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("partition_cnt", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("ret_code", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("qc_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("dfo_id", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("sqc_id", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("worker_id", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("event", //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 + OB_MAX_WAIT_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("p1text", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("p1", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("p2text", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("p2", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("p3text", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("p3", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("level", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("wait_class_id", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("wait_class#", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("wait_class", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("state", //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 + 19, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("wait_time_micro", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("total_wait_time_micro", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("total_waits", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("rpc_count", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("plan_type", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("is_inner_sql", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("is_executor_rpc", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("is_hit_plan", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("request_time", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("elapsed_time", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("net_time", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("net_wait_time", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("queue_time", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("decode_time", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("get_plan_time", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("execute_time", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("application_wait_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("concurrency_wait_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("user_io_wait_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("schedule_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("row_cache_hit", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("bloom_filter_cache_hit", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("block_cache_hit", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("block_index_cache_hit", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("disk_reads", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("execution_id", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("session_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("retry_cnt", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("table_scan", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("consistency_level", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("memstore_read_row_count", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("ssstore_read_row_count", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("request_memory_used", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("expected_worker_count", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("used_worker_count", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("sched_info", //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 + 16384, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("fuse_row_cache_hit", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("user_client_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("ps_stmt_id", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("transaction_hash", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("request_type", //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 + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("is_batched_multi_stmt", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("ob_trace_info", //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 + 4096, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("plan_hash", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("user_group", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("lock_for_read_time", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("wait_trx_migrate_time", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -11331,17 +11319,16 @@ int ObInnerTableSchema::all_virtual_sql_audit_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_audit_all_virtual_sql_audit_i1_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_audit_all_virtual_sql_audit_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID))); @@ -11385,63 +11372,63 @@ int ObInnerTableSchema::all_virtual_sql_audit_all_virtual_sql_audit_i1_schema(Ob table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - column_id + 3, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + column_id + 3, //column_id + 1, //rowkey_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("request_id", // column_name - column_id + 4, // column_id - 2, // rowkey_id - 2, // 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 + ADD_COLUMN_SCHEMA("request_id", //column_name + column_id + 4, //column_id + 2, //rowkey_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - column_id + 1, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + column_id + 1, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - column_id + 2, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + column_id + 2, //column_id + 4, //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 } table_schema.set_index_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -11451,12 +11438,12 @@ int ObInnerTableSchema::all_virtual_sql_audit_all_virtual_sql_audit_i1_schema(Ob return ret; } -int ObInnerTableSchema::all_virtual_trans_mem_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_trans_mem_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11487,78 +11474,78 @@ int ObInnerTableSchema::all_virtual_trans_mem_stat_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("alloc_count", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("alloc_count", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("release_count", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("release_count", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -11576,17 +11563,16 @@ int ObInnerTableSchema::all_virtual_trans_mem_stat_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_partition_sstable_image_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_partition_sstable_image_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11617,230 +11603,230 @@ int ObInnerTableSchema::all_virtual_partition_sstable_image_info_schema(ObTableS table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - OB_MAX_CHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + OB_MAX_CHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("major_version", // 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 + ADD_COLUMN_SCHEMA("major_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_version", // 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 + ADD_COLUMN_SCHEMA("min_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ss_store_count", // 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 + ADD_COLUMN_SCHEMA("ss_store_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("merged_ss_store_count", // 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 + ADD_COLUMN_SCHEMA("merged_ss_store_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("modified_ss_store_count", // 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 + ADD_COLUMN_SCHEMA("modified_ss_store_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_block_count", // 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 + ADD_COLUMN_SCHEMA("macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("use_old_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("use_old_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("merge_start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("merge_start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("merge_finish_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("merge_finish_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("merge_process", // 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 + ADD_COLUMN_SCHEMA("merge_process", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rewrite_macro_old_micro_block_count", // 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 + ADD_COLUMN_SCHEMA("rewrite_macro_old_micro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rewrite_macro_total_micro_block_count", // 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 + ADD_COLUMN_SCHEMA("rewrite_macro_total_micro_block_count", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -11858,17 +11844,16 @@ int ObInnerTableSchema::all_virtual_partition_sstable_image_info_schema(ObTableS table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_core_root_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_core_root_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11899,520 +11884,520 @@ int ObInnerTableSchema::all_virtual_core_root_table_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_port", // 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 + ADD_COLUMN_SCHEMA("sql_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_id", // 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 + ADD_COLUMN_SCHEMA("unit_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role", // 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 + ADD_COLUMN_SCHEMA("role", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("member_list", // 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 - MAX_MEMBER_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("member_list", //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 + MAX_MEMBER_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_count", // 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 + ADD_COLUMN_SCHEMA("row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_size", // 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 + ADD_COLUMN_SCHEMA("data_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_version", // 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 + ADD_COLUMN_SCHEMA("data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_checksum", // 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 + ADD_COLUMN_SCHEMA("data_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_checksum", // 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 + ADD_COLUMN_SCHEMA("row_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_checksum", // 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 - COLUMN_CHECKSUM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("column_checksum", //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 + COLUMN_CHECKSUM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj is_original_leader_default; is_original_leader_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_original_leader", // 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 - is_original_leader_default, - is_original_leader_default); // default_value + ADD_COLUMN_SCHEMA_T("is_original_leader", //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 + is_original_leader_default, + is_original_leader_default); //default_value } if (OB_SUCC(ret)) { ObObj is_previous_leader_default; is_previous_leader_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_previous_leader", // 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 - is_previous_leader_default, - is_previous_leader_default); // default_value + ADD_COLUMN_SCHEMA_T("is_previous_leader", //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 + is_previous_leader_default, + is_previous_leader_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_time", // 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 + ADD_COLUMN_SCHEMA("create_time", //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 } if (OB_SUCC(ret)) { ObObj rebuild_default; rebuild_default.set_int(0); - ADD_COLUMN_SCHEMA_T("rebuild", // 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 - rebuild_default, - rebuild_default); // default_value + ADD_COLUMN_SCHEMA_T("rebuild", //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 + rebuild_default, + rebuild_default); //default_value } if (OB_SUCC(ret)) { ObObj replica_type_default; replica_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("replica_type", // 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 - replica_type_default, - replica_type_default); // default_value + ADD_COLUMN_SCHEMA_T("replica_type", //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 + replica_type_default, + replica_type_default); //default_value } if (OB_SUCC(ret)) { ObObj required_size_default; required_size_default.set_int(0); - ADD_COLUMN_SCHEMA_T("required_size", // 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 - required_size_default, - required_size_default); // default_value + ADD_COLUMN_SCHEMA_T("required_size", //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 + required_size_default, + required_size_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("REPLICA_STATUS_NORMAL")); - ADD_COLUMN_SCHEMA_T("status", // 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 - MAX_REPLICA_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + MAX_REPLICA_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { ObObj is_restore_default; is_restore_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_restore", // 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 - is_restore_default, - is_restore_default); // default_value + ADD_COLUMN_SCHEMA_T("is_restore", //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 + is_restore_default, + is_restore_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_checksum_default; partition_checksum_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_checksum", // 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 - partition_checksum_default, - partition_checksum_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_checksum", //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 + partition_checksum_default, + partition_checksum_default); //default_value } if (OB_SUCC(ret)) { ObObj quorum_default; quorum_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("quorum", // 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 - quorum_default, - quorum_default); // default_value + ADD_COLUMN_SCHEMA_T("quorum", //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 + quorum_default, + quorum_default); //default_value } if (OB_SUCC(ret)) { ObObj fail_list_default; fail_list_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("fail_list", // 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 - OB_MAX_FAILLIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - fail_list_default, - fail_list_default); // default_value + ADD_COLUMN_SCHEMA_T("fail_list", //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 + OB_MAX_FAILLIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + fail_list_default, + fail_list_default); //default_value } if (OB_SUCC(ret)) { ObObj recovery_timestamp_default; recovery_timestamp_default.set_int(0); - ADD_COLUMN_SCHEMA_T("recovery_timestamp", // 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 - recovery_timestamp_default, - recovery_timestamp_default); // default_value + ADD_COLUMN_SCHEMA_T("recovery_timestamp", //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 + recovery_timestamp_default, + recovery_timestamp_default); //default_value } if (OB_SUCC(ret)) { ObObj memstore_percent_default; memstore_percent_default.set_int(100); - ADD_COLUMN_SCHEMA_T("memstore_percent", // 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 - memstore_percent_default, - memstore_percent_default); // default_value + ADD_COLUMN_SCHEMA_T("memstore_percent", //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 + memstore_percent_default, + memstore_percent_default); //default_value } if (OB_SUCC(ret)) { ObObj data_file_id_default; data_file_id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("data_file_id", // 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 - data_file_id_default, - data_file_id_default); // default_value + ADD_COLUMN_SCHEMA_T("data_file_id", //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 + data_file_id_default, + data_file_id_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -12422,17 +12407,16 @@ int ObInnerTableSchema::all_virtual_core_root_table_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_core_all_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_core_all_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -12463,1196 +12447,1196 @@ int ObInnerTableSchema::all_virtual_core_all_table_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { ObObj table_name_default; table_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("table_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_name_default, - table_name_default); // default_value + ADD_COLUMN_SCHEMA_T("table_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_name_default, + table_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_type", // 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 + ADD_COLUMN_SCHEMA("table_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("load_type", // 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 + ADD_COLUMN_SCHEMA("load_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_type", // 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 + ADD_COLUMN_SCHEMA("def_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey_column_num", // 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 + ADD_COLUMN_SCHEMA("rowkey_column_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_column_num", // 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 + ADD_COLUMN_SCHEMA("index_column_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_used_column_id", // 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 + ADD_COLUMN_SCHEMA("max_used_column_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 + ADD_COLUMN_SCHEMA("replica_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("autoinc_column_id", // 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 + ADD_COLUMN_SCHEMA("autoinc_column_id", //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 } if (OB_SUCC(ret)) { ObObj auto_increment_default; auto_increment_default.set_uint64(1); - ADD_COLUMN_SCHEMA_T("auto_increment", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - auto_increment_default, - auto_increment_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_increment", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + auto_increment_default, + auto_increment_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("read_only", // 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 + ADD_COLUMN_SCHEMA("read_only", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey_split_pos", // 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 + ADD_COLUMN_SCHEMA("rowkey_split_pos", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("expire_condition", // 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 - OB_MAX_EXPIRE_INFO_STRING_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("expire_condition", //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 + OB_MAX_EXPIRE_INFO_STRING_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_use_bloomfilter", // 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 + ADD_COLUMN_SCHEMA("is_use_bloomfilter", //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 } if (OB_SUCC(ret)) { ObObj comment_default; comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - comment_default, - comment_default); // default_value + ADD_COLUMN_SCHEMA_T("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + comment_default, + comment_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 + ADD_COLUMN_SCHEMA("block_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 + ADD_COLUMN_SCHEMA("collation_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_table_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_table_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_status", // 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 + ADD_COLUMN_SCHEMA("index_status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // 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 + ADD_COLUMN_SCHEMA("tablegroup_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("progressive_merge_num", // 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 + ADD_COLUMN_SCHEMA("progressive_merge_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_type", // 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 + ADD_COLUMN_SCHEMA("index_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_level", // 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 + ADD_COLUMN_SCHEMA("part_level", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_func_type", // 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 + ADD_COLUMN_SCHEMA("part_func_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_func_expr", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_func_expr", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_num", // 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 + ADD_COLUMN_SCHEMA("part_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_func_type", // 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 + ADD_COLUMN_SCHEMA("sub_part_func_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_func_expr", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_func_expr", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_num", // 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 + ADD_COLUMN_SCHEMA("sub_part_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_mem_version", // 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 + ADD_COLUMN_SCHEMA("create_mem_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_definition", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("view_definition", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_check_option", // 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 + ADD_COLUMN_SCHEMA("view_check_option", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_is_updatable", // 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 + ADD_COLUMN_SCHEMA("view_is_updatable", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_list", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone_list", //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 + MAX_ZONE_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj index_using_type_default; index_using_type_default.set_int(USING_BTREE); - ADD_COLUMN_SCHEMA_T("index_using_type", // 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 - index_using_type_default, - index_using_type_default); // default_value + ADD_COLUMN_SCHEMA_T("index_using_type", //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 + index_using_type_default, + index_using_type_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parser_name", // 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 - OB_MAX_PARSER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parser_name", //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 + OB_MAX_PARSER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj index_attributes_set_default; index_attributes_set_default.set_int(0); - ADD_COLUMN_SCHEMA_T("index_attributes_set", // 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 - true, // is_nullable - false, // is_autoincrement - index_attributes_set_default, - index_attributes_set_default); // default_value + ADD_COLUMN_SCHEMA_T("index_attributes_set", //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 + true, //is_nullable + false, //is_autoincrement + index_attributes_set_default, + index_attributes_set_default); //default_value } if (OB_SUCC(ret)) { ObObj locality_default; locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - locality_default, - locality_default); // default_value + ADD_COLUMN_SCHEMA_T("locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + locality_default, + locality_default); //default_value } if (OB_SUCC(ret)) { ObObj tablet_size_default; tablet_size_default.set_int(OB_DEFAULT_TABLET_SIZE); - ADD_COLUMN_SCHEMA_T("tablet_size", // 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 - tablet_size_default, - tablet_size_default); // default_value + ADD_COLUMN_SCHEMA_T("tablet_size", //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 + tablet_size_default, + tablet_size_default); //default_value } if (OB_SUCC(ret)) { ObObj pctfree_default; pctfree_default.set_int(OB_DEFAULT_PCTFREE); - ADD_COLUMN_SCHEMA_T("pctfree", // 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 - pctfree_default, - pctfree_default); // default_value + ADD_COLUMN_SCHEMA_T("pctfree", //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 + pctfree_default, + pctfree_default); //default_value } if (OB_SUCC(ret)) { ObObj previous_locality_default; previous_locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("previous_locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - previous_locality_default, - previous_locality_default); // default_value + ADD_COLUMN_SCHEMA_T("previous_locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + previous_locality_default, + previous_locality_default); //default_value } if (OB_SUCC(ret)) { ObObj max_used_part_id_default; max_used_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("max_used_part_id", // 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_used_part_id_default, - max_used_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("max_used_part_id", //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_used_part_id_default, + max_used_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_cnt_within_partition_table_default; partition_cnt_within_partition_table_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("partition_cnt_within_partition_table", // 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 - partition_cnt_within_partition_table_default, - partition_cnt_within_partition_table_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_cnt_within_partition_table", //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 + partition_cnt_within_partition_table_default, + partition_cnt_within_partition_table_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_status_default; partition_status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_status", // 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 - true, // is_nullable - false, // is_autoincrement - partition_status_default, - partition_status_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_status", //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 + true, //is_nullable + false, //is_autoincrement + partition_status_default, + partition_status_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_schema_version_default; partition_schema_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - partition_schema_version_default, - partition_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + partition_schema_version_default, + partition_schema_version_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_used_constraint_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_used_constraint_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj session_id_default; session_id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("session_id", // 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 - true, // is_nullable - false, // is_autoincrement - session_id_default, - session_id_default); // default_value + ADD_COLUMN_SCHEMA_T("session_id", //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 + true, //is_nullable + false, //is_autoincrement + session_id_default, + session_id_default); //default_value } if (OB_SUCC(ret)) { ObObj pk_comment_default; pk_comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("pk_comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - pk_comment_default, - pk_comment_default); // default_value + ADD_COLUMN_SCHEMA_T("pk_comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + pk_comment_default, + pk_comment_default); //default_value } if (OB_SUCC(ret)) { ObObj sess_active_time_default; sess_active_time_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sess_active_time", // 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 - true, // is_nullable - false, // is_autoincrement - sess_active_time_default, - sess_active_time_default); // default_value + ADD_COLUMN_SCHEMA_T("sess_active_time", //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 + true, //is_nullable + false, //is_autoincrement + sess_active_time_default, + sess_active_time_default); //default_value } if (OB_SUCC(ret)) { ObObj row_store_type_default; row_store_type_default.set_varchar(ObString::make_string("FLAT_ROW_STORE")); - ADD_COLUMN_SCHEMA_T("row_store_type", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - row_store_type_default, - row_store_type_default); // default_value + ADD_COLUMN_SCHEMA_T("row_store_type", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + row_store_type_default, + row_store_type_default); //default_value } if (OB_SUCC(ret)) { ObObj store_format_default; store_format_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("store_format", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - store_format_default, - store_format_default); // default_value + ADD_COLUMN_SCHEMA_T("store_format", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + store_format_default, + store_format_default); //default_value } if (OB_SUCC(ret)) { ObObj duplicate_scope_default; duplicate_scope_default.set_int(0); - ADD_COLUMN_SCHEMA_T("duplicate_scope", // 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 - true, // is_nullable - false, // is_autoincrement - duplicate_scope_default, - duplicate_scope_default); // default_value + ADD_COLUMN_SCHEMA_T("duplicate_scope", //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 + true, //is_nullable + false, //is_autoincrement + duplicate_scope_default, + duplicate_scope_default); //default_value } if (OB_SUCC(ret)) { ObObj binding_default; binding_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("binding", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - binding_default, - binding_default); // default_value + ADD_COLUMN_SCHEMA_T("binding", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + binding_default, + binding_default); //default_value } if (OB_SUCC(ret)) { ObObj progressive_merge_round_default; progressive_merge_round_default.set_int(0); - ADD_COLUMN_SCHEMA_T("progressive_merge_round", // 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 - true, // is_nullable - false, // is_autoincrement - progressive_merge_round_default, - progressive_merge_round_default); // default_value + ADD_COLUMN_SCHEMA_T("progressive_merge_round", //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 + true, //is_nullable + false, //is_autoincrement + progressive_merge_round_default, + progressive_merge_round_default); //default_value } if (OB_SUCC(ret)) { ObObj storage_format_version_default; storage_format_version_default.set_int(2); - ADD_COLUMN_SCHEMA_T("storage_format_version", // 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 - true, // is_nullable - false, // is_autoincrement - storage_format_version_default, - storage_format_version_default); // default_value + ADD_COLUMN_SCHEMA_T("storage_format_version", //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 + true, //is_nullable + false, //is_autoincrement + storage_format_version_default, + storage_format_version_default); //default_value } if (OB_SUCC(ret)) { ObObj table_mode_default; table_mode_default.set_int(0); - ADD_COLUMN_SCHEMA_T("table_mode", // 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 - table_mode_default, - table_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("table_mode", //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 + table_mode_default, + table_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj encryption_default; encryption_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("encryption", // 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 - OB_MAX_ENCRYPTION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - encryption_default, - encryption_default); // default_value + ADD_COLUMN_SCHEMA_T("encryption", //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 + OB_MAX_ENCRYPTION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + encryption_default, + encryption_default); //default_value } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj is_sub_part_template_default; is_sub_part_template_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("is_sub_part_template", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_sub_part_template_default, - is_sub_part_template_default); // default_value + ADD_COLUMN_SCHEMA_T("is_sub_part_template", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_sub_part_template_default, + is_sub_part_template_default); //default_value } if (OB_SUCC(ret)) { ObObj dop_default; dop_default.set_int(1); - ADD_COLUMN_SCHEMA_T("dop", // 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 - dop_default, - dop_default); // default_value + ADD_COLUMN_SCHEMA_T("dop", //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 + dop_default, + dop_default); //default_value } if (OB_SUCC(ret)) { ObObj character_set_client_default; character_set_client_default.set_int(0); - ADD_COLUMN_SCHEMA_T("character_set_client", // 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 - character_set_client_default, - character_set_client_default); // default_value + ADD_COLUMN_SCHEMA_T("character_set_client", //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 + character_set_client_default, + character_set_client_default); //default_value } if (OB_SUCC(ret)) { ObObj collation_connection_default; collation_connection_default.set_int(0); - ADD_COLUMN_SCHEMA_T("collation_connection", // 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 - collation_connection_default, - collation_connection_default); // default_value + ADD_COLUMN_SCHEMA_T("collation_connection", //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 + collation_connection_default, + collation_connection_default); //default_value } if (OB_SUCC(ret)) { ObObj auto_part_size_default; auto_part_size_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("auto_part_size", // 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 - auto_part_size_default, - auto_part_size_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_part_size", //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 + auto_part_size_default, + auto_part_size_default); //default_value } if (OB_SUCC(ret)) { ObObj auto_part_default; auto_part_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("auto_part", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - auto_part_default, - auto_part_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_part", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + auto_part_default, + auto_part_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -13662,17 +13646,16 @@ int ObInnerTableSchema::all_virtual_core_all_table_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_core_column_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_core_column_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -13703,428 +13686,428 @@ int ObInnerTableSchema::all_virtual_core_column_table_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { ObObj column_name_default; column_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("column_name", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - column_name_default, - column_name_default); // default_value + ADD_COLUMN_SCHEMA_T("column_name", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + column_name_default, + column_name_default); //default_value } if (OB_SUCC(ret)) { ObObj rowkey_position_default; rowkey_position_default.set_int(0); - ADD_COLUMN_SCHEMA_T("rowkey_position", // 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 - rowkey_position_default, - rowkey_position_default); // default_value + ADD_COLUMN_SCHEMA_T("rowkey_position", //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 + rowkey_position_default, + rowkey_position_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_position", // 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 + ADD_COLUMN_SCHEMA("index_position", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("order_in_rowkey", // 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 + ADD_COLUMN_SCHEMA("order_in_rowkey", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_key_position", // 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 + ADD_COLUMN_SCHEMA("partition_key_position", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 + ADD_COLUMN_SCHEMA("data_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_length", // 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 + ADD_COLUMN_SCHEMA("data_length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_precision", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_precision", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_scale", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_scale", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zero_fill", // 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 + ADD_COLUMN_SCHEMA("zero_fill", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("nullable", // 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 + ADD_COLUMN_SCHEMA("nullable", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("on_update_current_timestamp", // 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 + ADD_COLUMN_SCHEMA("on_update_current_timestamp", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("autoincrement", // 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 + ADD_COLUMN_SCHEMA("autoincrement", //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 } if (OB_SUCC(ret)) { ObObj is_hidden_default; is_hidden_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_hidden", // 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 - is_hidden_default, - is_hidden_default); // default_value + ADD_COLUMN_SCHEMA_T("is_hidden", //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 + is_hidden_default, + is_hidden_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 + ADD_COLUMN_SCHEMA("collation_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("orig_default_value", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("orig_default_value", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_default_value", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cur_default_value", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { ObObj column_flags_default; column_flags_default.set_int(0); - ADD_COLUMN_SCHEMA_T("column_flags", // 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 - column_flags_default, - column_flags_default); // default_value + ADD_COLUMN_SCHEMA_T("column_flags", //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 + column_flags_default, + column_flags_default); //default_value } if (OB_SUCC(ret)) { ObObj prev_column_id_default; prev_column_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("prev_column_id", // 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 - prev_column_id_default, - prev_column_id_default); // default_value + ADD_COLUMN_SCHEMA_T("prev_column_id", //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 + prev_column_id_default, + prev_column_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("extended_type_info", // 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_VARBINARY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("extended_type_info", //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_VARBINARY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("orig_default_value_v2", // 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_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("orig_default_value_v2", //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_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_default_value_v2", // 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_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cur_default_value_v2", //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_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -14134,17 +14117,16 @@ int ObInnerTableSchema::all_virtual_core_column_table_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_memory_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_memory_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -14175,228 +14157,228 @@ int ObInnerTableSchema::all_virtual_memory_info_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ctx_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("ctx_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("label", // column_name - ++column_id, // column_id - 5, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_CHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("label", //column_name + ++column_id, //column_id + 5, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_CHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ctx_name", // 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 - OB_MAX_CHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ctx_name", //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 + OB_MAX_CHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mod_type", // 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 - OB_MAX_CHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("mod_type", //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 + OB_MAX_CHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mod_id", // 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 + ADD_COLUMN_SCHEMA("mod_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mod_name", // 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 - OB_MAX_CHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("mod_name", //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 + OB_MAX_CHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - OB_MAX_CHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + OB_MAX_CHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hold", // 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 + ADD_COLUMN_SCHEMA("hold", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("used", // 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 + ADD_COLUMN_SCHEMA("used", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("count", // 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 + ADD_COLUMN_SCHEMA("count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("alloc_count", // 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 + ADD_COLUMN_SCHEMA("alloc_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("free_count", // 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 + ADD_COLUMN_SCHEMA("free_count", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -14414,17 +14396,16 @@ int ObInnerTableSchema::all_virtual_memory_info_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -14455,63 +14436,63 @@ int ObInnerTableSchema::all_virtual_tenant_stat_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_count", // 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 + ADD_COLUMN_SCHEMA("table_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_count", // 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 + ADD_COLUMN_SCHEMA("row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_size", // 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 + ADD_COLUMN_SCHEMA("total_size", //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 } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -14521,17 +14502,16 @@ int ObInnerTableSchema::all_virtual_tenant_stat_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sys_parameter_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sys_parameter_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -14562,228 +14542,228 @@ int ObInnerTableSchema::all_virtual_sys_parameter_stat_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_type", // 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 - SERVER_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_type", //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 + SERVER_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - OB_MAX_CONFIG_NAME_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + OB_MAX_CONFIG_NAME_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 - OB_MAX_CONFIG_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_type", //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 + OB_MAX_CONFIG_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value_strict", // 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 - OB_MAX_EXTRA_CONFIG_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value_strict", //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 + OB_MAX_EXTRA_CONFIG_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_CONFIG_INFO_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_CONFIG_INFO_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("need_reboot", // 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 + ADD_COLUMN_SCHEMA("need_reboot", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("section", // 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 - OB_MAX_CONFIG_SECTION_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("section", //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 + OB_MAX_CONFIG_SECTION_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("visible_level", // 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 - OB_MAX_CONFIG_VISIBLE_LEVEL_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("visible_level", //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 + OB_MAX_CONFIG_VISIBLE_LEVEL_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scope", // 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 - OB_MAX_CONFIG_SCOPE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("scope", //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 + OB_MAX_CONFIG_SCOPE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("source", // 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 - OB_MAX_CONFIG_SOURCE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("source", //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 + OB_MAX_CONFIG_SOURCE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("edit_level", // 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 - OB_MAX_CONFIG_EDIT_LEVEL_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("edit_level", //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 + OB_MAX_CONFIG_EDIT_LEVEL_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -14801,17 +14781,16 @@ int ObInnerTableSchema::all_virtual_sys_parameter_stat_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_partition_replay_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_partition_replay_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -14842,288 +14821,288 @@ int ObInnerTableSchema::all_virtual_partition_replay_status_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // 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 + ADD_COLUMN_SCHEMA("partition_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pending_task_count", // 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 + ADD_COLUMN_SCHEMA("pending_task_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("retried_task_count", // 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 + ADD_COLUMN_SCHEMA("retried_task_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("post_barrier_status", // 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 - MAX_FREEZE_SUBMIT_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("post_barrier_status", //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 + MAX_FREEZE_SUBMIT_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_enabled", // 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 + ADD_COLUMN_SCHEMA("is_enabled", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_confirmed_log_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_confirmed_log_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_replay_log_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("last_replay_log_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_replay_log_type", // 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 - MAX_REPLAY_LOG_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("last_replay_log_type", //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 + MAX_REPLAY_LOG_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_submmited_task_count", // 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 + ADD_COLUMN_SCHEMA("total_submmited_task_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_replayed_task_count", // 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 + ADD_COLUMN_SCHEMA("total_replayed_task_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("next_submit_log_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("next_submit_log_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("next_submit_log_ts", // 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 + ADD_COLUMN_SCHEMA("next_submit_log_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_slide_out_log_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("last_slide_out_log_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_slide_out_log_ts", // 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 + ADD_COLUMN_SCHEMA("last_slide_out_log_ts", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -15141,17 +15120,16 @@ int ObInnerTableSchema::all_virtual_partition_replay_status_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_clog_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_clog_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -15182,398 +15160,398 @@ int ObInnerTableSchema::all_virtual_clog_stat_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // 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 + ADD_COLUMN_SCHEMA("partition_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role", // 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 - 32, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("role", //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 + 32, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - 32, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + 32, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("leader", // 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 - 32, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("leader", //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 + 32, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_index_log_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("last_index_log_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("last_index_log_timestamp", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("last_index_log_timestamp", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_log_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("last_log_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("active_freeze_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 - 32, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("active_freeze_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 + 32, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("curr_member_list", // 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 + ADD_COLUMN_SCHEMA("curr_member_list", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("member_ship_log_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("member_ship_log_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_offline", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_offline", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_in_sync", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_in_sync", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("start_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parent", // 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 - 32, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parent", //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 + 32, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("children_list", // 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 + ADD_COLUMN_SCHEMA("children_list", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("accu_log_count", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("accu_log_count", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("accu_log_delay", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("accu_log_delay", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj replica_type_default; replica_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("replica_type", // 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 - replica_type_default, - replica_type_default); // default_value + ADD_COLUMN_SCHEMA_T("replica_type", //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 + replica_type_default, + replica_type_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("allow_gc", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("allow_gc", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("quorum", // 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 + ADD_COLUMN_SCHEMA("quorum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_need_rebuild", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_need_rebuild", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("next_replay_ts_delta", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("next_replay_ts_delta", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -15591,17 +15569,16 @@ int ObInnerTableSchema::all_virtual_clog_stat_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_trace_log_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_trace_log_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -15632,48 +15609,48 @@ int ObInnerTableSchema::all_virtual_trace_log_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("title", // 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 - 256, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("title", //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 + 256, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("key_value", // 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 + ADD_COLUMN_SCHEMA("key_value", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("time", // 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 - 10, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("time", //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 + 10, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -15683,17 +15660,16 @@ int ObInnerTableSchema::all_virtual_trace_log_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_engine_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_engine_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -15724,93 +15700,93 @@ int ObInnerTableSchema::all_virtual_engine_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Engine", // 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 - MAX_ENGINE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("Engine", //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 + MAX_ENGINE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Support", // 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 - MAX_BOOL_STR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("Support", //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 + MAX_BOOL_STR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Comment", // 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 - MAX_COLUMN_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("Comment", //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 + MAX_COLUMN_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Transactions", // 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 - MAX_BOOL_STR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("Transactions", //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 + MAX_BOOL_STR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("XA", // 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 - MAX_BOOL_STR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("XA", //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 + MAX_BOOL_STR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Savepoints", // 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 - MAX_BOOL_STR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("Savepoints", //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 + MAX_BOOL_STR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -15820,17 +15796,16 @@ int ObInnerTableSchema::all_virtual_engine_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_proxy_server_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_proxy_server_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -15861,93 +15836,93 @@ int ObInnerTableSchema::all_virtual_proxy_server_stat_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_service_time", // 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 + ADD_COLUMN_SCHEMA("start_service_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("stop_time", // 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 + ADD_COLUMN_SCHEMA("stop_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_SERVER_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_SERVER_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -15957,17 +15932,16 @@ int ObInnerTableSchema::all_virtual_proxy_server_stat_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_proxy_sys_variable_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_proxy_sys_variable_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -15998,93 +15972,93 @@ int ObInnerTableSchema::all_virtual_proxy_sys_variable_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - OB_MAX_CONFIG_NAME_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + OB_MAX_CONFIG_NAME_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 + ADD_COLUMN_SCHEMA("data_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flags", // 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 + ADD_COLUMN_SCHEMA("flags", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("modified_time", // 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 + ADD_COLUMN_SCHEMA("modified_time", //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 } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -16094,17 +16068,16 @@ int ObInnerTableSchema::all_virtual_proxy_sys_variable_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_proxy_schema_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_proxy_schema_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -16135,348 +16108,348 @@ int ObInnerTableSchema::all_virtual_proxy_schema_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 5, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 5, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_port", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("sql_port", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role", // 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 + ADD_COLUMN_SCHEMA("role", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_num", // 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 + ADD_COLUMN_SCHEMA("part_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 + ADD_COLUMN_SCHEMA("replica_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_type", // 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 + ADD_COLUMN_SCHEMA("table_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 + ADD_COLUMN_SCHEMA("spare1", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 + ADD_COLUMN_SCHEMA("spare2", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 + ADD_COLUMN_SCHEMA("spare3", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare4", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare4", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare5", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare5", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare6", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare6", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("complex_table_type", // 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 + ADD_COLUMN_SCHEMA("complex_table_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("level1_decoded_db_name", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("level1_decoded_db_name", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("level1_decoded_table_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("level1_decoded_table_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("level2_decoded_db_name", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("level2_decoded_db_name", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("level2_decoded_table_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("level2_decoded_table_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -16486,17 +16459,16 @@ int ObInnerTableSchema::all_virtual_proxy_schema_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_plan_cache_plan_explain_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_plan_cache_plan_explain_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -16527,168 +16499,168 @@ int ObInnerTableSchema::all_virtual_plan_cache_plan_explain_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("plan_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("operator", // 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 - OB_MAX_OPERATOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("operator", //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 + OB_MAX_OPERATOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - OB_MAX_PLAN_EXPLAIN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + OB_MAX_PLAN_EXPLAIN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rows", // 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 + ADD_COLUMN_SCHEMA("rows", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cost", // 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 + ADD_COLUMN_SCHEMA("cost", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("property", // 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 - OB_MAX_OPERATOR_PROPERTY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("property", //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 + OB_MAX_OPERATOR_PROPERTY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_depth", // 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 + ADD_COLUMN_SCHEMA("plan_depth", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_line_id", // 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 + ADD_COLUMN_SCHEMA("plan_line_id", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -16706,17 +16678,16 @@ int ObInnerTableSchema::all_virtual_plan_cache_plan_explain_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_obrpc_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_obrpc_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -16747,425 +16718,425 @@ int ObInnerTableSchema::all_virtual_obrpc_stat_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dest_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dest_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dest_port", // 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 + ADD_COLUMN_SCHEMA("dest_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index", // 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 + ADD_COLUMN_SCHEMA("index", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - OB_MAX_CHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + OB_MAX_CHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pcode", // 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 + ADD_COLUMN_SCHEMA("pcode", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pcode_name", // 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 - OB_MAX_CHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("pcode_name", //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 + OB_MAX_CHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("count", // 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 + ADD_COLUMN_SCHEMA("count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_time", // 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 + ADD_COLUMN_SCHEMA("total_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_size", // 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 + ADD_COLUMN_SCHEMA("total_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_time", // 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 + ADD_COLUMN_SCHEMA("max_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_time", // 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 + ADD_COLUMN_SCHEMA("min_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_size", // 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 + ADD_COLUMN_SCHEMA("max_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_size", // 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 + ADD_COLUMN_SCHEMA("min_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("failure", // 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 + ADD_COLUMN_SCHEMA("failure", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("timeout", // 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 + ADD_COLUMN_SCHEMA("timeout", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sync", // 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 + ADD_COLUMN_SCHEMA("sync", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("async", // 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 + ADD_COLUMN_SCHEMA("async", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("last_timestamp", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("last_timestamp", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("isize", // 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 + ADD_COLUMN_SCHEMA("isize", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("icount", // 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 + ADD_COLUMN_SCHEMA("icount", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("net_time", // 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 + ADD_COLUMN_SCHEMA("net_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("wait_time", // 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 + ADD_COLUMN_SCHEMA("wait_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("queue_time", // 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 + ADD_COLUMN_SCHEMA("queue_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("process_time", // 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 + ADD_COLUMN_SCHEMA("process_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("ilast_timestamp", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("ilast_timestamp", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -17183,10 +17154,10 @@ int ObInnerTableSchema::all_virtual_obrpc_stat_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.11051_11100.cpp b/src/share/inner_table/ob_inner_table_schema.11051_11100.cpp index 38a67ec6e..e3bb6596c 100644 --- a/src/share/inner_table/ob_inner_table_schema.11051_11100.cpp +++ b/src/share/inner_table/ob_inner_table_schema.11051_11100.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::all_virtual_partition_sstable_merge_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_partition_sstable_merge_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -58,543 +60,543 @@ int ObInnerTableSchema::all_virtual_partition_sstable_merge_info_schema(ObTableS table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("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 - OB_SYS_TASK_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("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 + OB_SYS_TASK_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 + ADD_COLUMN_SCHEMA("partition_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("merge_type", // 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 - OB_SYS_TASK_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("merge_type", //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 + OB_SYS_TASK_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_type", // 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 + ADD_COLUMN_SCHEMA("table_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("major_table_id", // 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 + ADD_COLUMN_SCHEMA("major_table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("merge_start_time", // 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 + ADD_COLUMN_SCHEMA("merge_start_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("merge_finish_time", // 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 + ADD_COLUMN_SCHEMA("merge_finish_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("merge_cost_time", // 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 + ADD_COLUMN_SCHEMA("merge_cost_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("estimate_cost_time", // 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 + ADD_COLUMN_SCHEMA("estimate_cost_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("occupy_size", // 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 + ADD_COLUMN_SCHEMA("occupy_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_block_count", // 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 + ADD_COLUMN_SCHEMA("macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("use_old_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("use_old_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("build_bloomfilter_count", // 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 + ADD_COLUMN_SCHEMA("build_bloomfilter_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_row_count", // 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 + ADD_COLUMN_SCHEMA("total_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("delete_row_count", // 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 + ADD_COLUMN_SCHEMA("delete_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("insert_row_count", // 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 + ADD_COLUMN_SCHEMA("insert_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("update_row_count", // 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 + ADD_COLUMN_SCHEMA("update_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("base_row_count", // 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 + ADD_COLUMN_SCHEMA("base_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("use_base_row_count", // 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 + ADD_COLUMN_SCHEMA("use_base_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memtable_row_count", // 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 + ADD_COLUMN_SCHEMA("memtable_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("purged_row_count", // 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 + ADD_COLUMN_SCHEMA("purged_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("output_row_count", // 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 + ADD_COLUMN_SCHEMA("output_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("merge_level", // 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 + ADD_COLUMN_SCHEMA("merge_level", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rewrite_macro_old_micro_block_count", // 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 + ADD_COLUMN_SCHEMA("rewrite_macro_old_micro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rewrite_macro_total_micro_block_count", // 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 + ADD_COLUMN_SCHEMA("rewrite_macro_total_micro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_child_task", // 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 + ADD_COLUMN_SCHEMA("total_child_task", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_child_task", // 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 + ADD_COLUMN_SCHEMA("finish_child_task", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("step_merge_percentage", // 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 + ADD_COLUMN_SCHEMA("step_merge_percentage", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("merge_percentage", // 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 + ADD_COLUMN_SCHEMA("merge_percentage", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("error_code", // 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 + ADD_COLUMN_SCHEMA("error_code", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_count", // 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 + ADD_COLUMN_SCHEMA("table_count", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -612,17 +614,16 @@ int ObInnerTableSchema::all_virtual_partition_sstable_merge_info_schema(ObTableS table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_monitor_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_monitor_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -653,184 +654,184 @@ int ObInnerTableSchema::all_virtual_sql_monitor_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("request_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("request_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_id", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("task_id", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_id", // 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 + ADD_COLUMN_SCHEMA("plan_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scheduler_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("scheduler_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scheduler_port", // 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 + ADD_COLUMN_SCHEMA("scheduler_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("monitor_info", // 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 - OB_MAX_MONITOR_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("monitor_info", //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 + OB_MAX_MONITOR_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("extend_info", // 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 - OB_MAX_MONITOR_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("extend_info", //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 + OB_MAX_MONITOR_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("sql_exec_start", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("sql_exec_start", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -848,17 +849,16 @@ int ObInnerTableSchema::all_virtual_sql_monitor_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_outline_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_outline_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -889,146 +889,146 @@ int ObInnerTableSchema::tenant_virtual_outline_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_id", // 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 + ADD_COLUMN_SCHEMA("outline_id", //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 } if (OB_SUCC(ret)) { ObObj database_name_default; database_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("database_name", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - database_name_default, - database_name_default); // default_value + ADD_COLUMN_SCHEMA_T("database_name", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + database_name_default, + database_name_default); //default_value } if (OB_SUCC(ret)) { ObObj outline_name_default; outline_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("outline_name", // 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 - OB_MAX_OUTLINE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - outline_name_default, - outline_name_default); // default_value + ADD_COLUMN_SCHEMA_T("outline_name", //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 + OB_MAX_OUTLINE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + outline_name_default, + outline_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("visible_signature", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("visible_signature", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_text", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_text", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_target", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("outline_target", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_sql", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("outline_sql", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1038,17 +1038,16 @@ int ObInnerTableSchema::tenant_virtual_outline_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_concurrent_limit_sql_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_concurrent_limit_sql_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1079,165 +1078,165 @@ int ObInnerTableSchema::tenant_virtual_concurrent_limit_sql_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_id", // 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 + ADD_COLUMN_SCHEMA("outline_id", //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 } if (OB_SUCC(ret)) { ObObj database_name_default; database_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("database_name", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - database_name_default, - database_name_default); // default_value + ADD_COLUMN_SCHEMA_T("database_name", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + database_name_default, + database_name_default); //default_value } if (OB_SUCC(ret)) { ObObj outline_name_default; outline_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("outline_name", // 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 - OB_MAX_OUTLINE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - outline_name_default, - outline_name_default); // default_value + ADD_COLUMN_SCHEMA_T("outline_name", //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 + OB_MAX_OUTLINE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + outline_name_default, + outline_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_content", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("outline_content", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("visible_signature", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("visible_signature", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_text", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_text", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj concurrent_num_default; concurrent_num_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("concurrent_num", // 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 - concurrent_num_default, - concurrent_num_default); // default_value + ADD_COLUMN_SCHEMA_T("concurrent_num", //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 + concurrent_num_default, + concurrent_num_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("limit_target", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("limit_target", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1247,17 +1246,16 @@ int ObInnerTableSchema::tenant_virtual_concurrent_limit_sql_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_plan_statistics_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_plan_statistics_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1288,228 +1286,228 @@ int ObInnerTableSchema::all_virtual_sql_plan_statistics_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("plan_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("operation_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("operation_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("executions", // 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 + ADD_COLUMN_SCHEMA("executions", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("output_rows", // 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 + ADD_COLUMN_SCHEMA("output_rows", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("input_rows", // 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 + ADD_COLUMN_SCHEMA("input_rows", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rescan_times", // 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 + ADD_COLUMN_SCHEMA("rescan_times", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("buffer_gets", // 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 + ADD_COLUMN_SCHEMA("buffer_gets", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_reads", // 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 + ADD_COLUMN_SCHEMA("disk_reads", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_writes", // 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 + ADD_COLUMN_SCHEMA("disk_writes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("elapsed_time", // 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 + ADD_COLUMN_SCHEMA("elapsed_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("extend_info1", // 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 - OB_MAX_MONITOR_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("extend_info1", //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 + OB_MAX_MONITOR_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("extend_info2", // 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 - OB_MAX_MONITOR_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("extend_info2", //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 + OB_MAX_MONITOR_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -1527,17 +1525,16 @@ int ObInnerTableSchema::all_virtual_sql_plan_statistics_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_partition_sstable_macro_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_partition_sstable_macro_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1568,348 +1565,348 @@ int ObInnerTableSchema::all_virtual_partition_sstable_macro_info_schema(ObTableS table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_version", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("data_version", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("base_version", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("base_version", //column_name + ++column_id, //column_id + 7, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("multi_version_start", // column_name - ++column_id, // column_id - 8, // 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 + ADD_COLUMN_SCHEMA("multi_version_start", //column_name + ++column_id, //column_id + 8, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // column_name - ++column_id, // column_id - 9, // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //column_name + ++column_id, //column_id + 9, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_idx_in_sstable", // column_name - ++column_id, // column_id - 10, // 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 + ADD_COLUMN_SCHEMA("macro_idx_in_sstable", //column_name + ++column_id, //column_id + 10, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("major_table_id", // 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 + ADD_COLUMN_SCHEMA("major_table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_data_version", // 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 + ADD_COLUMN_SCHEMA("macro_data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_idx_in_data_file", // 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 + ADD_COLUMN_SCHEMA("macro_idx_in_data_file", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_seq", // 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 + ADD_COLUMN_SCHEMA("data_seq", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_count", // 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 + ADD_COLUMN_SCHEMA("row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("occupy_size", // 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 + ADD_COLUMN_SCHEMA("occupy_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("micro_block_count", // 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 + ADD_COLUMN_SCHEMA("micro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_checksum", // 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 + ADD_COLUMN_SCHEMA("data_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_range", // 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 - OB_MAX_RANGE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("macro_range", //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 + OB_MAX_RANGE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_count_delta", // 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 + ADD_COLUMN_SCHEMA("row_count_delta", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_block_type", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("macro_block_type", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compressor_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compressor_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -1927,17 +1924,16 @@ int ObInnerTableSchema::all_virtual_partition_sstable_macro_info_schema(ObTableS table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_proxy_partition_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_proxy_partition_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1968,603 +1964,603 @@ int ObInnerTableSchema::all_virtual_proxy_partition_info_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_level", // 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 + ADD_COLUMN_SCHEMA("part_level", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("all_part_num", // 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 + ADD_COLUMN_SCHEMA("all_part_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("template_num", // 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 + ADD_COLUMN_SCHEMA("template_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_id_rule_ver", // 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 + ADD_COLUMN_SCHEMA("part_id_rule_ver", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_type", // 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 + ADD_COLUMN_SCHEMA("part_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_num", // 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 + ADD_COLUMN_SCHEMA("part_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_column_type", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_column_type", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_space", // 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 + ADD_COLUMN_SCHEMA("part_space", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_expr", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_expr", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_expr_bin", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_expr_bin", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_range_type", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_range_type", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_interval_bin", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_interval_bin", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("interval_start_bin", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("interval_start_bin", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_type", // 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 + ADD_COLUMN_SCHEMA("sub_part_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_num", // 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 + ADD_COLUMN_SCHEMA("sub_part_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_sub_column_type", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_sub_column_type", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_space", // 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 + ADD_COLUMN_SCHEMA("sub_part_space", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_expr", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_expr", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_expr_bin", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_expr_bin", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_range_type", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_range_type", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_sub_part_interval_bin", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_sub_part_interval_bin", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_sub_interval_start_bin", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_sub_interval_start_bin", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_key_num", // 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 + ADD_COLUMN_SCHEMA("part_key_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_key_name", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_key_name", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_key_type", // 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 + ADD_COLUMN_SCHEMA("part_key_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_key_idx", // 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 + ADD_COLUMN_SCHEMA("part_key_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_key_level", // 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 + ADD_COLUMN_SCHEMA("part_key_level", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_key_extra", // 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 - COLUMN_EXTRA_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_key_extra", //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 + COLUMN_EXTRA_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 + ADD_COLUMN_SCHEMA("spare1", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 + ADD_COLUMN_SCHEMA("spare2", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 + ADD_COLUMN_SCHEMA("spare3", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare4", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare4", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare5", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare5", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare6", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare6", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2574,17 +2570,16 @@ int ObInnerTableSchema::all_virtual_proxy_partition_info_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_proxy_partition_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_proxy_partition_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2615,333 +2610,333 @@ int ObInnerTableSchema::all_virtual_proxy_partition_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("part_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_name", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_name", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 + ADD_COLUMN_SCHEMA("status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("low_bound_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("low_bound_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("low_bound_val_bin", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("low_bound_val_bin", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_bound_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("high_bound_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_bound_val_bin", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("high_bound_val_bin", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_idx", // 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 + ADD_COLUMN_SCHEMA("part_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_num", // 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 + ADD_COLUMN_SCHEMA("sub_part_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_space", // 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 + ADD_COLUMN_SCHEMA("sub_part_space", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_interval_bin", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_interval_bin", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_interval_start_bin", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_interval_start_bin", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 + ADD_COLUMN_SCHEMA("spare1", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 + ADD_COLUMN_SCHEMA("spare2", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 + ADD_COLUMN_SCHEMA("spare3", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare4", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare4", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare5", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare5", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare6", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare6", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2951,17 +2946,16 @@ int ObInnerTableSchema::all_virtual_proxy_partition_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_proxy_sub_partition_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_proxy_sub_partition_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2992,243 +2986,243 @@ int ObInnerTableSchema::all_virtual_proxy_sub_partition_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("part_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("sub_part_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_name", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_name", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 + ADD_COLUMN_SCHEMA("status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("low_bound_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("low_bound_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("low_bound_val_bin", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("low_bound_val_bin", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_bound_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("high_bound_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_bound_val_bin", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("high_bound_val_bin", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 + ADD_COLUMN_SCHEMA("spare1", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 + ADD_COLUMN_SCHEMA("spare2", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 + ADD_COLUMN_SCHEMA("spare3", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare4", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare4", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare5", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare5", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare6", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare6", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3238,17 +3232,16 @@ int ObInnerTableSchema::all_virtual_proxy_sub_partition_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_proxy_route_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_proxy_route_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3279,198 +3272,198 @@ int ObInnerTableSchema::all_virtual_proxy_route_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_string", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_PROXY_SQL_STORE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_string", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_PROXY_SQL_STORE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("calculator_bin", // 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 - OB_MAX_CALCULATOR_SERIALIZE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("calculator_bin", //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 + OB_MAX_CALCULATOR_SERIALIZE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result_status", // 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 + ADD_COLUMN_SCHEMA("result_status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 + ADD_COLUMN_SCHEMA("spare1", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 + ADD_COLUMN_SCHEMA("spare2", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 + ADD_COLUMN_SCHEMA("spare3", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare4", // 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 - OB_MAX_CALCULATOR_SERIALIZE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare4", //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 + OB_MAX_CALCULATOR_SERIALIZE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare5", // 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 - OB_MAX_CALCULATOR_SERIALIZE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare5", //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 + OB_MAX_CALCULATOR_SERIALIZE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare6", // 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 - OB_MAX_CALCULATOR_SERIALIZE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare6", //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 + OB_MAX_CALCULATOR_SERIALIZE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3480,17 +3473,16 @@ int ObInnerTableSchema::all_virtual_proxy_route_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_rebalance_tenant_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_rebalance_tenant_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3521,243 +3513,243 @@ int ObInnerTableSchema::all_virtual_rebalance_tenant_stat_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_weight", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_weight", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_weight", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("disk_weight", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("iops_weight", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("iops_weight", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memory_weight", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("memory_weight", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("load_imbalance", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("load_imbalance", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("load_avg", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("load_avg", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_imbalance", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_imbalance", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_avg", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_avg", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_imbalance", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("disk_imbalance", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_avg", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("disk_avg", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("iops_imbalance", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("iops_imbalance", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("iops_avg", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("iops_avg", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memory_imbalance", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("memory_imbalance", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memory_avg", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("memory_avg", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3767,17 +3759,16 @@ int ObInnerTableSchema::all_virtual_rebalance_tenant_stat_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_rebalance_unit_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_rebalance_unit_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3808,123 +3799,123 @@ int ObInnerTableSchema::all_virtual_rebalance_unit_stat_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_id", // 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 + ADD_COLUMN_SCHEMA("unit_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("load", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("load", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_usage_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_usage_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_usage_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("disk_usage_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("iops_usage_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("iops_usage_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memory_usage_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("memory_usage_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3934,17 +3925,16 @@ int ObInnerTableSchema::all_virtual_rebalance_unit_stat_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_rebalance_replica_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_rebalance_replica_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3975,198 +3965,198 @@ int ObInnerTableSchema::all_virtual_rebalance_replica_stat_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 + ADD_COLUMN_SCHEMA("partition_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_usage", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_usage", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_usage", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("disk_usage", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("iops_usage", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("iops_usage", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memory_usage", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("memory_usage", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("net_packet_usage", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("net_packet_usage", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("net_throughput_usage", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("net_throughput_usage", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_id", // 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 + ADD_COLUMN_SCHEMA("unit_id", //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 } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4176,17 +4166,16 @@ int ObInnerTableSchema::all_virtual_rebalance_replica_stat_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_partition_amplification_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_partition_amplification_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4217,258 +4206,258 @@ int ObInnerTableSchema::all_virtual_partition_amplification_stat_schema(ObTableS table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // 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 + ADD_COLUMN_SCHEMA("partition_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dirty_ratio_1", // 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 + ADD_COLUMN_SCHEMA("dirty_ratio_1", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dirty_ratio_3", // 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 + ADD_COLUMN_SCHEMA("dirty_ratio_3", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dirty_ratio_5", // 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 + ADD_COLUMN_SCHEMA("dirty_ratio_5", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dirty_ratio_10", // 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 + ADD_COLUMN_SCHEMA("dirty_ratio_10", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dirty_ratio_15", // 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 + ADD_COLUMN_SCHEMA("dirty_ratio_15", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dirty_ratio_20", // 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 + ADD_COLUMN_SCHEMA("dirty_ratio_20", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dirty_ratio_30", // 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 + ADD_COLUMN_SCHEMA("dirty_ratio_30", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dirty_ratio_50", // 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 + ADD_COLUMN_SCHEMA("dirty_ratio_50", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dirty_ratio_75", // 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 + ADD_COLUMN_SCHEMA("dirty_ratio_75", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dirty_ratio_100", // 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 + ADD_COLUMN_SCHEMA("dirty_ratio_100", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_block_cnt", // 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 + ADD_COLUMN_SCHEMA("macro_block_cnt", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -4486,17 +4475,16 @@ int ObInnerTableSchema::all_virtual_partition_amplification_stat_schema(ObTableS table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_election_event_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_election_event_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4527,128 +4515,128 @@ int ObInnerTableSchema::all_virtual_election_event_history_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_id", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition_idx", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event", // 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 - MAX_ELECTION_EVENT_DESC_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("event", //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 + MAX_ELECTION_EVENT_DESC_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj leader_default; leader_default.set_varchar(ObString::make_string("0.0.0.0")); - ADD_COLUMN_SCHEMA_T("leader", // 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 - OB_IP_PORT_STR_BUFF, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - leader_default, - leader_default); // default_value + ADD_COLUMN_SCHEMA_T("leader", //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 + OB_IP_PORT_STR_BUFF, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + leader_default, + leader_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - MAX_ELECTION_EVENT_EXTRA_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + MAX_ELECTION_EVENT_EXTRA_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -4666,17 +4654,16 @@ int ObInnerTableSchema::all_virtual_election_event_history_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_partition_store_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_partition_store_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4707,273 +4694,273 @@ int ObInnerTableSchema::all_virtual_partition_store_info_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // 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 + ADD_COLUMN_SCHEMA("partition_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_restore", // 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 + ADD_COLUMN_SCHEMA("is_restore", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("migrate_status", // 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 + ADD_COLUMN_SCHEMA("migrate_status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("migrate_timestamp", // 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 + ADD_COLUMN_SCHEMA("migrate_timestamp", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_type", // 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 + ADD_COLUMN_SCHEMA("replica_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("split_state", // 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 + ADD_COLUMN_SCHEMA("split_state", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("multi_version_start", // 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 + ADD_COLUMN_SCHEMA("multi_version_start", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("report_version", // 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 + ADD_COLUMN_SCHEMA("report_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("report_row_count", // 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 + ADD_COLUMN_SCHEMA("report_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("report_data_checksum", // 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 + ADD_COLUMN_SCHEMA("report_data_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("report_data_size", // 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 + ADD_COLUMN_SCHEMA("report_data_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("report_required_size", // 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 + ADD_COLUMN_SCHEMA("report_required_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("readable_ts", // 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 + ADD_COLUMN_SCHEMA("readable_ts", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -4991,17 +4978,16 @@ int ObInnerTableSchema::all_virtual_partition_store_info_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_leader_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_leader_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5032,258 +5018,258 @@ int ObInnerTableSchema::all_virtual_leader_stat_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // 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 + ADD_COLUMN_SCHEMA("tablegroup_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 + ADD_COLUMN_SCHEMA("partition_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("region", // 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 - MAX_REGION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("region", //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 + MAX_REGION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("region_score", // 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 + ADD_COLUMN_SCHEMA("region_score", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("not_merging", // 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 + ADD_COLUMN_SCHEMA("not_merging", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("candidate_count", // 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 + ADD_COLUMN_SCHEMA("candidate_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_candidate", // 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 + ADD_COLUMN_SCHEMA("is_candidate", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("migrate_out_or_transform_count", // 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 + ADD_COLUMN_SCHEMA("migrate_out_or_transform_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("in_normal_unit_count", // 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 + ADD_COLUMN_SCHEMA("in_normal_unit_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_score", // 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 + ADD_COLUMN_SCHEMA("zone_score", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("original_leader_count", // 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 + ADD_COLUMN_SCHEMA("original_leader_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("random_score", // 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 + ADD_COLUMN_SCHEMA("random_score", //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 } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5293,17 +5279,16 @@ int ObInnerTableSchema::all_virtual_leader_stat_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_partition_migration_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_partition_migration_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5334,414 +5319,414 @@ int ObInnerTableSchema::all_virtual_partition_migration_status_schema(ObTableSch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_id", // 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 - OB_TRACE_STAT_BUFFER_SIZE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("task_id", //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 + OB_TRACE_STAT_BUFFER_SIZE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // 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 + ADD_COLUMN_SCHEMA("partition_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("migrate_type", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("migrate_type", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parent_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parent_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parent_port", // 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 + ADD_COLUMN_SCHEMA("parent_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("src_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("src_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("src_port", // 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 + ADD_COLUMN_SCHEMA("src_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dest_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dest_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dest_port", // 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 + ADD_COLUMN_SCHEMA("dest_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("finish_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("finish_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("action", // 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 - OB_MIGRATE_ACTION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("action", //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 + OB_MIGRATE_ACTION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_state", // 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 - OB_MIGRATE_REPLICA_STATE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_state", //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 + OB_MIGRATE_REPLICA_STATE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rebuild_count", // 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 + ADD_COLUMN_SCHEMA("rebuild_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_macro_block", // 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 + ADD_COLUMN_SCHEMA("total_macro_block", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ready_macro_block", // 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 + ADD_COLUMN_SCHEMA("ready_macro_block", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("major_count", // 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 + ADD_COLUMN_SCHEMA("major_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mini_minor_count", // 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 + ADD_COLUMN_SCHEMA("mini_minor_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("normal_minor_count", // 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 + ADD_COLUMN_SCHEMA("normal_minor_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("buf_minor_count", // 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 + ADD_COLUMN_SCHEMA("buf_minor_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("reuse_count", // 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 + ADD_COLUMN_SCHEMA("reuse_count", //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 } if (OB_SUCC(ret)) { ObObj comment_default; comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("comment", // 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 - OB_MAX_TASK_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - comment_default, - comment_default); // default_value + ADD_COLUMN_SCHEMA_T("comment", //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 + OB_MAX_TASK_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + comment_default, + comment_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -5759,17 +5744,16 @@ int ObInnerTableSchema::all_virtual_partition_migration_status_schema(ObTableSch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sys_task_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sys_task_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5800,128 +5784,128 @@ int ObInnerTableSchema::all_virtual_sys_task_status_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_type", // 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 - OB_SYS_TASK_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("task_type", //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 + OB_SYS_TASK_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_id", // 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 - OB_TRACE_STAT_BUFFER_SIZE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("task_id", //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 + OB_TRACE_STAT_BUFFER_SIZE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { ObObj comment_default; comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("comment", // 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 - OB_MAX_TASK_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - comment_default, - comment_default); // default_value + ADD_COLUMN_SCHEMA_T("comment", //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 + OB_MAX_TASK_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + comment_default, + comment_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_cancel", // 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 + ADD_COLUMN_SCHEMA("is_cancel", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -5939,17 +5923,16 @@ int ObInnerTableSchema::all_virtual_sys_task_status_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_macro_block_marker_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_macro_block_marker_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5980,262 +5963,262 @@ int ObInnerTableSchema::all_virtual_macro_block_marker_status_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_count", // 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 + ADD_COLUMN_SCHEMA("total_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("reserved_count", // 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 + ADD_COLUMN_SCHEMA("reserved_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_meta_count", // 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 + ADD_COLUMN_SCHEMA("macro_meta_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_meta_count", // 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 + ADD_COLUMN_SCHEMA("partition_meta_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_count", // 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 + ADD_COLUMN_SCHEMA("data_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("second_index_count", // 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 + ADD_COLUMN_SCHEMA("second_index_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lob_data_count", // 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 + ADD_COLUMN_SCHEMA("lob_data_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lob_second_index_count", // 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 + ADD_COLUMN_SCHEMA("lob_second_index_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("bloomfilter_count", // 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 + ADD_COLUMN_SCHEMA("bloomfilter_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hold_count", // 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 + ADD_COLUMN_SCHEMA("hold_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pending_free_count", // 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 + ADD_COLUMN_SCHEMA("pending_free_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("free_count", // 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 + ADD_COLUMN_SCHEMA("free_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mark_cost_time", // 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 + ADD_COLUMN_SCHEMA("mark_cost_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sweep_cost_time", // 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 + ADD_COLUMN_SCHEMA("sweep_cost_time", //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 } if (OB_SUCC(ret)) { ObObj comment_default; comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - comment_default, - comment_default); // default_value + ADD_COLUMN_SCHEMA_T("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + comment_default, + comment_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -6253,17 +6236,16 @@ int ObInnerTableSchema::all_virtual_macro_block_marker_status_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_server_clog_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_server_clog_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6294,183 +6276,183 @@ int ObInnerTableSchema::all_virtual_server_clog_stat_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("system_clog_min_using_file_id", // 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 + ADD_COLUMN_SCHEMA("system_clog_min_using_file_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_clog_min_using_file_id", // 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 + ADD_COLUMN_SCHEMA("user_clog_min_using_file_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("system_ilog_min_using_file_id", // 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 + ADD_COLUMN_SCHEMA("system_ilog_min_using_file_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_ilog_min_using_file_id", // 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 + ADD_COLUMN_SCHEMA("user_ilog_min_using_file_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("region", // 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 - MAX_REGION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("region", //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 + MAX_REGION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("idc", // 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 - MAX_ZONE_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("idc", //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 + MAX_ZONE_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_type", // 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 - MAX_ZONE_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone_type", //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 + MAX_ZONE_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("merge_status", // 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 - MAX_ZONE_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("merge_status", //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 + MAX_ZONE_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_status", // 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 - MAX_ZONE_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone_status", //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 + MAX_ZONE_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -6488,17 +6470,16 @@ int ObInnerTableSchema::all_virtual_server_clog_stat_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_rootservice_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_rootservice_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6529,93 +6510,93 @@ int ObInnerTableSchema::all_virtual_rootservice_stat_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("statistic#", // 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 + ADD_COLUMN_SCHEMA("statistic#", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 + ADD_COLUMN_SCHEMA("value", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("stat_id", // 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 + ADD_COLUMN_SCHEMA("stat_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("class", // 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 + ADD_COLUMN_SCHEMA("class", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("can_visible", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("can_visible", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6625,17 +6606,16 @@ int ObInnerTableSchema::all_virtual_rootservice_stat_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_election_priority_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_election_priority_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6666,333 +6646,333 @@ int ObInnerTableSchema::all_virtual_election_priority_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // 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 + ADD_COLUMN_SCHEMA("partition_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role", // 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 + ADD_COLUMN_SCHEMA("role", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_candidate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_candidate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("membership_version", // 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 + ADD_COLUMN_SCHEMA("membership_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("log_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("locality", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("locality", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("system_score", // 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 + ADD_COLUMN_SCHEMA("system_score", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_tenant_active", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_tenant_active", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("on_revoke_blacklist", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("on_revoke_blacklist", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("on_loop_blacklist", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("on_loop_blacklist", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_type", // 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 + ADD_COLUMN_SCHEMA("replica_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("server_status", // 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 + ADD_COLUMN_SCHEMA("server_status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_clog_disk_full", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_clog_disk_full", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_offline", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_offline", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_need_rebuild", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_need_rebuild", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_partition_candidate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_partition_candidate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_disk_error", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_disk_error", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memstore_percent", // 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 + ADD_COLUMN_SCHEMA("memstore_percent", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -7010,17 +6990,16 @@ int ObInnerTableSchema::all_virtual_election_priority_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_disk_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_disk_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7051,93 +7030,93 @@ int ObInnerTableSchema::all_virtual_tenant_disk_stat_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - OB_MAX_CHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + OB_MAX_CHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_type", // 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 - OB_MAX_CHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_type", //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 + OB_MAX_CHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 + ADD_COLUMN_SCHEMA("block_size", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -7155,17 +7134,16 @@ int ObInnerTableSchema::all_virtual_tenant_disk_stat_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_rebalance_map_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_rebalance_map_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7196,93 +7174,93 @@ int ObInnerTableSchema::all_virtual_rebalance_map_stat_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("map_type", // 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 + ADD_COLUMN_SCHEMA("map_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_valid", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_valid", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_size", // 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 + ADD_COLUMN_SCHEMA("row_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("col_size", // 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 + ADD_COLUMN_SCHEMA("col_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tables", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tables", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -7292,17 +7270,16 @@ int ObInnerTableSchema::all_virtual_rebalance_map_stat_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_rebalance_map_item_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_rebalance_map_item_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7333,168 +7310,168 @@ int ObInnerTableSchema::all_virtual_rebalance_map_item_stat_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // 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 + ADD_COLUMN_SCHEMA("tablegroup_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("map_type", // 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 + ADD_COLUMN_SCHEMA("map_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_size", // 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 + ADD_COLUMN_SCHEMA("row_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("col_size", // 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 + ADD_COLUMN_SCHEMA("col_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_idx", // 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 + ADD_COLUMN_SCHEMA("part_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("designated_role", // 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 + ADD_COLUMN_SCHEMA("designated_role", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_id", // 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 + ADD_COLUMN_SCHEMA("unit_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dest_unit_id", // 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 + ADD_COLUMN_SCHEMA("dest_unit_id", //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 } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -7504,17 +7481,16 @@ int ObInnerTableSchema::all_virtual_rebalance_map_item_stat_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_io_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_io_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7545,138 +7521,138 @@ int ObInnerTableSchema::all_virtual_io_stat_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("fd", // 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 + ADD_COLUMN_SCHEMA("fd", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_type", // 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 - OB_MAX_DISK_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("disk_type", //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 + OB_MAX_DISK_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sys_io_up_limit_in_mb", // 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 + ADD_COLUMN_SCHEMA("sys_io_up_limit_in_mb", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sys_io_bandwidth_in_mb", // 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 + ADD_COLUMN_SCHEMA("sys_io_bandwidth_in_mb", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sys_io_low_watermark_in_mb", // 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 + ADD_COLUMN_SCHEMA("sys_io_low_watermark_in_mb", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sys_io_high_watermark_in_mb", // 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 + ADD_COLUMN_SCHEMA("sys_io_high_watermark_in_mb", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("io_bench_result", // 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 - OB_MAX_IO_BENCH_RESULT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("io_bench_result", //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 + OB_MAX_IO_BENCH_RESULT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -7694,17 +7670,16 @@ int ObInnerTableSchema::all_virtual_io_stat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_long_ops_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_long_ops_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7735,198 +7710,198 @@ int ObInnerTableSchema::all_virtual_long_ops_status_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sid", // 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 + ADD_COLUMN_SCHEMA("sid", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("op_name", // 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 - MAX_LONG_OPS_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("op_name", //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 + MAX_LONG_OPS_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("target", // 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 - MAX_LONG_OPS_TARGET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("target", //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 + MAX_LONG_OPS_TARGET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_time", // 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 + ADD_COLUMN_SCHEMA("start_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_time", // 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 + ADD_COLUMN_SCHEMA("finish_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("elapsed_time", // 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 + ADD_COLUMN_SCHEMA("elapsed_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("remaining_time", // 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 + ADD_COLUMN_SCHEMA("remaining_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_update_time", // 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 + ADD_COLUMN_SCHEMA("last_update_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("percentage", // 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 + ADD_COLUMN_SCHEMA("percentage", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("message", // 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 - MAX_LONG_OPS_MESSAGE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("message", //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 + MAX_LONG_OPS_MESSAGE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -7944,17 +7919,16 @@ int ObInnerTableSchema::all_virtual_long_ops_status_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_rebalance_unit_migrate_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_rebalance_unit_migrate_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7985,93 +7959,93 @@ int ObInnerTableSchema::all_virtual_rebalance_unit_migrate_stat_schema(ObTableSc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_id", // 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 + ADD_COLUMN_SCHEMA("unit_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("src_svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("src_svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("src_svr_port", // 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 + ADD_COLUMN_SCHEMA("src_svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dst_svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dst_svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dst_svr_port", // 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 + ADD_COLUMN_SCHEMA("dst_svr_port", //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 } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8081,17 +8055,16 @@ int ObInnerTableSchema::all_virtual_rebalance_unit_migrate_stat_schema(ObTableSc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_rebalance_unit_distribution_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_rebalance_unit_distribution_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8122,198 +8095,198 @@ int ObInnerTableSchema::all_virtual_rebalance_unit_distribution_stat_schema(ObTa table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_id", // 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 + ADD_COLUMN_SCHEMA("unit_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_cpu", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_cpu", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_cpu", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("min_cpu", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_memory", // 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 + ADD_COLUMN_SCHEMA("max_memory", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_memory", // 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 + ADD_COLUMN_SCHEMA("min_memory", //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 } 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 - 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 + ADD_COLUMN_SCHEMA("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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_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 + ADD_COLUMN_SCHEMA("min_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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_disk_size", // 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 + ADD_COLUMN_SCHEMA("max_disk_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_session_num", // 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 + ADD_COLUMN_SCHEMA("max_session_num", //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 } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8323,17 +8296,16 @@ int ObInnerTableSchema::all_virtual_rebalance_unit_distribution_stat_schema(ObTa table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_server_object_pool_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_server_object_pool_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8364,228 +8336,228 @@ int ObInnerTableSchema::all_virtual_server_object_pool_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_type", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_SYS_PARAM_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("object_type", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_SYS_PARAM_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("arena_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("arena_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lock", // 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 + ADD_COLUMN_SCHEMA("lock", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("borrow_count", // 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 + ADD_COLUMN_SCHEMA("borrow_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("return_count", // 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 + ADD_COLUMN_SCHEMA("return_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("miss_count", // 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 + ADD_COLUMN_SCHEMA("miss_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("miss_return_count", // 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 + ADD_COLUMN_SCHEMA("miss_return_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("free_num", // 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 + ADD_COLUMN_SCHEMA("free_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_borrow_ts", // 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 + ADD_COLUMN_SCHEMA("last_borrow_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_return_ts", // 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 + ADD_COLUMN_SCHEMA("last_return_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_miss_ts", // 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 + ADD_COLUMN_SCHEMA("last_miss_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_miss_return_ts", // 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 + ADD_COLUMN_SCHEMA("last_miss_return_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("next", // 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 + ADD_COLUMN_SCHEMA("next", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -8603,17 +8575,16 @@ int ObInnerTableSchema::all_virtual_server_object_pool_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_trans_lock_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_trans_lock_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8644,185 +8615,185 @@ int ObInnerTableSchema::all_virtual_trans_lock_stat_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_id", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trans_id", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("rowkey", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // 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 + ADD_COLUMN_SCHEMA("session_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("proxy_id", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("proxy_id", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("ctx_create_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("ctx_create_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("expired_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("expired_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_lock_addr", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("row_lock_addr", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -8840,17 +8811,16 @@ int ObInnerTableSchema::all_virtual_trans_lock_stat_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_election_group_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_election_group_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8881,333 +8851,333 @@ int ObInnerTableSchema::all_virtual_election_group_info_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("eg_id_hash", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("eg_id_hash", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_running", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_running", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("eg_create_time", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("eg_create_time", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("eg_version", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("eg_version", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("eg_part_cnt", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("eg_part_cnt", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_all_part_merged_in", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_all_part_merged_in", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_priority_allow_reappoint", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_priority_allow_reappoint", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_candidate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_candidate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("system_score", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("system_score", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("current_leader", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("current_leader", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("member_list", // 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 - MAX_MEMBER_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("member_list", //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 + MAX_MEMBER_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("takeover_t1_timestamp_", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("takeover_t1_timestamp_", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("T1_timestamp", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("T1_timestamp", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lease_start", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("lease_start", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lease_end", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("lease_end", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("role", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("state", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("state", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pre_destroy_state", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("pre_destroy_state", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -9225,17 +9195,16 @@ int ObInnerTableSchema::all_virtual_election_group_info_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_show_create_tablegroup_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_show_create_tablegroup_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9266,48 +9235,48 @@ int ObInnerTableSchema::tenant_virtual_show_create_tablegroup_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tablegroup_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_name", // 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 - OB_MAX_TABLEGROUP_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tablegroup_name", //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 + OB_MAX_TABLEGROUP_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_tablegroup", // 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 - TABLEGROUP_DEFINE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_tablegroup", //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 + TABLEGROUP_DEFINE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9317,17 +9286,16 @@ int ObInnerTableSchema::tenant_virtual_show_create_tablegroup_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_server_blacklist_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_server_blacklist_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9358,93 +9326,93 @@ int ObInnerTableSchema::all_virtual_server_blacklist_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dst_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dst_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dst_port", // 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 + ADD_COLUMN_SCHEMA("dst_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_in_blacklist", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_in_blacklist", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_clockdiff_error", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_clockdiff_error", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -9462,17 +9430,16 @@ int ObInnerTableSchema::all_virtual_server_blacklist_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_partition_split_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_partition_split_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9503,123 +9470,123 @@ int ObInnerTableSchema::all_virtual_partition_split_info_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 + ADD_COLUMN_SCHEMA("partition_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("split_state", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("split_state", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("merge_version", // 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 + ADD_COLUMN_SCHEMA("merge_version", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -9637,17 +9604,16 @@ int ObInnerTableSchema::all_virtual_partition_split_info_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_trans_result_info_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_trans_result_info_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9678,108 +9644,108 @@ int ObInnerTableSchema::all_virtual_trans_result_info_stat_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_id", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trans_id", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("state", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("state", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("commit_version", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("commit_version", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_log_id", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("min_log_id", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -9797,17 +9763,16 @@ int ObInnerTableSchema::all_virtual_trans_result_info_stat_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_duplicate_partition_mgr_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_duplicate_partition_mgr_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9838,123 +9803,123 @@ int ObInnerTableSchema::all_virtual_duplicate_partition_mgr_stat_schema(ObTableS table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 + ADD_COLUMN_SCHEMA("partition_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_lease_list", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition_lease_list", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_master", // 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 + ADD_COLUMN_SCHEMA("is_master", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_log_id", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cur_log_id", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -9972,17 +9937,16 @@ int ObInnerTableSchema::all_virtual_duplicate_partition_mgr_stat_schema(ObTableS table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_parameter_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_parameter_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10013,183 +9977,183 @@ int ObInnerTableSchema::all_virtual_tenant_parameter_stat_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_type", // 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 - SERVER_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_type", //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 + SERVER_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - OB_MAX_CONFIG_NAME_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + OB_MAX_CONFIG_NAME_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 - OB_MAX_CONFIG_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_type", //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 + OB_MAX_CONFIG_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_CONFIG_INFO_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_CONFIG_INFO_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("section", // 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 - OB_MAX_CONFIG_SECTION_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("section", //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 + OB_MAX_CONFIG_SECTION_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scope", // 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 - OB_MAX_CONFIG_SCOPE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("scope", //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 + OB_MAX_CONFIG_SCOPE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("source", // 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 - OB_MAX_CONFIG_SOURCE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("source", //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 + OB_MAX_CONFIG_SOURCE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("edit_level", // 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 - OB_MAX_CONFIG_EDIT_LEVEL_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("edit_level", //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 + OB_MAX_CONFIG_EDIT_LEVEL_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -10207,17 +10171,16 @@ int ObInnerTableSchema::all_virtual_tenant_parameter_stat_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_server_schema_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_server_schema_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10248,123 +10211,123 @@ int ObInnerTableSchema::all_virtual_server_schema_info_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("refreshed_schema_version", // 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 + ADD_COLUMN_SCHEMA("refreshed_schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("received_schema_version", // 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 + ADD_COLUMN_SCHEMA("received_schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_count", // 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 + ADD_COLUMN_SCHEMA("schema_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_size", // 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 + ADD_COLUMN_SCHEMA("schema_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_sstable_schema_version", // 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 + ADD_COLUMN_SCHEMA("min_sstable_schema_version", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -10382,17 +10345,16 @@ int ObInnerTableSchema::all_virtual_server_schema_info_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_memory_context_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_memory_context_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10423,169 +10385,169 @@ int ObInnerTableSchema::all_virtual_memory_context_stat_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("entity", // 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 + ADD_COLUMN_SCHEMA("entity", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("p_entity", // 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 + ADD_COLUMN_SCHEMA("p_entity", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hold", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("hold", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("malloc_hold", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("malloc_hold", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("malloc_used", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("malloc_used", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("arena_hold", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("arena_hold", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("arena_used", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("arena_used", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("create_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("create_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("location", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("location", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -10603,17 +10565,16 @@ int ObInnerTableSchema::all_virtual_memory_context_stat_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_dump_tenant_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_dump_tenant_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10644,483 +10605,483 @@ int ObInnerTableSchema::all_virtual_dump_tenant_info_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(int64_t), // column_length - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(int64_t), //column_length + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compat_mode", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compat_mode", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_min_cpu", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("unit_min_cpu", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_max_cpu", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("unit_max_cpu", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("slice", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("slice", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("remain_slice", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("remain_slice", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("token_cnt", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("token_cnt", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ass_token_cnt", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ass_token_cnt", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lq_tokens", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("lq_tokens", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("used_lq_tokens", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("used_lq_tokens", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("stopped", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("stopped", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("idle_us", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("idle_us", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("recv_hp_rpc_cnt", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("recv_hp_rpc_cnt", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("recv_np_rpc_cnt", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("recv_np_rpc_cnt", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("recv_lp_rpc_cnt", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("recv_lp_rpc_cnt", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("recv_mysql_cnt", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("recv_mysql_cnt", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("recv_task_cnt", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("recv_task_cnt", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("recv_large_req_cnt", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("recv_large_req_cnt", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("recv_large_queries", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("recv_large_queries", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("actives", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("actives", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("workers", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("workers", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lq_waiting_workers", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("lq_waiting_workers", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("req_queue_total_size", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("req_queue_total_size", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("queue_0", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("queue_0", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("queue_1", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("queue_1", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("queue_2", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("queue_2", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("queue_3", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("queue_3", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("queue_4", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("queue_4", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("queue_5", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("queue_5", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("large_queued", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("large_queued", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -11138,17 +11099,16 @@ int ObInnerTableSchema::all_virtual_dump_tenant_info_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_parameter_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_parameter_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11179,198 +11139,198 @@ int ObInnerTableSchema::all_virtual_tenant_parameter_info_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_type", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - SERVER_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_type", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + SERVER_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 5, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 5, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // column_name - ++column_id, // column_id - 6, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_CONFIG_NAME_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //column_name + ++column_id, //column_id + 6, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_CONFIG_NAME_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 - OB_MAX_CONFIG_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_type", //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 + OB_MAX_CONFIG_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_CONFIG_INFO_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_CONFIG_INFO_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("section", // 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 - OB_MAX_CONFIG_SECTION_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("section", //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 + OB_MAX_CONFIG_SECTION_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scope", // 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 - OB_MAX_CONFIG_SCOPE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("scope", //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 + OB_MAX_CONFIG_SCOPE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("source", // 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 - OB_MAX_CONFIG_SOURCE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("source", //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 + OB_MAX_CONFIG_SOURCE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("edit_level", // 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 - OB_MAX_CONFIG_EDIT_LEVEL_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("edit_level", //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 + OB_MAX_CONFIG_EDIT_LEVEL_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -11388,17 +11348,16 @@ int ObInnerTableSchema::all_virtual_tenant_parameter_info_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_dag_warning_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_dag_warning_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11429,170 +11388,170 @@ int ObInnerTableSchema::all_virtual_dag_warning_history_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_id", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_TRACE_ID_BUFFER_SIZE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("task_id", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_TRACE_ID_BUFFER_SIZE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("module", // 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 - OB_MODULE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("module", //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 + OB_MODULE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 - OB_SYS_TASK_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type", //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 + OB_SYS_TASK_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ret", // 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 - OB_RET_STR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ret", //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 + OB_RET_STR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_STATUS_STR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_STATUS_STR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("warning_info", // 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 - OB_DAG_WARNING_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("warning_info", //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 + OB_DAG_WARNING_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -11610,10 +11569,10 @@ int ObInnerTableSchema::all_virtual_dag_warning_history_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.12001_12050.cpp b/src/share/inner_table/ob_inner_table_schema.12001_12050.cpp index e85db0cd9..762868c01 100644 --- a/src/share/inner_table/ob_inner_table_schema.12001_12050.cpp +++ b/src/share/inner_table/ob_inner_table_schema.12001_12050.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::session_variables_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::session_variables_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -60,39 +62,39 @@ int ObInnerTableSchema::session_variables_schema(ObTableSchema& table_schema) if (OB_SUCC(ret)) { ObObj variable_name_default; variable_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("VARIABLE_NAME", // 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 - OB_MAX_SYS_PARAM_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - variable_name_default, - variable_name_default); // default_value + ADD_COLUMN_SCHEMA_T("VARIABLE_NAME", //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 + OB_MAX_SYS_PARAM_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + variable_name_default, + variable_name_default); //default_value } if (OB_SUCC(ret)) { ObObj variable_value_default; variable_value_default.set_null(); - ADD_COLUMN_SCHEMA_T("VARIABLE_VALUE", // 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 - OB_MAX_SYS_PARAM_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - variable_value_default, - variable_value_default); // default_value + ADD_COLUMN_SCHEMA_T("VARIABLE_VALUE", //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 + OB_MAX_SYS_PARAM_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + variable_value_default, + variable_value_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -102,17 +104,16 @@ int ObInnerTableSchema::session_variables_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::table_privileges_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::table_privileges_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -145,115 +146,115 @@ int ObInnerTableSchema::table_privileges_schema(ObTableSchema& table_schema) if (OB_SUCC(ret)) { ObObj grantee_default; grantee_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("GRANTEE", // 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 - OB_MAX_INFOSCHEMA_GRANTEE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - grantee_default, - grantee_default); // default_value + ADD_COLUMN_SCHEMA_T("GRANTEE", //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 + OB_MAX_INFOSCHEMA_GRANTEE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + grantee_default, + grantee_default); //default_value } if (OB_SUCC(ret)) { ObObj table_catalog_default; table_catalog_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("TABLE_CATALOG", // 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 - MAX_TABLE_CATALOG_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_catalog_default, - table_catalog_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_CATALOG", //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 + MAX_TABLE_CATALOG_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_catalog_default, + table_catalog_default); //default_value } if (OB_SUCC(ret)) { ObObj table_schema_default; table_schema_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("TABLE_SCHEMA", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_schema_default, - table_schema_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_SCHEMA", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_schema_default, + table_schema_default); //default_value } if (OB_SUCC(ret)) { ObObj table_name_default; table_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("TABLE_NAME", // 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 - OB_MAX_INFOSCHEMA_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_name_default, - table_name_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_NAME", //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 + OB_MAX_INFOSCHEMA_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_name_default, + table_name_default); //default_value } if (OB_SUCC(ret)) { ObObj privilege_type_default; privilege_type_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("PRIVILEGE_TYPE", // 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 - MAX_INFOSCHEMA_COLUMN_PRIVILEGE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - privilege_type_default, - privilege_type_default); // default_value + ADD_COLUMN_SCHEMA_T("PRIVILEGE_TYPE", //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 + MAX_INFOSCHEMA_COLUMN_PRIVILEGE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + privilege_type_default, + privilege_type_default); //default_value } if (OB_SUCC(ret)) { ObObj is_grantable_default; is_grantable_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("IS_GRANTABLE", // 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 - MAX_COLUMN_YES_NO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_grantable_default, - is_grantable_default); // default_value + ADD_COLUMN_SCHEMA_T("IS_GRANTABLE", //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 + MAX_COLUMN_YES_NO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_grantable_default, + is_grantable_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -263,17 +264,16 @@ int ObInnerTableSchema::table_privileges_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_privileges_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_privileges_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -306,77 +306,77 @@ int ObInnerTableSchema::user_privileges_schema(ObTableSchema& table_schema) if (OB_SUCC(ret)) { ObObj grantee_default; grantee_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("GRANTEE", // 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 - OB_MAX_INFOSCHEMA_GRANTEE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - grantee_default, - grantee_default); // default_value + ADD_COLUMN_SCHEMA_T("GRANTEE", //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 + OB_MAX_INFOSCHEMA_GRANTEE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + grantee_default, + grantee_default); //default_value } if (OB_SUCC(ret)) { ObObj table_catalog_default; table_catalog_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("TABLE_CATALOG", // 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 - MAX_TABLE_CATALOG_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_catalog_default, - table_catalog_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_CATALOG", //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 + MAX_TABLE_CATALOG_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_catalog_default, + table_catalog_default); //default_value } if (OB_SUCC(ret)) { ObObj privilege_type_default; privilege_type_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("PRIVILEGE_TYPE", // 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 - MAX_INFOSCHEMA_COLUMN_PRIVILEGE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - privilege_type_default, - privilege_type_default); // default_value + ADD_COLUMN_SCHEMA_T("PRIVILEGE_TYPE", //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 + MAX_INFOSCHEMA_COLUMN_PRIVILEGE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + privilege_type_default, + privilege_type_default); //default_value } if (OB_SUCC(ret)) { ObObj is_grantable_default; is_grantable_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("IS_GRANTABLE", // 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 - MAX_COLUMN_YES_NO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_grantable_default, - is_grantable_default); // default_value + ADD_COLUMN_SCHEMA_T("IS_GRANTABLE", //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 + MAX_COLUMN_YES_NO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_grantable_default, + is_grantable_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -386,17 +386,16 @@ int ObInnerTableSchema::user_privileges_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::schema_privileges_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::schema_privileges_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -429,96 +428,96 @@ int ObInnerTableSchema::schema_privileges_schema(ObTableSchema& table_schema) if (OB_SUCC(ret)) { ObObj grantee_default; grantee_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("GRANTEE", // 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 - OB_MAX_INFOSCHEMA_GRANTEE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - grantee_default, - grantee_default); // default_value + ADD_COLUMN_SCHEMA_T("GRANTEE", //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 + OB_MAX_INFOSCHEMA_GRANTEE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + grantee_default, + grantee_default); //default_value } if (OB_SUCC(ret)) { ObObj table_catalog_default; table_catalog_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("TABLE_CATALOG", // 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 - MAX_TABLE_CATALOG_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_catalog_default, - table_catalog_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_CATALOG", //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 + MAX_TABLE_CATALOG_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_catalog_default, + table_catalog_default); //default_value } if (OB_SUCC(ret)) { ObObj table_schema_default; table_schema_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("TABLE_SCHEMA", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_schema_default, - table_schema_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_SCHEMA", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_schema_default, + table_schema_default); //default_value } if (OB_SUCC(ret)) { ObObj privilege_type_default; privilege_type_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("PRIVILEGE_TYPE", // 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 - MAX_INFOSCHEMA_COLUMN_PRIVILEGE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - privilege_type_default, - privilege_type_default); // default_value + ADD_COLUMN_SCHEMA_T("PRIVILEGE_TYPE", //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 + MAX_INFOSCHEMA_COLUMN_PRIVILEGE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + privilege_type_default, + privilege_type_default); //default_value } if (OB_SUCC(ret)) { ObObj is_grantable_default; is_grantable_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("IS_GRANTABLE", // 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 - MAX_COLUMN_YES_NO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_grantable_default, - is_grantable_default); // default_value + ADD_COLUMN_SCHEMA_T("IS_GRANTABLE", //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 + MAX_COLUMN_YES_NO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_grantable_default, + is_grantable_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -528,17 +527,16 @@ int ObInnerTableSchema::schema_privileges_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::table_constraints_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::table_constraints_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -571,115 +569,115 @@ int ObInnerTableSchema::table_constraints_schema(ObTableSchema& table_schema) if (OB_SUCC(ret)) { ObObj constraint_catalog_default; constraint_catalog_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("CONSTRAINT_CATALOG", // 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 - MAX_TABLE_CATALOG_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - constraint_catalog_default, - constraint_catalog_default); // default_value + ADD_COLUMN_SCHEMA_T("CONSTRAINT_CATALOG", //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 + MAX_TABLE_CATALOG_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + constraint_catalog_default, + constraint_catalog_default); //default_value } if (OB_SUCC(ret)) { ObObj constraint_schema_default; constraint_schema_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("CONSTRAINT_SCHEMA", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - constraint_schema_default, - constraint_schema_default); // default_value + ADD_COLUMN_SCHEMA_T("CONSTRAINT_SCHEMA", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + constraint_schema_default, + constraint_schema_default); //default_value } if (OB_SUCC(ret)) { ObObj constraint_name_default; constraint_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("CONSTRAINT_NAME", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - constraint_name_default, - constraint_name_default); // default_value + ADD_COLUMN_SCHEMA_T("CONSTRAINT_NAME", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + constraint_name_default, + constraint_name_default); //default_value } if (OB_SUCC(ret)) { ObObj table_schema_default; table_schema_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("TABLE_SCHEMA", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_schema_default, - table_schema_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_SCHEMA", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_schema_default, + table_schema_default); //default_value } if (OB_SUCC(ret)) { ObObj table_name_default; table_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("TABLE_NAME", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_name_default, - table_name_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_NAME", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_name_default, + table_name_default); //default_value } if (OB_SUCC(ret)) { ObObj constraint_type_default; constraint_type_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("CONSTRAINT_TYPE", // 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 - INDEX_NULL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - constraint_type_default, - constraint_type_default); // default_value + ADD_COLUMN_SCHEMA_T("CONSTRAINT_TYPE", //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 + INDEX_NULL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + constraint_type_default, + constraint_type_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -689,17 +687,16 @@ int ObInnerTableSchema::table_constraints_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::global_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::global_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -732,39 +729,39 @@ int ObInnerTableSchema::global_status_schema(ObTableSchema& table_schema) if (OB_SUCC(ret)) { ObObj variable_name_default; variable_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("VARIABLE_NAME", // 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 - OB_MAX_SYS_PARAM_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - variable_name_default, - variable_name_default); // default_value + ADD_COLUMN_SCHEMA_T("VARIABLE_NAME", //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 + OB_MAX_SYS_PARAM_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + variable_name_default, + variable_name_default); //default_value } if (OB_SUCC(ret)) { ObObj variable_value_default; variable_value_default.set_null(); - ADD_COLUMN_SCHEMA_T("VARIABLE_VALUE", // 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 - OB_MAX_SYS_PARAM_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - variable_value_default, - variable_value_default); // default_value + ADD_COLUMN_SCHEMA_T("VARIABLE_VALUE", //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 + OB_MAX_SYS_PARAM_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + variable_value_default, + variable_value_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -774,17 +771,16 @@ int ObInnerTableSchema::global_status_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::partitions_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::partitions_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -817,419 +813,419 @@ int ObInnerTableSchema::partitions_schema(ObTableSchema& table_schema) if (OB_SUCC(ret)) { ObObj table_catalog_default; table_catalog_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("TABLE_CATALOG", // 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 - MAX_TABLE_CATALOG_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_catalog_default, - table_catalog_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_CATALOG", //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 + MAX_TABLE_CATALOG_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_catalog_default, + table_catalog_default); //default_value } if (OB_SUCC(ret)) { ObObj table_schema_default; table_schema_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("TABLE_SCHEMA", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_schema_default, - table_schema_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_SCHEMA", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_schema_default, + table_schema_default); //default_value } if (OB_SUCC(ret)) { ObObj table_name_default; table_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("TABLE_NAME", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_name_default, - table_name_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_NAME", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_name_default, + table_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARTITION_NAME", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARTITION_NAME", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUBPARTITION_NAME", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUBPARTITION_NAME", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARTITION_ORDINAL_POSITION", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARTITION_ORDINAL_POSITION", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUBPARTITION_ORDINAL_POSITION", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUBPARTITION_ORDINAL_POSITION", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARTITION_METHOD", // 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 - OB_MAX_PARTITION_METHOD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARTITION_METHOD", //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 + OB_MAX_PARTITION_METHOD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUBPARTITION_METHOD", // 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 - OB_MAX_PARTITION_METHOD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUBPARTITION_METHOD", //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 + OB_MAX_PARTITION_METHOD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARTITION_EXPRESSION", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARTITION_EXPRESSION", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUBPARTITION_EXPRESSION", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUBPARTITION_EXPRESSION", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARTITION_DESCRIPTION", // 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 - OB_MAX_PARTITION_DESCRIPTION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARTITION_DESCRIPTION", //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 + OB_MAX_PARTITION_DESCRIPTION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj table_rows_default; table_rows_default.set_uint64(0); - ADD_COLUMN_SCHEMA_T("TABLE_ROWS", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_rows_default, - table_rows_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_ROWS", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_rows_default, + table_rows_default); //default_value } if (OB_SUCC(ret)) { ObObj avg_row_length_default; avg_row_length_default.set_uint64(0); - ADD_COLUMN_SCHEMA_T("AVG_ROW_LENGTH", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - avg_row_length_default, - avg_row_length_default); // default_value + ADD_COLUMN_SCHEMA_T("AVG_ROW_LENGTH", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + avg_row_length_default, + avg_row_length_default); //default_value } if (OB_SUCC(ret)) { ObObj data_length_default; data_length_default.set_uint64(0); - ADD_COLUMN_SCHEMA_T("DATA_LENGTH", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - data_length_default, - data_length_default); // default_value + ADD_COLUMN_SCHEMA_T("DATA_LENGTH", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + data_length_default, + data_length_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAX_DATA_LENGTH", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MAX_DATA_LENGTH", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj index_length_default; index_length_default.set_uint64(0); - ADD_COLUMN_SCHEMA_T("INDEX_LENGTH", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - index_length_default, - index_length_default); // default_value + ADD_COLUMN_SCHEMA_T("INDEX_LENGTH", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + index_length_default, + index_length_default); //default_value } if (OB_SUCC(ret)) { ObObj data_free_default; data_free_default.set_uint64(0); - ADD_COLUMN_SCHEMA_T("DATA_FREE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - data_free_default, - data_free_default); // default_value + ADD_COLUMN_SCHEMA_T("DATA_FREE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + data_free_default, + data_free_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("CREATE_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("CREATE_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("UPDATE_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("UPDATE_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("CHECK_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("CHECK_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHECKSUM", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CHECKSUM", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj partition_comment_default; partition_comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("PARTITION_COMMENT", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - partition_comment_default, - partition_comment_default); // default_value + ADD_COLUMN_SCHEMA_T("PARTITION_COMMENT", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + partition_comment_default, + partition_comment_default); //default_value } if (OB_SUCC(ret)) { ObObj nodegroup_default; nodegroup_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("NODEGROUP", // 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 - OB_MAX_NODEGROUP_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - nodegroup_default, - nodegroup_default); // default_value + ADD_COLUMN_SCHEMA_T("NODEGROUP", //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 + OB_MAX_NODEGROUP_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + nodegroup_default, + nodegroup_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLESPACE_NAME", // 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 - OB_MAX_TABLEGROUP_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TABLESPACE_NAME", //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 + OB_MAX_TABLEGROUP_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1239,17 +1235,16 @@ int ObInnerTableSchema::partitions_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::session_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::session_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -1282,39 +1277,39 @@ int ObInnerTableSchema::session_status_schema(ObTableSchema& table_schema) if (OB_SUCC(ret)) { ObObj variable_name_default; variable_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("VARIABLE_NAME", // 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 - OB_MAX_SYS_PARAM_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - variable_name_default, - variable_name_default); // default_value + ADD_COLUMN_SCHEMA_T("VARIABLE_NAME", //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 + OB_MAX_SYS_PARAM_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + variable_name_default, + variable_name_default); //default_value } if (OB_SUCC(ret)) { ObObj variable_value_default; variable_value_default.set_null(); - ADD_COLUMN_SCHEMA_T("VARIABLE_VALUE", // 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 - OB_MAX_SYS_PARAM_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - variable_value_default, - variable_value_default); // default_value + ADD_COLUMN_SCHEMA_T("VARIABLE_VALUE", //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 + OB_MAX_SYS_PARAM_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + variable_value_default, + variable_value_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1324,17 +1319,16 @@ int ObInnerTableSchema::session_status_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_MYSQL_SCHEMA_ID)); @@ -1365,680 +1359,680 @@ int ObInnerTableSchema::user_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("host", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("host", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("password", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("select_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("select_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("insert_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("insert_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("update_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("update_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("delete_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("delete_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("drop_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("drop_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("reload_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("reload_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("shutdown_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("shutdown_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("process_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("process_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("file_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("file_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grant_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("grant_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("reference_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("reference_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("index_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("alter_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("alter_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("show_db_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("show_db_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("super_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("super_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_tmp_table_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_tmp_table_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lock_tables_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("lock_tables_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("execute_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("execute_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("repl_slave_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("repl_slave_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("repl_client_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("repl_client_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_view_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_view_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("show_view_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("show_view_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_routine_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_routine_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("alter_routine_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("alter_routine_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_user_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_user_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("event_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trigger_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_tablespace_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_tablespace_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj ssl_type_default; ssl_type_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("ssl_type", // 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 - 10, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - ssl_type_default, - ssl_type_default); // default_value + ADD_COLUMN_SCHEMA_T("ssl_type", //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 + 10, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + ssl_type_default, + ssl_type_default); //default_value } if (OB_SUCC(ret)) { ObObj ssl_cipher_default; ssl_cipher_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("ssl_cipher", // 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 - ssl_cipher_default, - ssl_cipher_default); // default_value + ADD_COLUMN_SCHEMA_T("ssl_cipher", //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 + ssl_cipher_default, + ssl_cipher_default); //default_value } if (OB_SUCC(ret)) { ObObj x509_issuer_default; x509_issuer_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("x509_issuer", // 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 - x509_issuer_default, - x509_issuer_default); // default_value + ADD_COLUMN_SCHEMA_T("x509_issuer", //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 + x509_issuer_default, + x509_issuer_default); //default_value } if (OB_SUCC(ret)) { ObObj x509_subject_default; x509_subject_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("x509_subject", // 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 - x509_subject_default, - x509_subject_default); // default_value + ADD_COLUMN_SCHEMA_T("x509_subject", //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 + x509_subject_default, + x509_subject_default); //default_value } if (OB_SUCC(ret)) { ObObj max_questions_default; max_questions_default.set_int(0); - ADD_COLUMN_SCHEMA_T("max_questions", // 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_questions_default, - max_questions_default); // default_value + ADD_COLUMN_SCHEMA_T("max_questions", //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_questions_default, + max_questions_default); //default_value } if (OB_SUCC(ret)) { ObObj max_updates_default; max_updates_default.set_int(0); - ADD_COLUMN_SCHEMA_T("max_updates", // 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_updates_default, - max_updates_default); // default_value + ADD_COLUMN_SCHEMA_T("max_updates", //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_updates_default, + max_updates_default); //default_value } if (OB_SUCC(ret)) { ObObj max_connections_default; max_connections_default.set_int(0); - ADD_COLUMN_SCHEMA_T("max_connections", // 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_connections_default, - max_connections_default); // default_value + ADD_COLUMN_SCHEMA_T("max_connections", //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_connections_default, + max_connections_default); //default_value } if (OB_SUCC(ret)) { ObObj max_user_connections_default; max_user_connections_default.set_int(0); - ADD_COLUMN_SCHEMA_T("max_user_connections", // 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_user_connections_default, - max_user_connections_default); // default_value + ADD_COLUMN_SCHEMA_T("max_user_connections", //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_user_connections_default, + max_user_connections_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plugin", // 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 + ADD_COLUMN_SCHEMA("plugin", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("authentication_string", // 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 + ADD_COLUMN_SCHEMA("authentication_string", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password_expired", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("password_expired", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2048,17 +2042,16 @@ int ObInnerTableSchema::user_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::db_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::db_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_MYSQL_SCHEMA_ID)); @@ -2089,333 +2082,333 @@ int ObInnerTableSchema::db_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("host", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("host", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("db", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("db", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("select_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("select_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("insert_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("insert_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("update_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("update_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("delete_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("delete_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("drop_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("drop_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grant_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("grant_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("reference_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("reference_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("index_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("alter_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("alter_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_tmp_table_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_tmp_table_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lock_tables_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("lock_tables_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_view_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_view_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("show_view_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("show_view_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_routine_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_routine_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("alter_routine_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("alter_routine_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("execute_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("execute_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("event_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_priv", // 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 - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trigger_priv", //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 + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2425,17 +2418,16 @@ int ObInnerTableSchema::db_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_server_memory_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_server_memory_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2466,138 +2458,138 @@ int ObInnerTableSchema::all_virtual_server_memory_info_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("server_memory_hold", // 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 + ADD_COLUMN_SCHEMA("server_memory_hold", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("server_memory_limit", // 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 + ADD_COLUMN_SCHEMA("server_memory_limit", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("system_reserved", // 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 + ADD_COLUMN_SCHEMA("system_reserved", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("active_memstore_used", // 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 + ADD_COLUMN_SCHEMA("active_memstore_used", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_memstore_used", // 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 + ADD_COLUMN_SCHEMA("total_memstore_used", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("major_freeze_trigger", // 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 + ADD_COLUMN_SCHEMA("major_freeze_trigger", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memstore_limit", // 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 + ADD_COLUMN_SCHEMA("memstore_limit", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -2615,17 +2607,16 @@ int ObInnerTableSchema::all_virtual_server_memory_info_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_partition_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_partition_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2656,501 +2647,501 @@ int ObInnerTableSchema::all_virtual_partition_table_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_port", // 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 + ADD_COLUMN_SCHEMA("sql_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_id", // 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 + ADD_COLUMN_SCHEMA("unit_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role", // 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 + ADD_COLUMN_SCHEMA("role", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("member_list", // 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 - MAX_MEMBER_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("member_list", //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 + MAX_MEMBER_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_count", // 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 + ADD_COLUMN_SCHEMA("row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_size", // 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 + ADD_COLUMN_SCHEMA("data_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_version", // 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 + ADD_COLUMN_SCHEMA("data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_checksum", // 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 + ADD_COLUMN_SCHEMA("data_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_checksum", // 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 + ADD_COLUMN_SCHEMA("row_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_checksum", // 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 - COLUMN_CHECKSUM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("column_checksum", //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 + COLUMN_CHECKSUM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj is_original_leader_default; is_original_leader_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_original_leader", // 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 - is_original_leader_default, - is_original_leader_default); // default_value + ADD_COLUMN_SCHEMA_T("is_original_leader", //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 + is_original_leader_default, + is_original_leader_default); //default_value } if (OB_SUCC(ret)) { ObObj to_leader_time_default; to_leader_time_default.set_int(0); - ADD_COLUMN_SCHEMA_T("to_leader_time", // 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 - to_leader_time_default, - to_leader_time_default); // default_value + ADD_COLUMN_SCHEMA_T("to_leader_time", //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 + to_leader_time_default, + to_leader_time_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_time", // 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 + ADD_COLUMN_SCHEMA("create_time", //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 } if (OB_SUCC(ret)) { ObObj rebuild_default; rebuild_default.set_int(0); - ADD_COLUMN_SCHEMA_T("rebuild", // 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 - rebuild_default, - rebuild_default); // default_value + ADD_COLUMN_SCHEMA_T("rebuild", //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 + rebuild_default, + rebuild_default); //default_value } if (OB_SUCC(ret)) { ObObj replica_type_default; replica_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("replica_type", // 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 - replica_type_default, - replica_type_default); // default_value + ADD_COLUMN_SCHEMA_T("replica_type", //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 + replica_type_default, + replica_type_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("REPLICA_STATUS_NORMAL")); - ADD_COLUMN_SCHEMA_T("status", // 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 - MAX_REPLICA_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + MAX_REPLICA_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_checksum_default; partition_checksum_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_checksum", // 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 - partition_checksum_default, - partition_checksum_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_checksum", //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 + partition_checksum_default, + partition_checksum_default); //default_value } if (OB_SUCC(ret)) { ObObj required_size_default; required_size_default.set_int(0); - ADD_COLUMN_SCHEMA_T("required_size", // 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 - required_size_default, - required_size_default); // default_value + ADD_COLUMN_SCHEMA_T("required_size", //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 + required_size_default, + required_size_default); //default_value } if (OB_SUCC(ret)) { ObObj is_restore_default; is_restore_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_restore", // 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 - is_restore_default, - is_restore_default); // default_value + ADD_COLUMN_SCHEMA_T("is_restore", //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 + is_restore_default, + is_restore_default); //default_value } if (OB_SUCC(ret)) { ObObj quorum_default; quorum_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("quorum", // 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 - quorum_default, - quorum_default); // default_value + ADD_COLUMN_SCHEMA_T("quorum", //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 + quorum_default, + quorum_default); //default_value } if (OB_SUCC(ret)) { ObObj fail_list_default; fail_list_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("fail_list", // 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 - OB_MAX_FAILLIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - fail_list_default, - fail_list_default); // default_value + ADD_COLUMN_SCHEMA_T("fail_list", //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 + OB_MAX_FAILLIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + fail_list_default, + fail_list_default); //default_value } if (OB_SUCC(ret)) { ObObj recovery_timestamp_default; recovery_timestamp_default.set_int(0); - ADD_COLUMN_SCHEMA_T("recovery_timestamp", // 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 - recovery_timestamp_default, - recovery_timestamp_default); // default_value + ADD_COLUMN_SCHEMA_T("recovery_timestamp", //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 + recovery_timestamp_default, + recovery_timestamp_default); //default_value } if (OB_SUCC(ret)) { ObObj memstore_percent_default; memstore_percent_default.set_int(100); - ADD_COLUMN_SCHEMA_T("memstore_percent", // 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 - memstore_percent_default, - memstore_percent_default); // default_value + ADD_COLUMN_SCHEMA_T("memstore_percent", //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 + memstore_percent_default, + memstore_percent_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3160,17 +3151,16 @@ int ObInnerTableSchema::all_virtual_partition_table_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_lock_wait_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_lock_wait_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3201,243 +3191,243 @@ int ObInnerTableSchema::all_virtual_lock_wait_stat_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("rowkey", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("addr", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("addr", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("need_wait", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("need_wait", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("recv_ts", // 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 + ADD_COLUMN_SCHEMA("recv_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lock_ts", // 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 + ADD_COLUMN_SCHEMA("lock_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("abs_timeout", // 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 + ADD_COLUMN_SCHEMA("abs_timeout", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("try_lock_times", // 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 + ADD_COLUMN_SCHEMA("try_lock_times", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("time_after_recv", // 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 + ADD_COLUMN_SCHEMA("time_after_recv", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // 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 + ADD_COLUMN_SCHEMA("session_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_session_id", // 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 + ADD_COLUMN_SCHEMA("block_session_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 + ADD_COLUMN_SCHEMA("type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lock_mode", // 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 + ADD_COLUMN_SCHEMA("lock_mode", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_update_cnt", // 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 + ADD_COLUMN_SCHEMA("total_update_cnt", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -3455,17 +3445,16 @@ int ObInnerTableSchema::all_virtual_lock_wait_stat_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_partition_item_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_partition_item_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3496,303 +3485,303 @@ int ObInnerTableSchema::all_virtual_partition_item_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 + ADD_COLUMN_SCHEMA("partition_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_level", // 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 + ADD_COLUMN_SCHEMA("partition_level", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_num", // 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 + ADD_COLUMN_SCHEMA("partition_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // 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 + ADD_COLUMN_SCHEMA("partition_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_func_type", // 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 - 5, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_func_type", //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 + 5, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_num", // 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 + ADD_COLUMN_SCHEMA("part_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_name", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_name", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_idx", // 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 + ADD_COLUMN_SCHEMA("part_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_id", // 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 + ADD_COLUMN_SCHEMA("part_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_high_bound", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_high_bound", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subpart_func_type", // 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 - 5, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("subpart_func_type", //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 + 5, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subpart_num", // 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 + ADD_COLUMN_SCHEMA("subpart_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subpart_name", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("subpart_name", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subpart_idx", // 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 + ADD_COLUMN_SCHEMA("subpart_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subpart_id", // 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 + ADD_COLUMN_SCHEMA("subpart_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subpart_high_bound", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("subpart_high_bound", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3802,17 +3791,16 @@ int ObInnerTableSchema::all_virtual_partition_item_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_replica_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_replica_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3843,202 +3831,202 @@ int ObInnerTableSchema::all_virtual_replica_task_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 + ADD_COLUMN_SCHEMA("partition_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("src_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("src_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("src_port", // 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 + ADD_COLUMN_SCHEMA("src_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("src_replica_type", // 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 + ADD_COLUMN_SCHEMA("src_replica_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("region", // 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 - MAX_REGION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("region", //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 + MAX_REGION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dst_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dst_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dst_port", // 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 + ADD_COLUMN_SCHEMA("dst_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dst_replica_type", // 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 + ADD_COLUMN_SCHEMA("dst_replica_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cmd_type", // 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 - MAX_ROOTSERVICE_EVENT_DESC_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cmd_type", //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 + MAX_ROOTSERVICE_EVENT_DESC_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj comment_default; comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("comment", // 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 - MAX_ROOTSERVICE_EVENT_EXTRA_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - comment_default, - comment_default); // default_value + ADD_COLUMN_SCHEMA_T("comment", //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 + MAX_ROOTSERVICE_EVENT_EXTRA_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + comment_default, + comment_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4048,17 +4036,16 @@ int ObInnerTableSchema::all_virtual_replica_task_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_replica_task_all_virtual_replica_task_i1_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_replica_task_all_virtual_replica_task_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID))); @@ -4094,18 +4081,18 @@ int ObInnerTableSchema::all_virtual_replica_task_all_virtual_replica_task_i1_sch table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - column_id + 1, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + column_id + 1, //column_id + 1, //rowkey_id + 1, //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 } table_schema.set_index_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -4115,12 +4102,12 @@ int ObInnerTableSchema::all_virtual_replica_task_all_virtual_replica_task_i1_sch return ret; } -int ObInnerTableSchema::all_virtual_partition_location_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_partition_location_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4151,206 +4138,206 @@ int ObInnerTableSchema::all_virtual_partition_location_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_id", // 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 + ADD_COLUMN_SCHEMA("unit_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role", // 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 + ADD_COLUMN_SCHEMA("role", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("member_list", // 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 - MAX_MEMBER_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("member_list", //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 + MAX_MEMBER_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj replica_type_default; replica_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("replica_type", // 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 - replica_type_default, - replica_type_default); // default_value + ADD_COLUMN_SCHEMA_T("replica_type", //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 + replica_type_default, + replica_type_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("REPLICA_STATUS_NORMAL")); - ADD_COLUMN_SCHEMA_T("status", // 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 - MAX_REPLICA_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + MAX_REPLICA_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_version", // 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 + ADD_COLUMN_SCHEMA("data_version", //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 } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4360,17 +4347,16 @@ int ObInnerTableSchema::all_virtual_partition_location_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::proc_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::proc_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_MYSQL_SCHEMA_ID)); @@ -4401,345 +4387,345 @@ int ObInnerTableSchema::proc_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("db", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("db", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - OB_MAX_ROUTINE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + OB_MAX_ROUTINE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 - 10, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type", //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 + 10, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("specific_name", // 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 - OB_MAX_INFOSCHEMA_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("specific_name", //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 + OB_MAX_INFOSCHEMA_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj language_default; language_default.set_varchar(ObString::make_string("SQL")); - ADD_COLUMN_SCHEMA_T("language", // 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 - 4, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - language_default, - language_default); // default_value + ADD_COLUMN_SCHEMA_T("language", //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 + 4, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + language_default, + language_default); //default_value } if (OB_SUCC(ret)) { ObObj sql_data_access_default; sql_data_access_default.set_varchar(ObString::make_string("CONTAINS_SQL")); - ADD_COLUMN_SCHEMA_T("sql_data_access", // 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 - 32, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - sql_data_access_default, - sql_data_access_default); // default_value + ADD_COLUMN_SCHEMA_T("sql_data_access", //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 + 32, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + sql_data_access_default, + sql_data_access_default); //default_value } if (OB_SUCC(ret)) { ObObj is_deterministic_default; is_deterministic_default.set_varchar(ObString::make_string("NO")); - ADD_COLUMN_SCHEMA_T("is_deterministic", // 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 - 4, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_deterministic_default, - is_deterministic_default); // default_value + ADD_COLUMN_SCHEMA_T("is_deterministic", //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 + 4, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_deterministic_default, + is_deterministic_default); //default_value } if (OB_SUCC(ret)) { ObObj security_type_default; security_type_default.set_varchar(ObString::make_string("DEFINER")); - ADD_COLUMN_SCHEMA_T("security_type", // 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 - 10, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - security_type_default, - security_type_default); // default_value + ADD_COLUMN_SCHEMA_T("security_type", //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 + 10, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + security_type_default, + security_type_default); //default_value } if (OB_SUCC(ret)) { ObObj param_list_default; param_list_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("param_list", // 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 - OB_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - param_list_default, - param_list_default); // default_value + ADD_COLUMN_SCHEMA_T("param_list", //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 + OB_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + param_list_default, + param_list_default); //default_value } if (OB_SUCC(ret)) { ObObj returns_default; returns_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("returns", // 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 - OB_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - returns_default, - returns_default); // default_value + ADD_COLUMN_SCHEMA_T("returns", //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 + OB_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + returns_default, + returns_default); //default_value } if (OB_SUCC(ret)) { ObObj body_default; body_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("body", // 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 - OB_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - body_default, - body_default); // default_value + ADD_COLUMN_SCHEMA_T("body", //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 + OB_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + body_default, + body_default); //default_value } if (OB_SUCC(ret)) { ObObj definer_default; definer_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("definer", // 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 - 77, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - definer_default, - definer_default); // default_value + ADD_COLUMN_SCHEMA_T("definer", //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 + 77, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + definer_default, + definer_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("created", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("created", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj sql_mode_default; sql_mode_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sql_mode", // 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 - 32, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - sql_mode_default, - sql_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("sql_mode", //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 + 32, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + sql_mode_default, + sql_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj comment_default; comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("comment", // 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 - OB_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - comment_default, - comment_default); // default_value + ADD_COLUMN_SCHEMA_T("comment", //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 + OB_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + comment_default, + comment_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("character_set_client", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("character_set_client", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_connection", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation_connection", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_database", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation_database", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("body_utf8", // 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 - OB_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("body_utf8", //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 + OB_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4749,17 +4735,16 @@ int ObInnerTableSchema::proc_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_collation_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_collation_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4792,115 +4777,115 @@ int ObInnerTableSchema::tenant_virtual_collation_schema(ObTableSchema& table_sch if (OB_SUCC(ret)) { ObObj collation_default; collation_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("collation", // 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 - MAX_COLLATION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - collation_default, - collation_default); // default_value + ADD_COLUMN_SCHEMA_T("collation", //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 + MAX_COLLATION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + collation_default, + collation_default); //default_value } if (OB_SUCC(ret)) { ObObj charset_default; charset_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("charset", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - charset_default, - charset_default); // default_value + ADD_COLUMN_SCHEMA_T("charset", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + charset_default, + charset_default); //default_value } if (OB_SUCC(ret)) { ObObj id_default; id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("id", // 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 - id_default, - id_default); // default_value + ADD_COLUMN_SCHEMA_T("id", //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 + id_default, + id_default); //default_value } if (OB_SUCC(ret)) { ObObj is_default_default; is_default_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("is_default", // 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 - MAX_BOOL_STR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_default_default, - is_default_default); // default_value + ADD_COLUMN_SCHEMA_T("is_default", //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 + MAX_BOOL_STR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_default_default, + is_default_default); //default_value } if (OB_SUCC(ret)) { ObObj is_compiled_default; is_compiled_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("is_compiled", // 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 - MAX_BOOL_STR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_compiled_default, - is_compiled_default); // default_value + ADD_COLUMN_SCHEMA_T("is_compiled", //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 + MAX_BOOL_STR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_compiled_default, + is_compiled_default); //default_value } if (OB_SUCC(ret)) { ObObj sortlen_default; sortlen_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sortlen", // 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 - sortlen_default, - sortlen_default); // default_value + ADD_COLUMN_SCHEMA_T("sortlen", //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 + sortlen_default, + sortlen_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4910,17 +4895,16 @@ int ObInnerTableSchema::tenant_virtual_collation_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_charset_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_charset_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4953,77 +4937,77 @@ int ObInnerTableSchema::tenant_virtual_charset_schema(ObTableSchema& table_schem if (OB_SUCC(ret)) { ObObj charset_default; charset_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("charset", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - charset_default, - charset_default); // default_value + ADD_COLUMN_SCHEMA_T("charset", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + charset_default, + charset_default); //default_value } if (OB_SUCC(ret)) { ObObj description_default; description_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("description", // 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 - MAX_CHARSET_DESCRIPTION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - description_default, - description_default); // default_value + ADD_COLUMN_SCHEMA_T("description", //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 + MAX_CHARSET_DESCRIPTION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + description_default, + description_default); //default_value } if (OB_SUCC(ret)) { ObObj default_collation_default; default_collation_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("default_collation", // 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 - MAX_COLLATION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - default_collation_default, - default_collation_default); // default_value + ADD_COLUMN_SCHEMA_T("default_collation", //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 + MAX_COLLATION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + default_collation_default, + default_collation_default); //default_value } if (OB_SUCC(ret)) { ObObj max_length_default; max_length_default.set_int(0); - ADD_COLUMN_SCHEMA_T("max_length", // 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_length_default, - max_length_default); // default_value + ADD_COLUMN_SCHEMA_T("max_length", //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_length_default, + max_length_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5033,17 +5017,16 @@ int ObInnerTableSchema::tenant_virtual_charset_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_memstore_allocator_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_memstore_allocator_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5074,153 +5057,153 @@ int ObInnerTableSchema::all_virtual_tenant_memstore_allocator_info_schema(ObTabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 + ADD_COLUMN_SCHEMA("partition_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mt_base_version", // 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 + ADD_COLUMN_SCHEMA("mt_base_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("retire_clock", // 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 + ADD_COLUMN_SCHEMA("retire_clock", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mt_is_frozen", // 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 + ADD_COLUMN_SCHEMA("mt_is_frozen", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mt_protection_clock", // 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 + ADD_COLUMN_SCHEMA("mt_protection_clock", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mt_snapshot_version", // 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 + ADD_COLUMN_SCHEMA("mt_snapshot_version", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -5238,17 +5221,16 @@ int ObInnerTableSchema::all_virtual_tenant_memstore_allocator_info_schema(ObTabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_table_mgr_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_table_mgr_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5279,393 +5261,393 @@ int ObInnerTableSchema::all_virtual_table_mgr_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_type", // 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 + ADD_COLUMN_SCHEMA("table_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 + ADD_COLUMN_SCHEMA("partition_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_id", // 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 + ADD_COLUMN_SCHEMA("index_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("base_version", // 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 + ADD_COLUMN_SCHEMA("base_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("multi_version_start", // 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 + ADD_COLUMN_SCHEMA("multi_version_start", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_merged_version", // 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 + ADD_COLUMN_SCHEMA("max_merged_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("upper_trans_version", // 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 + ADD_COLUMN_SCHEMA("upper_trans_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_log_ts", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("start_log_ts", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("end_log_ts", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("end_log_ts", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_log_ts", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_log_ts", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("version", // 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 + ADD_COLUMN_SCHEMA("version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logical_data_version", // 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 + ADD_COLUMN_SCHEMA("logical_data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("size", // 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 + ADD_COLUMN_SCHEMA("size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compact_row", // 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 + ADD_COLUMN_SCHEMA("compact_row", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_active", // 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 + ADD_COLUMN_SCHEMA("is_active", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("timestamp", // 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 + ADD_COLUMN_SCHEMA("timestamp", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref", // 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 + ADD_COLUMN_SCHEMA("ref", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("write_ref", // 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 + ADD_COLUMN_SCHEMA("write_ref", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trx_count", // 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 + ADD_COLUMN_SCHEMA("trx_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pending_log_persisting_row_cnt", // 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 + ADD_COLUMN_SCHEMA("pending_log_persisting_row_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("contain_uncommitted_row", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("contain_uncommitted_row", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -5683,17 +5665,16 @@ int ObInnerTableSchema::all_virtual_table_mgr_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_meta_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_meta_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5724,552 +5705,552 @@ int ObInnerTableSchema::all_virtual_meta_table_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_port", // 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 + ADD_COLUMN_SCHEMA("sql_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_id", // 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 + ADD_COLUMN_SCHEMA("unit_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role", // 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 + ADD_COLUMN_SCHEMA("role", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("member_list", // 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 - MAX_MEMBER_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("member_list", //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 + MAX_MEMBER_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_count", // 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 + ADD_COLUMN_SCHEMA("row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_size", // 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 + ADD_COLUMN_SCHEMA("data_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_version", // 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 + ADD_COLUMN_SCHEMA("data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_checksum", // 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 + ADD_COLUMN_SCHEMA("data_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_checksum", // 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 + ADD_COLUMN_SCHEMA("row_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_checksum", // 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 - COLUMN_CHECKSUM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("column_checksum", //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 + COLUMN_CHECKSUM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj is_original_leader_default; is_original_leader_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_original_leader", // 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 - is_original_leader_default, - is_original_leader_default); // default_value + ADD_COLUMN_SCHEMA_T("is_original_leader", //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 + is_original_leader_default, + is_original_leader_default); //default_value } if (OB_SUCC(ret)) { ObObj is_previous_leader_default; is_previous_leader_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_previous_leader", // 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 - is_previous_leader_default, - is_previous_leader_default); // default_value + ADD_COLUMN_SCHEMA_T("is_previous_leader", //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 + is_previous_leader_default, + is_previous_leader_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_time", // 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 + ADD_COLUMN_SCHEMA("create_time", //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 } if (OB_SUCC(ret)) { ObObj rebuild_default; rebuild_default.set_int(0); - ADD_COLUMN_SCHEMA_T("rebuild", // 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 - rebuild_default, - rebuild_default); // default_value + ADD_COLUMN_SCHEMA_T("rebuild", //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 + rebuild_default, + rebuild_default); //default_value } if (OB_SUCC(ret)) { ObObj replica_type_default; replica_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("replica_type", // 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 - replica_type_default, - replica_type_default); // default_value + ADD_COLUMN_SCHEMA_T("replica_type", //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 + replica_type_default, + replica_type_default); //default_value } if (OB_SUCC(ret)) { ObObj required_size_default; required_size_default.set_int(0); - ADD_COLUMN_SCHEMA_T("required_size", // 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 - required_size_default, - required_size_default); // default_value + ADD_COLUMN_SCHEMA_T("required_size", //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 + required_size_default, + required_size_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("REPLICA_STATUS_NORMAL")); - ADD_COLUMN_SCHEMA_T("status", // 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 - MAX_REPLICA_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + MAX_REPLICA_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { ObObj is_restore_default; is_restore_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_restore", // 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 - is_restore_default, - is_restore_default); // default_value + ADD_COLUMN_SCHEMA_T("is_restore", //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 + is_restore_default, + is_restore_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_checksum_default; partition_checksum_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_checksum", // 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 - partition_checksum_default, - partition_checksum_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_checksum", //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 + partition_checksum_default, + partition_checksum_default); //default_value } if (OB_SUCC(ret)) { ObObj quorum_default; quorum_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("quorum", // 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 - quorum_default, - quorum_default); // default_value + ADD_COLUMN_SCHEMA_T("quorum", //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 + quorum_default, + quorum_default); //default_value } if (OB_SUCC(ret)) { ObObj fail_list_default; fail_list_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("fail_list", // 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 - OB_MAX_FAILLIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - fail_list_default, - fail_list_default); // default_value + ADD_COLUMN_SCHEMA_T("fail_list", //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 + OB_MAX_FAILLIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + fail_list_default, + fail_list_default); //default_value } if (OB_SUCC(ret)) { ObObj recovery_timestamp_default; recovery_timestamp_default.set_int(0); - ADD_COLUMN_SCHEMA_T("recovery_timestamp", // 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 - recovery_timestamp_default, - recovery_timestamp_default); // default_value + ADD_COLUMN_SCHEMA_T("recovery_timestamp", //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 + recovery_timestamp_default, + recovery_timestamp_default); //default_value } if (OB_SUCC(ret)) { ObObj memstore_percent_default; memstore_percent_default.set_int(100); - ADD_COLUMN_SCHEMA_T("memstore_percent", // 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 - memstore_percent_default, - memstore_percent_default); // default_value + ADD_COLUMN_SCHEMA_T("memstore_percent", //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 + memstore_percent_default, + memstore_percent_default); //default_value } if (OB_SUCC(ret)) { ObObj data_file_id_default; data_file_id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("data_file_id", // 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 - data_file_id_default, - data_file_id_default); // default_value + ADD_COLUMN_SCHEMA_T("data_file_id", //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 + data_file_id_default, + data_file_id_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6279,17 +6260,16 @@ int ObInnerTableSchema::all_virtual_meta_table_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_freeze_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_freeze_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6320,48 +6300,48 @@ int ObInnerTableSchema::all_virtual_freeze_info_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("frozen_version", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("frozen_version", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("frozen_timestamp", // 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 + ADD_COLUMN_SCHEMA("frozen_timestamp", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("schema_version", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6371,17 +6351,16 @@ int ObInnerTableSchema::all_virtual_freeze_info_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::parameters_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::parameters_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -6414,265 +6393,265 @@ int ObInnerTableSchema::parameters_schema(ObTableSchema& table_schema) if (OB_SUCC(ret)) { ObObj specific_catalog_default; specific_catalog_default.set_varchar(ObString::make_string("def")); - ADD_COLUMN_SCHEMA_T("SPECIFIC_CATALOG", // 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 - MAX_TABLE_CATALOG_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - specific_catalog_default, - specific_catalog_default); // default_value + ADD_COLUMN_SCHEMA_T("SPECIFIC_CATALOG", //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 + MAX_TABLE_CATALOG_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + specific_catalog_default, + specific_catalog_default); //default_value } if (OB_SUCC(ret)) { ObObj specific_schema_default; specific_schema_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("SPECIFIC_SCHEMA", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - specific_schema_default, - specific_schema_default); // default_value + ADD_COLUMN_SCHEMA_T("SPECIFIC_SCHEMA", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + specific_schema_default, + specific_schema_default); //default_value } if (OB_SUCC(ret)) { ObObj specific_name_default; specific_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("SPECIFIC_NAME", // 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 - OB_MAX_PARAMETERS_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - specific_name_default, - specific_name_default); // default_value + ADD_COLUMN_SCHEMA_T("SPECIFIC_NAME", //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 + OB_MAX_PARAMETERS_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + specific_name_default, + specific_name_default); //default_value } if (OB_SUCC(ret)) { ObObj ordinal_position_default; ordinal_position_default.set_int(0); - ADD_COLUMN_SCHEMA_T("ORDINAL_POSITION", // 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 - ordinal_position_default, - ordinal_position_default); // default_value + ADD_COLUMN_SCHEMA_T("ORDINAL_POSITION", //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 + ordinal_position_default, + ordinal_position_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARAMETER_MODE", // 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 - OB_MAX_PARAMETERS_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARAMETER_MODE", //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 + OB_MAX_PARAMETERS_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARAMETER_NAME", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARAMETER_NAME", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj data_type_default; data_type_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("DATA_TYPE", // 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 - OB_MAX_PARAMETERS_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - data_type_default, - data_type_default); // default_value + ADD_COLUMN_SCHEMA_T("DATA_TYPE", //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 + OB_MAX_PARAMETERS_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + data_type_default, + data_type_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHARACTER_MAXIMUM_LENGTH", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CHARACTER_MAXIMUM_LENGTH", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHARACTER_OCTET_LENGTH", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CHARACTER_OCTET_LENGTH", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NUMERIC_PRECISION", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NUMERIC_PRECISION", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NUMERIC_SCALE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NUMERIC_SCALE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATETIME_PRECISION", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DATETIME_PRECISION", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHARACTER_SET_NAME", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CHARACTER_SET_NAME", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COLLATION_NAME", // 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 - MAX_COLLATION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLLATION_NAME", //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 + MAX_COLLATION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DTD_IDENTIFIER", // 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 - OB_MAX_SYS_PARAM_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DTD_IDENTIFIER", //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 + OB_MAX_SYS_PARAM_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj routine_type_default; routine_type_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("ROUTINE_TYPE", // 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 - 9, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - routine_type_default, - routine_type_default); // default_value + ADD_COLUMN_SCHEMA_T("ROUTINE_TYPE", //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 + 9, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + routine_type_default, + routine_type_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6682,17 +6661,16 @@ int ObInnerTableSchema::parameters_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_bad_block_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_bad_block_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6723,124 +6701,124 @@ int ObInnerTableSchema::all_virtual_bad_block_table_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_id", // 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 + ADD_COLUMN_SCHEMA("disk_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("store_file_path", // 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 - MAX_PATH_SIZE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("store_file_path", //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 + MAX_PATH_SIZE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_block_index", // 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 + ADD_COLUMN_SCHEMA("macro_block_index", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("error_type", // 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 + ADD_COLUMN_SCHEMA("error_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("error_msg", // 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 - OB_MAX_ERROR_MSG_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("error_msg", //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 + OB_MAX_ERROR_MSG_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("check_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("check_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -6858,17 +6836,16 @@ int ObInnerTableSchema::all_virtual_bad_block_table_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_px_worker_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_px_worker_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6899,169 +6876,169 @@ int ObInnerTableSchema::all_virtual_px_worker_stat_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // 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 + ADD_COLUMN_SCHEMA("session_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trace_id", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trace_id", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("qc_id", // 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 + ADD_COLUMN_SCHEMA("qc_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sqc_id", // 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 + ADD_COLUMN_SCHEMA("sqc_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("worker_id", // 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 + ADD_COLUMN_SCHEMA("worker_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dfo_id", // 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 + ADD_COLUMN_SCHEMA("dfo_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("thread_id", // 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 + ADD_COLUMN_SCHEMA("thread_id", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -7079,17 +7056,16 @@ int ObInnerTableSchema::all_virtual_px_worker_stat_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_trans_audit_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_trans_audit_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7120,305 +7096,305 @@ int ObInnerTableSchema::all_virtual_trans_audit_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_id", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trans_id", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pkey", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("pkey", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("session_id", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("proxy_id", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("proxy_id", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_type", // 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 + ADD_COLUMN_SCHEMA("trans_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("ctx_create_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("ctx_create_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("expired_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("expired_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_param", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trans_param", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_sql_no", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("total_sql_no", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("refer", // 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 + ADD_COLUMN_SCHEMA("refer", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_trans_arr", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("prev_trans_arr", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("next_trans_arr", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("next_trans_arr", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ctx_addr", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ctx_addr", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ctx_type", // 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 + ADD_COLUMN_SCHEMA("ctx_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trace_log", // 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 - 2048, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trace_log", //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 + 2048, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 + ADD_COLUMN_SCHEMA("status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("for_replay", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("for_replay", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -7436,17 +7412,16 @@ int ObInnerTableSchema::all_virtual_trans_audit_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_trans_sql_audit_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_trans_sql_audit_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7477,213 +7452,213 @@ int ObInnerTableSchema::all_virtual_trans_sql_audit_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_id", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trans_id", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pkey", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("pkey", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_no", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_no", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trace_id", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trace_id", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("phy_plan_type", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("phy_plan_type", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("proxy_receive_us", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("proxy_receive_us", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("server_receive_us", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("server_receive_us", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_receive_us", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trans_receive_us", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_execute_us", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trans_execute_us", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lock_for_read_cnt", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("lock_for_read_cnt", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ctx_addr", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ctx_addr", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -7701,17 +7676,16 @@ int ObInnerTableSchema::all_virtual_trans_sql_audit_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_weak_read_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_weak_read_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7742,423 +7716,423 @@ int ObInnerTableSchema::all_virtual_weak_read_stat_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_id", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("server_version", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("server_version", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("server_version_delta", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("server_version_delta", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("local_cluster_version", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("local_cluster_version", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("local_cluster_version_delta", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("local_cluster_version_delta", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_part_count", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("total_part_count", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("valid_inner_part_count", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("valid_inner_part_count", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("valid_user_part_count", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("valid_user_part_count", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_master_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_master_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_master_port", // 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 + ADD_COLUMN_SCHEMA("cluster_master_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_heartbeat_post_tstamp", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_heartbeat_post_tstamp", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_heartbeat_post_count", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_heartbeat_post_count", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_heartbeat_succ_tstamp", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_heartbeat_succ_tstamp", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_heartbeat_succ_count", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_heartbeat_succ_count", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("self_check_tstamp", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("self_check_tstamp", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("local_current_tstamp", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("local_current_tstamp", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("in_cluster_service", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("in_cluster_service", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_cluster_service_master", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_cluster_service_master", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_service_epoch", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_service_epoch", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_total_server_count", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_total_server_count", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_skipped_server_count", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_skipped_server_count", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version_gen_tstamp", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_version_gen_tstamp", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_version", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version_delta", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_version_delta", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_cluster_version", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("min_cluster_version", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_cluster_version", // 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 - 20, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_cluster_version", //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 + 20, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -8176,10 +8150,10 @@ int ObInnerTableSchema::all_virtual_weak_read_stat_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase 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 8493d4dbd..a180cce3f 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 @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::all_virtual_partition_audit_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_partition_audit_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -58,378 +60,378 @@ int ObInnerTableSchema::all_virtual_partition_audit_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 + ADD_COLUMN_SCHEMA("partition_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_status", // 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 + ADD_COLUMN_SCHEMA("partition_status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("base_row_count", // 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 + ADD_COLUMN_SCHEMA("base_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("insert_row_count", // 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 + ADD_COLUMN_SCHEMA("insert_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("delete_row_count", // 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 + ADD_COLUMN_SCHEMA("delete_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("update_row_count", // 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 + ADD_COLUMN_SCHEMA("update_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("query_row_count", // 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 + ADD_COLUMN_SCHEMA("query_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("insert_sql_count", // 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 + ADD_COLUMN_SCHEMA("insert_sql_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("delete_sql_count", // 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 + ADD_COLUMN_SCHEMA("delete_sql_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("update_sql_count", // 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 + ADD_COLUMN_SCHEMA("update_sql_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("query_sql_count", // 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 + ADD_COLUMN_SCHEMA("query_sql_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_count", // 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 + ADD_COLUMN_SCHEMA("trans_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_count", // 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 + ADD_COLUMN_SCHEMA("sql_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rollback_insert_row_count", // 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 + ADD_COLUMN_SCHEMA("rollback_insert_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rollback_delete_row_count", // 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 + ADD_COLUMN_SCHEMA("rollback_delete_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rollback_update_row_count", // 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 + ADD_COLUMN_SCHEMA("rollback_update_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rollback_insert_sql_count", // 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 + ADD_COLUMN_SCHEMA("rollback_insert_sql_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rollback_delete_sql_count", // 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 + ADD_COLUMN_SCHEMA("rollback_delete_sql_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rollback_update_sql_count", // 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 + ADD_COLUMN_SCHEMA("rollback_update_sql_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rollback_trans_count", // 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 + ADD_COLUMN_SCHEMA("rollback_trans_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rollback_sql_count", // 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 + ADD_COLUMN_SCHEMA("rollback_sql_count", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -447,17 +449,16 @@ int ObInnerTableSchema::all_virtual_partition_audit_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sequence_v2_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sequence_v2_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -488,125 +489,125 @@ int ObInnerTableSchema::all_virtual_sequence_v2_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_key", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("sequence_key", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_name", // 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 - OB_MAX_SEQUENCE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sequence_name", //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 + OB_MAX_SEQUENCE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_value", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sequence_value", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sync_value", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sync_value", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -616,17 +617,16 @@ int ObInnerTableSchema::all_virtual_sequence_v2_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sequence_value_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sequence_value_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -657,80 +657,80 @@ int ObInnerTableSchema::all_virtual_sequence_value_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("sequence_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("next_value", // 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 + ADD_COLUMN_SCHEMA("next_value", //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(FLAT_ROW_STORE); @@ -740,17 +740,16 @@ int ObInnerTableSchema::all_virtual_sequence_value_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_cluster_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_cluster_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -781,214 +780,214 @@ int ObInnerTableSchema::all_virtual_cluster_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_id", // 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 + ADD_COLUMN_SCHEMA("cluster_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_name", // 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 - MAX_ZONE_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_name", //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 + MAX_ZONE_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("created", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("created", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_role", // 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 - MAX_ZONE_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_role", //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 + MAX_ZONE_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_status", // 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 - MAX_ZONE_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_status", //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 + MAX_ZONE_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("switchover#", // 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 + ADD_COLUMN_SCHEMA("switchover#", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("switchover_status", // 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 - MAX_ZONE_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("switchover_status", //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 + MAX_ZONE_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("switchover_info", // 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 - MAX_ZONE_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("switchover_info", //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 + MAX_ZONE_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("current_scn", // 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 + ADD_COLUMN_SCHEMA("current_scn", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("standby_became_primary_scn", // 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 + ADD_COLUMN_SCHEMA("standby_became_primary_scn", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_cluster_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_cluster_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("protection_mode", // 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 - MAX_ZONE_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("protection_mode", //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 + MAX_ZONE_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("protection_level", // 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 - MAX_ZONE_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("protection_level", //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 + MAX_ZONE_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("redo_transport_options", // 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 - MAX_ZONE_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("redo_transport_options", //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 + MAX_ZONE_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -998,17 +997,16 @@ int ObInnerTableSchema::all_virtual_cluster_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_partition_table_store_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_partition_table_store_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1039,528 +1037,528 @@ int ObInnerTableSchema::all_virtual_partition_table_store_stat_schema(ObTableSch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 + ADD_COLUMN_SCHEMA("partition_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_cache_hit_count", // 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 + ADD_COLUMN_SCHEMA("row_cache_hit_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_cache_miss_count", // 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 + ADD_COLUMN_SCHEMA("row_cache_miss_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_cache_put_count", // 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 + ADD_COLUMN_SCHEMA("row_cache_put_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("bf_filter_count", // 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 + ADD_COLUMN_SCHEMA("bf_filter_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("bf_empty_read_count", // 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 + ADD_COLUMN_SCHEMA("bf_empty_read_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("bf_access_count", // 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 + ADD_COLUMN_SCHEMA("bf_access_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_cache_hit_count", // 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 + ADD_COLUMN_SCHEMA("block_cache_hit_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_cache_miss_count", // 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 + ADD_COLUMN_SCHEMA("block_cache_miss_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("access_row_count", // 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 + ADD_COLUMN_SCHEMA("access_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("output_row_count", // 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 + ADD_COLUMN_SCHEMA("output_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("fuse_row_cache_hit_count", // 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 + ADD_COLUMN_SCHEMA("fuse_row_cache_hit_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("fuse_row_cache_miss_count", // 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 + ADD_COLUMN_SCHEMA("fuse_row_cache_miss_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("fuse_row_cache_put_count", // 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 + ADD_COLUMN_SCHEMA("fuse_row_cache_put_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("single_get_call_count", // 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 + ADD_COLUMN_SCHEMA("single_get_call_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("single_get_output_row_count", // 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 + ADD_COLUMN_SCHEMA("single_get_output_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("multi_get_call_count", // 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 + ADD_COLUMN_SCHEMA("multi_get_call_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("multi_get_output_row_count", // 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 + ADD_COLUMN_SCHEMA("multi_get_output_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_back_call_count", // 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 + ADD_COLUMN_SCHEMA("index_back_call_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_back_output_row_count", // 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 + ADD_COLUMN_SCHEMA("index_back_output_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("single_scan_call_count", // 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 + ADD_COLUMN_SCHEMA("single_scan_call_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("single_scan_output_row_count", // 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 + ADD_COLUMN_SCHEMA("single_scan_output_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("multi_scan_call_count", // 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 + ADD_COLUMN_SCHEMA("multi_scan_call_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("multi_scan_output_row_count", // 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 + ADD_COLUMN_SCHEMA("multi_scan_output_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("exist_row_effect_read_count", // 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 + ADD_COLUMN_SCHEMA("exist_row_effect_read_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("exist_row_empty_read_count", // 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 + ADD_COLUMN_SCHEMA("exist_row_empty_read_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("get_row_effect_read_count", // 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 + ADD_COLUMN_SCHEMA("get_row_effect_read_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("get_row_empty_read_count", // 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 + ADD_COLUMN_SCHEMA("get_row_empty_read_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scan_row_effect_read_count", // 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 + ADD_COLUMN_SCHEMA("scan_row_effect_read_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scan_row_empty_read_count", // 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 + ADD_COLUMN_SCHEMA("scan_row_empty_read_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey_prefix_access_info", // 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 - COLUMN_DEFAULT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("rowkey_prefix_access_info", //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 + COLUMN_DEFAULT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -1578,17 +1576,16 @@ int ObInnerTableSchema::all_virtual_partition_table_store_stat_schema(ObTableSch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_ddl_operation_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_ddl_operation_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1619,204 +1616,204 @@ int ObInnerTableSchema::all_virtual_ddl_operation_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // 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 + ADD_COLUMN_SCHEMA("user_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_name", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_name", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // 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 + ADD_COLUMN_SCHEMA("tablegroup_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_name", // 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 - OB_MAX_CORE_TALBE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_name", //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 + OB_MAX_CORE_TALBE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("operation_type", // 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 + ADD_COLUMN_SCHEMA("operation_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ddl_stmt_str", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ddl_stmt_str", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj exec_tenant_id_default; exec_tenant_id_default.set_int(1); - ADD_COLUMN_SCHEMA_T("exec_tenant_id", // 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 - exec_tenant_id_default, - exec_tenant_id_default); // default_value + ADD_COLUMN_SCHEMA_T("exec_tenant_id", //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 + exec_tenant_id_default, + exec_tenant_id_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1826,17 +1823,16 @@ int ObInnerTableSchema::all_virtual_ddl_operation_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_outline_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_outline_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1867,345 +1863,345 @@ int ObInnerTableSchema::all_virtual_outline_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("outline_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { ObObj name_default; name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name", // 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 - OB_MAX_OUTLINE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - name_default, - name_default); // default_value + ADD_COLUMN_SCHEMA_T("name", //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 + OB_MAX_OUTLINE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + name_default, + name_default); //default_value } if (OB_SUCC(ret)) { ObObj signature_default; signature_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("signature", // 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_OUTLINE_SIGNATURE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - signature_default, - signature_default); // default_value + ADD_COLUMN_SCHEMA_T("signature", //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_OUTLINE_SIGNATURE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + signature_default, + signature_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_content", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("outline_content", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_text", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_text", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj owner_default; owner_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("owner", // 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 - OB_MAX_USERNAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - owner_default, - owner_default); // default_value + ADD_COLUMN_SCHEMA_T("owner", //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 + OB_MAX_USERNAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + owner_default, + owner_default); //default_value } if (OB_SUCC(ret)) { ObObj used_default; used_default.set_int(0); - ADD_COLUMN_SCHEMA_T("used", // 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 - used_default, - used_default); // default_value + ADD_COLUMN_SCHEMA_T("used", //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 + used_default, + used_default); //default_value } if (OB_SUCC(ret)) { ObObj version_default; version_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("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 - OB_SERVER_VERSION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - version_default, - version_default); // default_value + ADD_COLUMN_SCHEMA_T("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 + OB_SERVER_VERSION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + version_default, + version_default); //default_value } if (OB_SUCC(ret)) { ObObj compatible_default; compatible_default.set_int(1); - ADD_COLUMN_SCHEMA_T("compatible", // 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 - compatible_default, - compatible_default); // default_value + ADD_COLUMN_SCHEMA_T("compatible", //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 + compatible_default, + compatible_default); //default_value } if (OB_SUCC(ret)) { ObObj enabled_default; enabled_default.set_int(1); - ADD_COLUMN_SCHEMA_T("enabled", // 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 - enabled_default, - enabled_default); // default_value + ADD_COLUMN_SCHEMA_T("enabled", //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 + enabled_default, + enabled_default); //default_value } if (OB_SUCC(ret)) { ObObj format_default; format_default.set_int(0); - ADD_COLUMN_SCHEMA_T("format", // 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 - format_default, - format_default); // default_value + ADD_COLUMN_SCHEMA_T("format", //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 + format_default, + format_default); //default_value } if (OB_SUCC(ret)) { ObObj outline_params_default; outline_params_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("outline_params", // 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_OUTLINE_PARAMS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - outline_params_default, - outline_params_default); // default_value + ADD_COLUMN_SCHEMA_T("outline_params", //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_OUTLINE_PARAMS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + outline_params_default, + outline_params_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_target", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("outline_target", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj sql_id_default; sql_id_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sql_id", // 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_SQL_ID_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - sql_id_default, - sql_id_default); // default_value + ADD_COLUMN_SCHEMA_T("sql_id", //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_SQL_ID_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + sql_id_default, + sql_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2215,17 +2211,16 @@ int ObInnerTableSchema::all_virtual_outline_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_outline_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_outline_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2256,360 +2251,360 @@ int ObInnerTableSchema::all_virtual_outline_history_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("outline_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj name_default; name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name", // 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 - OB_MAX_OUTLINE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - name_default, - name_default); // default_value + ADD_COLUMN_SCHEMA_T("name", //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 + OB_MAX_OUTLINE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + name_default, + name_default); //default_value } if (OB_SUCC(ret)) { ObObj signature_default; signature_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("signature", // 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_OUTLINE_SIGNATURE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - signature_default, - signature_default); // default_value + ADD_COLUMN_SCHEMA_T("signature", //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_OUTLINE_SIGNATURE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + signature_default, + signature_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_content", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("outline_content", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_text", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_text", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj owner_default; owner_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("owner", // 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 - OB_MAX_USERNAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - owner_default, - owner_default); // default_value + ADD_COLUMN_SCHEMA_T("owner", //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 + OB_MAX_USERNAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + owner_default, + owner_default); //default_value } if (OB_SUCC(ret)) { ObObj used_default; used_default.set_int(0); - ADD_COLUMN_SCHEMA_T("used", // 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 - true, // is_nullable - false, // is_autoincrement - used_default, - used_default); // default_value + ADD_COLUMN_SCHEMA_T("used", //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 + true, //is_nullable + false, //is_autoincrement + used_default, + used_default); //default_value } if (OB_SUCC(ret)) { ObObj version_default; version_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("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 - OB_SERVER_VERSION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - version_default, - version_default); // default_value + ADD_COLUMN_SCHEMA_T("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 + OB_SERVER_VERSION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + version_default, + version_default); //default_value } if (OB_SUCC(ret)) { ObObj compatible_default; compatible_default.set_int(1); - ADD_COLUMN_SCHEMA_T("compatible", // 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 - true, // is_nullable - false, // is_autoincrement - compatible_default, - compatible_default); // default_value + ADD_COLUMN_SCHEMA_T("compatible", //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 + true, //is_nullable + false, //is_autoincrement + compatible_default, + compatible_default); //default_value } if (OB_SUCC(ret)) { ObObj enabled_default; enabled_default.set_int(1); - ADD_COLUMN_SCHEMA_T("enabled", // 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 - true, // is_nullable - false, // is_autoincrement - enabled_default, - enabled_default); // default_value + ADD_COLUMN_SCHEMA_T("enabled", //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 + true, //is_nullable + false, //is_autoincrement + enabled_default, + enabled_default); //default_value } if (OB_SUCC(ret)) { ObObj format_default; format_default.set_int(0); - ADD_COLUMN_SCHEMA_T("format", // 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 - true, // is_nullable - false, // is_autoincrement - format_default, - format_default); // default_value + ADD_COLUMN_SCHEMA_T("format", //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 + true, //is_nullable + false, //is_autoincrement + format_default, + format_default); //default_value } if (OB_SUCC(ret)) { ObObj outline_params_default; outline_params_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("outline_params", // 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_OUTLINE_PARAMS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - outline_params_default, - outline_params_default); // default_value + ADD_COLUMN_SCHEMA_T("outline_params", //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_OUTLINE_PARAMS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + outline_params_default, + outline_params_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_target", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("outline_target", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj sql_id_default; sql_id_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sql_id", // 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_SQL_ID_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - sql_id_default, - sql_id_default); // default_value + ADD_COLUMN_SCHEMA_T("sql_id", //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_SQL_ID_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + sql_id_default, + sql_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2619,17 +2614,16 @@ int ObInnerTableSchema::all_virtual_outline_history_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_synonym_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_synonym_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2660,148 +2654,148 @@ int ObInnerTableSchema::all_virtual_synonym_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("synonym_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("synonym_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { ObObj synonym_name_default; synonym_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("synonym_name", // 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 - OB_MAX_SYNONYM_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - synonym_name_default, - synonym_name_default); // default_value + ADD_COLUMN_SCHEMA_T("synonym_name", //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 + OB_MAX_SYNONYM_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + synonym_name_default, + synonym_name_default); //default_value } if (OB_SUCC(ret)) { ObObj object_name_default; object_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("object_name", // 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 - OB_MAX_SYNONYM_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - object_name_default, - object_name_default); // default_value + ADD_COLUMN_SCHEMA_T("object_name", //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 + OB_MAX_SYNONYM_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + object_name_default, + object_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_database_id", // 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 + ADD_COLUMN_SCHEMA("object_database_id", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2811,17 +2805,16 @@ int ObInnerTableSchema::all_virtual_synonym_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_synonym_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_synonym_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2852,163 +2845,163 @@ int ObInnerTableSchema::all_virtual_synonym_history_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("synonym_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("synonym_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj synonym_name_default; synonym_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("synonym_name", // 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 - OB_MAX_SYNONYM_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - synonym_name_default, - synonym_name_default); // default_value + ADD_COLUMN_SCHEMA_T("synonym_name", //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 + OB_MAX_SYNONYM_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + synonym_name_default, + synonym_name_default); //default_value } if (OB_SUCC(ret)) { ObObj object_name_default; object_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("object_name", // 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 - OB_MAX_SYNONYM_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - object_name_default, - object_name_default); // default_value + ADD_COLUMN_SCHEMA_T("object_name", //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 + OB_MAX_SYNONYM_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + object_name_default, + object_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("object_database_id", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3018,17 +3011,16 @@ int ObInnerTableSchema::all_virtual_synonym_history_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_database_privilege_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_database_privilege_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3059,289 +3051,289 @@ int ObInnerTableSchema::all_virtual_database_privilege_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj priv_alter_default; priv_alter_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter", // 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 - priv_alter_default, - priv_alter_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter", //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 + priv_alter_default, + priv_alter_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_default; priv_create_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create", // 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 - priv_create_default, - priv_create_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create", //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 + priv_create_default, + priv_create_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_delete_default; priv_delete_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_delete", // 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 - priv_delete_default, - priv_delete_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_delete", //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 + priv_delete_default, + priv_delete_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_drop_default; priv_drop_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_drop", // 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 - priv_drop_default, - priv_drop_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_drop", //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 + priv_drop_default, + priv_drop_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_grant_option_default; priv_grant_option_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_grant_option", // 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 - priv_grant_option_default, - priv_grant_option_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_grant_option", //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 + priv_grant_option_default, + priv_grant_option_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_insert_default; priv_insert_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_insert", // 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 - priv_insert_default, - priv_insert_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_insert", //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 + priv_insert_default, + priv_insert_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_update_default; priv_update_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_update", // 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 - priv_update_default, - priv_update_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_update", //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 + priv_update_default, + priv_update_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_select_default; priv_select_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_select", // 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 - priv_select_default, - priv_select_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_select", //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 + priv_select_default, + priv_select_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_index_default; priv_index_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_index", // 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 - priv_index_default, - priv_index_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_index", //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 + priv_index_default, + priv_index_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_view_default; priv_create_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_view", // 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 - priv_create_view_default, - priv_create_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_view", //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 + priv_create_view_default, + priv_create_view_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_show_view_default; priv_show_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_show_view", // 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 - priv_show_view_default, - priv_show_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_show_view", //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 + priv_show_view_default, + priv_show_view_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3351,17 +3343,16 @@ int ObInnerTableSchema::all_virtual_database_privilege_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_database_privilege_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_database_privilege_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3392,319 +3383,319 @@ int ObInnerTableSchema::all_virtual_database_privilege_history_schema(ObTableSch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj priv_alter_default; priv_alter_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter", // 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 - true, // is_nullable - false, // is_autoincrement - priv_alter_default, - priv_alter_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter", //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 + true, //is_nullable + false, //is_autoincrement + priv_alter_default, + priv_alter_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_default; priv_create_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_default, - priv_create_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_default, + priv_create_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_delete_default; priv_delete_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_delete", // 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 - true, // is_nullable - false, // is_autoincrement - priv_delete_default, - priv_delete_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_delete", //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 + true, //is_nullable + false, //is_autoincrement + priv_delete_default, + priv_delete_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_drop_default; priv_drop_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_drop", // 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 - true, // is_nullable - false, // is_autoincrement - priv_drop_default, - priv_drop_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_drop", //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 + true, //is_nullable + false, //is_autoincrement + priv_drop_default, + priv_drop_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_grant_option_default; priv_grant_option_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_grant_option", // 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 - true, // is_nullable - false, // is_autoincrement - priv_grant_option_default, - priv_grant_option_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_grant_option", //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 + true, //is_nullable + false, //is_autoincrement + priv_grant_option_default, + priv_grant_option_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_insert_default; priv_insert_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_insert", // 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 - true, // is_nullable - false, // is_autoincrement - priv_insert_default, - priv_insert_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_insert", //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 + true, //is_nullable + false, //is_autoincrement + priv_insert_default, + priv_insert_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_update_default; priv_update_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_update", // 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 - true, // is_nullable - false, // is_autoincrement - priv_update_default, - priv_update_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_update", //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 + true, //is_nullable + false, //is_autoincrement + priv_update_default, + priv_update_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_select_default; priv_select_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_select", // 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 - true, // is_nullable - false, // is_autoincrement - priv_select_default, - priv_select_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_select", //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 + true, //is_nullable + false, //is_autoincrement + priv_select_default, + priv_select_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_index_default; priv_index_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_index", // 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 - true, // is_nullable - false, // is_autoincrement - priv_index_default, - priv_index_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_index", //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 + true, //is_nullable + false, //is_autoincrement + priv_index_default, + priv_index_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_view_default; priv_create_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_view", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_view_default, - priv_create_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_view", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_view_default, + priv_create_view_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_show_view_default; priv_show_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_show_view", // 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 - true, // is_nullable - false, // is_autoincrement - priv_show_view_default, - priv_show_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_show_view", //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 + true, //is_nullable + false, //is_autoincrement + priv_show_view_default, + priv_show_view_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3714,17 +3705,16 @@ int ObInnerTableSchema::all_virtual_database_privilege_history_schema(ObTableSch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_table_privilege_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_table_privilege_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3755,304 +3745,304 @@ int ObInnerTableSchema::all_virtual_table_privilege_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_name", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_CORE_TALBE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_name", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_CORE_TALBE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj priv_alter_default; priv_alter_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter", // 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 - priv_alter_default, - priv_alter_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter", //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 + priv_alter_default, + priv_alter_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_default; priv_create_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create", // 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 - priv_create_default, - priv_create_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create", //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 + priv_create_default, + priv_create_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_delete_default; priv_delete_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_delete", // 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 - priv_delete_default, - priv_delete_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_delete", //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 + priv_delete_default, + priv_delete_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_drop_default; priv_drop_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_drop", // 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 - priv_drop_default, - priv_drop_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_drop", //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 + priv_drop_default, + priv_drop_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_grant_option_default; priv_grant_option_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_grant_option", // 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 - priv_grant_option_default, - priv_grant_option_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_grant_option", //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 + priv_grant_option_default, + priv_grant_option_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_insert_default; priv_insert_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_insert", // 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 - priv_insert_default, - priv_insert_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_insert", //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 + priv_insert_default, + priv_insert_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_update_default; priv_update_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_update", // 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 - priv_update_default, - priv_update_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_update", //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 + priv_update_default, + priv_update_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_select_default; priv_select_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_select", // 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 - priv_select_default, - priv_select_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_select", //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 + priv_select_default, + priv_select_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_index_default; priv_index_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_index", // 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 - priv_index_default, - priv_index_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_index", //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 + priv_index_default, + priv_index_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_view_default; priv_create_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_view", // 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 - priv_create_view_default, - priv_create_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_view", //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 + priv_create_view_default, + priv_create_view_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_show_view_default; priv_show_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_show_view", // 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 - priv_show_view_default, - priv_show_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_show_view", //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 + priv_show_view_default, + priv_show_view_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4062,17 +4052,16 @@ int ObInnerTableSchema::all_virtual_table_privilege_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_table_privilege_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_table_privilege_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4103,334 +4092,334 @@ int ObInnerTableSchema::all_virtual_table_privilege_history_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_name", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_CORE_TALBE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_name", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_CORE_TALBE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj priv_alter_default; priv_alter_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter", // 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 - true, // is_nullable - false, // is_autoincrement - priv_alter_default, - priv_alter_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter", //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 + true, //is_nullable + false, //is_autoincrement + priv_alter_default, + priv_alter_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_default; priv_create_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_default, - priv_create_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_default, + priv_create_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_delete_default; priv_delete_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_delete", // 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 - true, // is_nullable - false, // is_autoincrement - priv_delete_default, - priv_delete_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_delete", //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 + true, //is_nullable + false, //is_autoincrement + priv_delete_default, + priv_delete_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_drop_default; priv_drop_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_drop", // 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 - true, // is_nullable - false, // is_autoincrement - priv_drop_default, - priv_drop_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_drop", //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 + true, //is_nullable + false, //is_autoincrement + priv_drop_default, + priv_drop_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_grant_option_default; priv_grant_option_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_grant_option", // 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 - true, // is_nullable - false, // is_autoincrement - priv_grant_option_default, - priv_grant_option_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_grant_option", //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 + true, //is_nullable + false, //is_autoincrement + priv_grant_option_default, + priv_grant_option_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_insert_default; priv_insert_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_insert", // 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 - true, // is_nullable - false, // is_autoincrement - priv_insert_default, - priv_insert_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_insert", //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 + true, //is_nullable + false, //is_autoincrement + priv_insert_default, + priv_insert_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_update_default; priv_update_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_update", // 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 - true, // is_nullable - false, // is_autoincrement - priv_update_default, - priv_update_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_update", //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 + true, //is_nullable + false, //is_autoincrement + priv_update_default, + priv_update_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_select_default; priv_select_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_select", // 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 - true, // is_nullable - false, // is_autoincrement - priv_select_default, - priv_select_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_select", //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 + true, //is_nullable + false, //is_autoincrement + priv_select_default, + priv_select_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_index_default; priv_index_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_index", // 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 - true, // is_nullable - false, // is_autoincrement - priv_index_default, - priv_index_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_index", //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 + true, //is_nullable + false, //is_autoincrement + priv_index_default, + priv_index_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_view_default; priv_create_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_view", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_view_default, - priv_create_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_view", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_view_default, + priv_create_view_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_show_view_default; priv_show_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_show_view", // 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 - true, // is_nullable - false, // is_autoincrement - priv_show_view_default, - priv_show_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_show_view", //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 + true, //is_nullable + false, //is_autoincrement + priv_show_view_default, + priv_show_view_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4440,17 +4429,16 @@ int ObInnerTableSchema::all_virtual_table_privilege_history_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_database_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_database_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4481,231 +4469,231 @@ int ObInnerTableSchema::all_virtual_database_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("database_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj database_name_default; database_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("database_name", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - database_name_default, - database_name_default); // default_value + ADD_COLUMN_SCHEMA_T("database_name", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + database_name_default, + database_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 + ADD_COLUMN_SCHEMA("replica_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_list", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone_list", //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 + MAX_ZONE_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 + ADD_COLUMN_SCHEMA("collation_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_DATABASE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_DATABASE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("read_only", // 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 + ADD_COLUMN_SCHEMA("read_only", //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 } if (OB_SUCC(ret)) { ObObj default_tablegroup_id_default; default_tablegroup_id_default.set_int(OB_INVALID_ID); - ADD_COLUMN_SCHEMA_T("default_tablegroup_id", // 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 - default_tablegroup_id_default, - default_tablegroup_id_default); // default_value + ADD_COLUMN_SCHEMA_T("default_tablegroup_id", //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 + default_tablegroup_id_default, + default_tablegroup_id_default); //default_value } if (OB_SUCC(ret)) { ObObj in_recyclebin_default; in_recyclebin_default.set_int(0); - ADD_COLUMN_SCHEMA_T("in_recyclebin", // 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 - in_recyclebin_default, - in_recyclebin_default); // default_value + ADD_COLUMN_SCHEMA_T("in_recyclebin", //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 + in_recyclebin_default, + in_recyclebin_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + drop_schema_version_default, + drop_schema_version_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4715,17 +4703,16 @@ int ObInnerTableSchema::all_virtual_database_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_database_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_database_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4756,261 +4743,261 @@ int ObInnerTableSchema::all_virtual_database_history_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("database_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj database_name_default; database_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("database_name", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - database_name_default, - database_name_default); // default_value + ADD_COLUMN_SCHEMA_T("database_name", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + database_name_default, + database_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_list", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone_list", //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 + MAX_ZONE_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_DATABASE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_DATABASE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("read_only", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("read_only", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj default_tablegroup_id_default; default_tablegroup_id_default.set_int(OB_INVALID_ID); - ADD_COLUMN_SCHEMA_T("default_tablegroup_id", // 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 - true, // is_nullable - false, // is_autoincrement - default_tablegroup_id_default, - default_tablegroup_id_default); // default_value + ADD_COLUMN_SCHEMA_T("default_tablegroup_id", //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 + true, //is_nullable + false, //is_autoincrement + default_tablegroup_id_default, + default_tablegroup_id_default); //default_value } if (OB_SUCC(ret)) { ObObj in_recyclebin_default; in_recyclebin_default.set_int(0); - ADD_COLUMN_SCHEMA_T("in_recyclebin", // 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 - true, // is_nullable - false, // is_autoincrement - in_recyclebin_default, - in_recyclebin_default); // default_value + ADD_COLUMN_SCHEMA_T("in_recyclebin", //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 + true, //is_nullable + false, //is_autoincrement + in_recyclebin_default, + in_recyclebin_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + drop_schema_version_default, + drop_schema_version_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5020,17 +5007,16 @@ int ObInnerTableSchema::all_virtual_database_history_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tablegroup_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tablegroup_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5061,410 +5047,410 @@ int ObInnerTableSchema::all_virtual_tablegroup_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("tablegroup_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_name", // 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 - OB_MAX_TABLEGROUP_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tablegroup_name", //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 + OB_MAX_TABLEGROUP_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TABLEGROUP_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TABLEGROUP_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj locality_default; locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - locality_default, - locality_default); // default_value + ADD_COLUMN_SCHEMA_T("locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + locality_default, + locality_default); //default_value } if (OB_SUCC(ret)) { ObObj part_level_default; part_level_default.set_int(0); - ADD_COLUMN_SCHEMA_T("part_level", // 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 - part_level_default, - part_level_default); // default_value + ADD_COLUMN_SCHEMA_T("part_level", //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 + part_level_default, + part_level_default); //default_value } if (OB_SUCC(ret)) { ObObj part_func_type_default; part_func_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("part_func_type", // 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 - part_func_type_default, - part_func_type_default); // default_value + ADD_COLUMN_SCHEMA_T("part_func_type", //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 + part_func_type_default, + part_func_type_default); //default_value } if (OB_SUCC(ret)) { ObObj part_func_expr_num_default; part_func_expr_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("part_func_expr_num", // 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 - part_func_expr_num_default, - part_func_expr_num_default); // default_value + ADD_COLUMN_SCHEMA_T("part_func_expr_num", //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 + part_func_expr_num_default, + part_func_expr_num_default); //default_value } if (OB_SUCC(ret)) { ObObj part_num_default; part_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("part_num", // 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 - part_num_default, - part_num_default); // default_value + ADD_COLUMN_SCHEMA_T("part_num", //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 + part_num_default, + part_num_default); //default_value } if (OB_SUCC(ret)) { ObObj sub_part_func_type_default; sub_part_func_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sub_part_func_type", // 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 - sub_part_func_type_default, - sub_part_func_type_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_func_type", //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 + sub_part_func_type_default, + sub_part_func_type_default); //default_value } if (OB_SUCC(ret)) { ObObj sub_part_func_expr_num_default; sub_part_func_expr_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sub_part_func_expr_num", // 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 - sub_part_func_expr_num_default, - sub_part_func_expr_num_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_func_expr_num", //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 + sub_part_func_expr_num_default, + sub_part_func_expr_num_default); //default_value } if (OB_SUCC(ret)) { ObObj sub_part_num_default; sub_part_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sub_part_num", // 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 - sub_part_num_default, - sub_part_num_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_num", //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 + sub_part_num_default, + sub_part_num_default); //default_value } if (OB_SUCC(ret)) { ObObj max_used_part_id_default; max_used_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("max_used_part_id", // 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_used_part_id_default, - max_used_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("max_used_part_id", //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_used_part_id_default, + max_used_part_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { ObObj partition_status_default; partition_status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_status", // 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 - true, // is_nullable - false, // is_autoincrement - partition_status_default, - partition_status_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_status", //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 + true, //is_nullable + false, //is_autoincrement + partition_status_default, + partition_status_default); //default_value } if (OB_SUCC(ret)) { ObObj previous_locality_default; previous_locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("previous_locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - previous_locality_default, - previous_locality_default); // default_value + ADD_COLUMN_SCHEMA_T("previous_locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + previous_locality_default, + previous_locality_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_schema_version_default; partition_schema_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - partition_schema_version_default, - partition_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + partition_schema_version_default, + partition_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj binding_default; binding_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("binding", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - binding_default, - binding_default); // default_value + ADD_COLUMN_SCHEMA_T("binding", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + binding_default, + binding_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj is_sub_part_template_default; is_sub_part_template_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("is_sub_part_template", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_sub_part_template_default, - is_sub_part_template_default); // default_value + ADD_COLUMN_SCHEMA_T("is_sub_part_template", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_sub_part_template_default, + is_sub_part_template_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5474,17 +5460,16 @@ int ObInnerTableSchema::all_virtual_tablegroup_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tablegroup_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tablegroup_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5515,425 +5500,425 @@ int ObInnerTableSchema::all_virtual_tablegroup_history_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("tablegroup_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_name", // 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 - OB_MAX_TABLEGROUP_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tablegroup_name", //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 + OB_MAX_TABLEGROUP_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TABLEGROUP_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TABLEGROUP_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj locality_default; locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - locality_default, - locality_default); // default_value + ADD_COLUMN_SCHEMA_T("locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + locality_default, + locality_default); //default_value } if (OB_SUCC(ret)) { ObObj part_level_default; part_level_default.set_int(0); - ADD_COLUMN_SCHEMA_T("part_level", // 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 - true, // is_nullable - false, // is_autoincrement - part_level_default, - part_level_default); // default_value + ADD_COLUMN_SCHEMA_T("part_level", //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 + true, //is_nullable + false, //is_autoincrement + part_level_default, + part_level_default); //default_value } if (OB_SUCC(ret)) { ObObj part_func_type_default; part_func_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("part_func_type", // 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 - true, // is_nullable - false, // is_autoincrement - part_func_type_default, - part_func_type_default); // default_value + ADD_COLUMN_SCHEMA_T("part_func_type", //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 + true, //is_nullable + false, //is_autoincrement + part_func_type_default, + part_func_type_default); //default_value } if (OB_SUCC(ret)) { ObObj part_func_expr_num_default; part_func_expr_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("part_func_expr_num", // 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 - true, // is_nullable - false, // is_autoincrement - part_func_expr_num_default, - part_func_expr_num_default); // default_value + ADD_COLUMN_SCHEMA_T("part_func_expr_num", //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 + true, //is_nullable + false, //is_autoincrement + part_func_expr_num_default, + part_func_expr_num_default); //default_value } if (OB_SUCC(ret)) { ObObj part_num_default; part_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("part_num", // 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 - true, // is_nullable - false, // is_autoincrement - part_num_default, - part_num_default); // default_value + ADD_COLUMN_SCHEMA_T("part_num", //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 + true, //is_nullable + false, //is_autoincrement + part_num_default, + part_num_default); //default_value } if (OB_SUCC(ret)) { ObObj sub_part_func_type_default; sub_part_func_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sub_part_func_type", // 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 - true, // is_nullable - false, // is_autoincrement - sub_part_func_type_default, - sub_part_func_type_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_func_type", //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 + true, //is_nullable + false, //is_autoincrement + sub_part_func_type_default, + sub_part_func_type_default); //default_value } if (OB_SUCC(ret)) { ObObj sub_part_func_expr_num_default; sub_part_func_expr_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sub_part_func_expr_num", // 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 - true, // is_nullable - false, // is_autoincrement - sub_part_func_expr_num_default, - sub_part_func_expr_num_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_func_expr_num", //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 + true, //is_nullable + false, //is_autoincrement + sub_part_func_expr_num_default, + sub_part_func_expr_num_default); //default_value } if (OB_SUCC(ret)) { ObObj sub_part_num_default; sub_part_num_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sub_part_num", // 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 - true, // is_nullable - false, // is_autoincrement - sub_part_num_default, - sub_part_num_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_num", //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 + true, //is_nullable + false, //is_autoincrement + sub_part_num_default, + sub_part_num_default); //default_value } if (OB_SUCC(ret)) { ObObj max_used_part_id_default; max_used_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("max_used_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - max_used_part_id_default, - max_used_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("max_used_part_id", //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 + true, //is_nullable + false, //is_autoincrement + max_used_part_id_default, + max_used_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_status_default; partition_status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_status", // 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 - true, // is_nullable - false, // is_autoincrement - partition_status_default, - partition_status_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_status", //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 + true, //is_nullable + false, //is_autoincrement + partition_status_default, + partition_status_default); //default_value } if (OB_SUCC(ret)) { ObObj previous_locality_default; previous_locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("previous_locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - previous_locality_default, - previous_locality_default); // default_value + ADD_COLUMN_SCHEMA_T("previous_locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + previous_locality_default, + previous_locality_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_schema_version_default; partition_schema_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - partition_schema_version_default, - partition_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + partition_schema_version_default, + partition_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj binding_default; binding_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("binding", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - binding_default, - binding_default); // default_value + ADD_COLUMN_SCHEMA_T("binding", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + binding_default, + binding_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj is_sub_part_template_default; is_sub_part_template_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("is_sub_part_template", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - is_sub_part_template_default, - is_sub_part_template_default); // default_value + ADD_COLUMN_SCHEMA_T("is_sub_part_template", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + is_sub_part_template_default, + is_sub_part_template_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5943,17 +5928,16 @@ int ObInnerTableSchema::all_virtual_tablegroup_history_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5984,1228 +5968,1228 @@ int ObInnerTableSchema::all_virtual_table_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj table_name_default; table_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("table_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_name_default, - table_name_default); // default_value + ADD_COLUMN_SCHEMA_T("table_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_name_default, + table_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_type", // 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 + ADD_COLUMN_SCHEMA("table_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("load_type", // 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 + ADD_COLUMN_SCHEMA("load_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_type", // 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 + ADD_COLUMN_SCHEMA("def_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey_column_num", // 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 + ADD_COLUMN_SCHEMA("rowkey_column_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_column_num", // 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 + ADD_COLUMN_SCHEMA("index_column_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_used_column_id", // 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 + ADD_COLUMN_SCHEMA("max_used_column_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 + ADD_COLUMN_SCHEMA("replica_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("autoinc_column_id", // 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 + ADD_COLUMN_SCHEMA("autoinc_column_id", //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 } if (OB_SUCC(ret)) { ObObj auto_increment_default; auto_increment_default.set_uint64(1); - ADD_COLUMN_SCHEMA_T("auto_increment", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - auto_increment_default, - auto_increment_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_increment", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + auto_increment_default, + auto_increment_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("read_only", // 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 + ADD_COLUMN_SCHEMA("read_only", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey_split_pos", // 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 + ADD_COLUMN_SCHEMA("rowkey_split_pos", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("expire_condition", // 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 - OB_MAX_EXPIRE_INFO_STRING_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("expire_condition", //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 + OB_MAX_EXPIRE_INFO_STRING_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_use_bloomfilter", // 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 + ADD_COLUMN_SCHEMA("is_use_bloomfilter", //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 } if (OB_SUCC(ret)) { ObObj comment_default; comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - comment_default, - comment_default); // default_value + ADD_COLUMN_SCHEMA_T("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + comment_default, + comment_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 + ADD_COLUMN_SCHEMA("block_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 + ADD_COLUMN_SCHEMA("collation_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_table_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_table_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_status", // 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 + ADD_COLUMN_SCHEMA("index_status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // 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 + ADD_COLUMN_SCHEMA("tablegroup_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("progressive_merge_num", // 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 + ADD_COLUMN_SCHEMA("progressive_merge_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_type", // 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 + ADD_COLUMN_SCHEMA("index_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_level", // 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 + ADD_COLUMN_SCHEMA("part_level", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_func_type", // 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 + ADD_COLUMN_SCHEMA("part_func_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_func_expr", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_func_expr", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_num", // 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 + ADD_COLUMN_SCHEMA("part_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_func_type", // 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 + ADD_COLUMN_SCHEMA("sub_part_func_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_func_expr", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_func_expr", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_num", // 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 + ADD_COLUMN_SCHEMA("sub_part_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_mem_version", // 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 + ADD_COLUMN_SCHEMA("create_mem_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_definition", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("view_definition", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_check_option", // 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 + ADD_COLUMN_SCHEMA("view_check_option", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_is_updatable", // 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 + ADD_COLUMN_SCHEMA("view_is_updatable", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_list", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone_list", //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 + MAX_ZONE_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj index_using_type_default; index_using_type_default.set_int(USING_BTREE); - ADD_COLUMN_SCHEMA_T("index_using_type", // 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 - index_using_type_default, - index_using_type_default); // default_value + ADD_COLUMN_SCHEMA_T("index_using_type", //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 + index_using_type_default, + index_using_type_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parser_name", // 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 - OB_MAX_PARSER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parser_name", //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 + OB_MAX_PARSER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj index_attributes_set_default; index_attributes_set_default.set_int(0); - ADD_COLUMN_SCHEMA_T("index_attributes_set", // 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 - true, // is_nullable - false, // is_autoincrement - index_attributes_set_default, - index_attributes_set_default); // default_value + ADD_COLUMN_SCHEMA_T("index_attributes_set", //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 + true, //is_nullable + false, //is_autoincrement + index_attributes_set_default, + index_attributes_set_default); //default_value } if (OB_SUCC(ret)) { ObObj locality_default; locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - locality_default, - locality_default); // default_value + ADD_COLUMN_SCHEMA_T("locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + locality_default, + locality_default); //default_value } if (OB_SUCC(ret)) { ObObj tablet_size_default; tablet_size_default.set_int(OB_DEFAULT_TABLET_SIZE); - ADD_COLUMN_SCHEMA_T("tablet_size", // 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 - tablet_size_default, - tablet_size_default); // default_value + ADD_COLUMN_SCHEMA_T("tablet_size", //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 + tablet_size_default, + tablet_size_default); //default_value } if (OB_SUCC(ret)) { ObObj pctfree_default; pctfree_default.set_int(OB_DEFAULT_PCTFREE); - ADD_COLUMN_SCHEMA_T("pctfree", // 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 - pctfree_default, - pctfree_default); // default_value + ADD_COLUMN_SCHEMA_T("pctfree", //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 + pctfree_default, + pctfree_default); //default_value } if (OB_SUCC(ret)) { ObObj previous_locality_default; previous_locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("previous_locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - previous_locality_default, - previous_locality_default); // default_value + ADD_COLUMN_SCHEMA_T("previous_locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + previous_locality_default, + previous_locality_default); //default_value } if (OB_SUCC(ret)) { ObObj max_used_part_id_default; max_used_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("max_used_part_id", // 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_used_part_id_default, - max_used_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("max_used_part_id", //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_used_part_id_default, + max_used_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_cnt_within_partition_table_default; partition_cnt_within_partition_table_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("partition_cnt_within_partition_table", // 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 - partition_cnt_within_partition_table_default, - partition_cnt_within_partition_table_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_cnt_within_partition_table", //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 + partition_cnt_within_partition_table_default, + partition_cnt_within_partition_table_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_status_default; partition_status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_status", // 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 - true, // is_nullable - false, // is_autoincrement - partition_status_default, - partition_status_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_status", //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 + true, //is_nullable + false, //is_autoincrement + partition_status_default, + partition_status_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_schema_version_default; partition_schema_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - partition_schema_version_default, - partition_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + partition_schema_version_default, + partition_schema_version_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_used_constraint_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_used_constraint_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj session_id_default; session_id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("session_id", // 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 - true, // is_nullable - false, // is_autoincrement - session_id_default, - session_id_default); // default_value + ADD_COLUMN_SCHEMA_T("session_id", //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 + true, //is_nullable + false, //is_autoincrement + session_id_default, + session_id_default); //default_value } if (OB_SUCC(ret)) { ObObj pk_comment_default; pk_comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("pk_comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - pk_comment_default, - pk_comment_default); // default_value + ADD_COLUMN_SCHEMA_T("pk_comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + pk_comment_default, + pk_comment_default); //default_value } if (OB_SUCC(ret)) { ObObj sess_active_time_default; sess_active_time_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sess_active_time", // 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 - true, // is_nullable - false, // is_autoincrement - sess_active_time_default, - sess_active_time_default); // default_value + ADD_COLUMN_SCHEMA_T("sess_active_time", //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 + true, //is_nullable + false, //is_autoincrement + sess_active_time_default, + sess_active_time_default); //default_value } if (OB_SUCC(ret)) { ObObj row_store_type_default; row_store_type_default.set_varchar(ObString::make_string("FLAT_ROW_STORE")); - ADD_COLUMN_SCHEMA_T("row_store_type", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - row_store_type_default, - row_store_type_default); // default_value + ADD_COLUMN_SCHEMA_T("row_store_type", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + row_store_type_default, + row_store_type_default); //default_value } if (OB_SUCC(ret)) { ObObj store_format_default; store_format_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("store_format", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - store_format_default, - store_format_default); // default_value + ADD_COLUMN_SCHEMA_T("store_format", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + store_format_default, + store_format_default); //default_value } if (OB_SUCC(ret)) { ObObj duplicate_scope_default; duplicate_scope_default.set_int(0); - ADD_COLUMN_SCHEMA_T("duplicate_scope", // 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 - true, // is_nullable - false, // is_autoincrement - duplicate_scope_default, - duplicate_scope_default); // default_value + ADD_COLUMN_SCHEMA_T("duplicate_scope", //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 + true, //is_nullable + false, //is_autoincrement + duplicate_scope_default, + duplicate_scope_default); //default_value } if (OB_SUCC(ret)) { ObObj binding_default; binding_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("binding", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - binding_default, - binding_default); // default_value + ADD_COLUMN_SCHEMA_T("binding", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + binding_default, + binding_default); //default_value } if (OB_SUCC(ret)) { ObObj progressive_merge_round_default; progressive_merge_round_default.set_int(0); - ADD_COLUMN_SCHEMA_T("progressive_merge_round", // 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 - true, // is_nullable - false, // is_autoincrement - progressive_merge_round_default, - progressive_merge_round_default); // default_value + ADD_COLUMN_SCHEMA_T("progressive_merge_round", //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 + true, //is_nullable + false, //is_autoincrement + progressive_merge_round_default, + progressive_merge_round_default); //default_value } if (OB_SUCC(ret)) { ObObj storage_format_version_default; storage_format_version_default.set_int(2); - ADD_COLUMN_SCHEMA_T("storage_format_version", // 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 - true, // is_nullable - false, // is_autoincrement - storage_format_version_default, - storage_format_version_default); // default_value + ADD_COLUMN_SCHEMA_T("storage_format_version", //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 + true, //is_nullable + false, //is_autoincrement + storage_format_version_default, + storage_format_version_default); //default_value } if (OB_SUCC(ret)) { ObObj table_mode_default; table_mode_default.set_int(0); - ADD_COLUMN_SCHEMA_T("table_mode", // 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 - table_mode_default, - table_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("table_mode", //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 + table_mode_default, + table_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj encryption_default; encryption_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("encryption", // 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 - OB_MAX_ENCRYPTION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - encryption_default, - encryption_default); // default_value + ADD_COLUMN_SCHEMA_T("encryption", //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 + OB_MAX_ENCRYPTION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + encryption_default, + encryption_default); //default_value } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj is_sub_part_template_default; is_sub_part_template_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("is_sub_part_template", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_sub_part_template_default, - is_sub_part_template_default); // default_value + ADD_COLUMN_SCHEMA_T("is_sub_part_template", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_sub_part_template_default, + is_sub_part_template_default); //default_value } if (OB_SUCC(ret)) { ObObj dop_default; dop_default.set_int(1); - ADD_COLUMN_SCHEMA_T("dop", // 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 - dop_default, - dop_default); // default_value + ADD_COLUMN_SCHEMA_T("dop", //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 + dop_default, + dop_default); //default_value } if (OB_SUCC(ret)) { ObObj character_set_client_default; character_set_client_default.set_int(0); - ADD_COLUMN_SCHEMA_T("character_set_client", // 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 - character_set_client_default, - character_set_client_default); // default_value + ADD_COLUMN_SCHEMA_T("character_set_client", //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 + character_set_client_default, + character_set_client_default); //default_value } if (OB_SUCC(ret)) { ObObj collation_connection_default; collation_connection_default.set_int(0); - ADD_COLUMN_SCHEMA_T("collation_connection", // 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 - collation_connection_default, - collation_connection_default); // default_value + ADD_COLUMN_SCHEMA_T("collation_connection", //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 + collation_connection_default, + collation_connection_default); //default_value } if (OB_SUCC(ret)) { ObObj auto_part_size_default; auto_part_size_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("auto_part_size", // 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 - auto_part_size_default, - auto_part_size_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_part_size", //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 + auto_part_size_default, + auto_part_size_default); //default_value } if (OB_SUCC(ret)) { ObObj auto_part_default; auto_part_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("auto_part", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - auto_part_default, - auto_part_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_part", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + auto_part_default, + auto_part_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -7215,17 +7199,16 @@ int ObInnerTableSchema::all_virtual_table_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_table_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_table_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7256,1243 +7239,1243 @@ int ObInnerTableSchema::all_virtual_table_history_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj table_name_default; table_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("table_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - table_name_default, - table_name_default); // default_value + ADD_COLUMN_SCHEMA_T("table_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + table_name_default, + table_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("load_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("load_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey_column_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("rowkey_column_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_column_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("index_column_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_used_column_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_used_column_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("autoinc_column_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("autoinc_column_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj auto_increment_default; auto_increment_default.set_uint64(1); - ADD_COLUMN_SCHEMA_T("auto_increment", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - auto_increment_default, - auto_increment_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_increment", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + auto_increment_default, + auto_increment_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("read_only", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("read_only", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey_split_pos", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("rowkey_split_pos", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("expire_condition", // 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 - OB_MAX_EXPIRE_INFO_STRING_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("expire_condition", //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 + OB_MAX_EXPIRE_INFO_STRING_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_use_bloomfilter", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_use_bloomfilter", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj comment_default; comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - comment_default, - comment_default); // default_value + ADD_COLUMN_SCHEMA_T("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + comment_default, + comment_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_table_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_table_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_status", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("index_status", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tablegroup_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("progressive_merge_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("progressive_merge_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("index_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_level", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_level", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_func_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_func_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_func_expr", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_func_expr", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_func_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_func_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_func_expr", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_func_expr", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_mem_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_mem_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_definition", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("view_definition", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_check_option", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("view_check_option", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_is_updatable", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("view_is_updatable", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_list", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone_list", //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 + MAX_ZONE_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj index_using_type_default; index_using_type_default.set_int(USING_BTREE); - ADD_COLUMN_SCHEMA_T("index_using_type", // 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 - true, // is_nullable - false, // is_autoincrement - index_using_type_default, - index_using_type_default); // default_value + ADD_COLUMN_SCHEMA_T("index_using_type", //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 + true, //is_nullable + false, //is_autoincrement + index_using_type_default, + index_using_type_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parser_name", // 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 - OB_MAX_PARSER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parser_name", //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 + OB_MAX_PARSER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj index_attributes_set_default; index_attributes_set_default.set_int(0); - ADD_COLUMN_SCHEMA_T("index_attributes_set", // 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 - true, // is_nullable - false, // is_autoincrement - index_attributes_set_default, - index_attributes_set_default); // default_value + ADD_COLUMN_SCHEMA_T("index_attributes_set", //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 + true, //is_nullable + false, //is_autoincrement + index_attributes_set_default, + index_attributes_set_default); //default_value } if (OB_SUCC(ret)) { ObObj locality_default; locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - locality_default, - locality_default); // default_value + ADD_COLUMN_SCHEMA_T("locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + locality_default, + locality_default); //default_value } if (OB_SUCC(ret)) { ObObj tablet_size_default; tablet_size_default.set_int(OB_DEFAULT_TABLET_SIZE); - ADD_COLUMN_SCHEMA_T("tablet_size", // 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 - true, // is_nullable - false, // is_autoincrement - tablet_size_default, - tablet_size_default); // default_value + ADD_COLUMN_SCHEMA_T("tablet_size", //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 + true, //is_nullable + false, //is_autoincrement + tablet_size_default, + tablet_size_default); //default_value } if (OB_SUCC(ret)) { ObObj pctfree_default; pctfree_default.set_int(OB_DEFAULT_PCTFREE); - ADD_COLUMN_SCHEMA_T("pctfree", // 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 - true, // is_nullable - false, // is_autoincrement - pctfree_default, - pctfree_default); // default_value + ADD_COLUMN_SCHEMA_T("pctfree", //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 + true, //is_nullable + false, //is_autoincrement + pctfree_default, + pctfree_default); //default_value } if (OB_SUCC(ret)) { ObObj previous_locality_default; previous_locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("previous_locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - previous_locality_default, - previous_locality_default); // default_value + ADD_COLUMN_SCHEMA_T("previous_locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + previous_locality_default, + previous_locality_default); //default_value } if (OB_SUCC(ret)) { ObObj max_used_part_id_default; max_used_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("max_used_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - max_used_part_id_default, - max_used_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("max_used_part_id", //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 + true, //is_nullable + false, //is_autoincrement + max_used_part_id_default, + max_used_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_cnt_within_partition_table_default; partition_cnt_within_partition_table_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("partition_cnt_within_partition_table", // 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 - true, // is_nullable - false, // is_autoincrement - partition_cnt_within_partition_table_default, - partition_cnt_within_partition_table_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_cnt_within_partition_table", //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 + true, //is_nullable + false, //is_autoincrement + partition_cnt_within_partition_table_default, + partition_cnt_within_partition_table_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_status_default; partition_status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_status", // 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 - true, // is_nullable - false, // is_autoincrement - partition_status_default, - partition_status_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_status", //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 + true, //is_nullable + false, //is_autoincrement + partition_status_default, + partition_status_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_schema_version_default; partition_schema_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - partition_schema_version_default, - partition_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + partition_schema_version_default, + partition_schema_version_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_used_constraint_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_used_constraint_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj session_id_default; session_id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("session_id", // 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 - true, // is_nullable - false, // is_autoincrement - session_id_default, - session_id_default); // default_value + ADD_COLUMN_SCHEMA_T("session_id", //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 + true, //is_nullable + false, //is_autoincrement + session_id_default, + session_id_default); //default_value } if (OB_SUCC(ret)) { ObObj pk_comment_default; pk_comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("pk_comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - pk_comment_default, - pk_comment_default); // default_value + ADD_COLUMN_SCHEMA_T("pk_comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + pk_comment_default, + pk_comment_default); //default_value } if (OB_SUCC(ret)) { ObObj sess_active_time_default; sess_active_time_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sess_active_time", // 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 - true, // is_nullable - false, // is_autoincrement - sess_active_time_default, - sess_active_time_default); // default_value + ADD_COLUMN_SCHEMA_T("sess_active_time", //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 + true, //is_nullable + false, //is_autoincrement + sess_active_time_default, + sess_active_time_default); //default_value } if (OB_SUCC(ret)) { ObObj row_store_type_default; row_store_type_default.set_varchar(ObString::make_string("FLAT_ROW_STORE")); - ADD_COLUMN_SCHEMA_T("row_store_type", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - row_store_type_default, - row_store_type_default); // default_value + ADD_COLUMN_SCHEMA_T("row_store_type", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + row_store_type_default, + row_store_type_default); //default_value } if (OB_SUCC(ret)) { ObObj store_format_default; store_format_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("store_format", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - store_format_default, - store_format_default); // default_value + ADD_COLUMN_SCHEMA_T("store_format", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + store_format_default, + store_format_default); //default_value } if (OB_SUCC(ret)) { ObObj duplicate_scope_default; duplicate_scope_default.set_int(0); - ADD_COLUMN_SCHEMA_T("duplicate_scope", // 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 - true, // is_nullable - false, // is_autoincrement - duplicate_scope_default, - duplicate_scope_default); // default_value + ADD_COLUMN_SCHEMA_T("duplicate_scope", //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 + true, //is_nullable + false, //is_autoincrement + duplicate_scope_default, + duplicate_scope_default); //default_value } if (OB_SUCC(ret)) { ObObj binding_default; binding_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("binding", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - binding_default, - binding_default); // default_value + ADD_COLUMN_SCHEMA_T("binding", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + binding_default, + binding_default); //default_value } if (OB_SUCC(ret)) { ObObj progressive_merge_round_default; progressive_merge_round_default.set_int(0); - ADD_COLUMN_SCHEMA_T("progressive_merge_round", // 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 - true, // is_nullable - false, // is_autoincrement - progressive_merge_round_default, - progressive_merge_round_default); // default_value + ADD_COLUMN_SCHEMA_T("progressive_merge_round", //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 + true, //is_nullable + false, //is_autoincrement + progressive_merge_round_default, + progressive_merge_round_default); //default_value } if (OB_SUCC(ret)) { ObObj storage_format_version_default; storage_format_version_default.set_int(2); - ADD_COLUMN_SCHEMA_T("storage_format_version", // 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 - true, // is_nullable - false, // is_autoincrement - storage_format_version_default, - storage_format_version_default); // default_value + ADD_COLUMN_SCHEMA_T("storage_format_version", //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 + true, //is_nullable + false, //is_autoincrement + storage_format_version_default, + storage_format_version_default); //default_value } if (OB_SUCC(ret)) { ObObj table_mode_default; table_mode_default.set_int(0); - ADD_COLUMN_SCHEMA_T("table_mode", // 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 - true, // is_nullable - false, // is_autoincrement - table_mode_default, - table_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("table_mode", //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 + true, //is_nullable + false, //is_autoincrement + table_mode_default, + table_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj encryption_default; encryption_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("encryption", // 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 - OB_MAX_ENCRYPTION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - encryption_default, - encryption_default); // default_value + ADD_COLUMN_SCHEMA_T("encryption", //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 + OB_MAX_ENCRYPTION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + encryption_default, + encryption_default); //default_value } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - true, // is_nullable - false, // is_autoincrement - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + true, //is_nullable + false, //is_autoincrement + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj is_sub_part_template_default; is_sub_part_template_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("is_sub_part_template", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - is_sub_part_template_default, - is_sub_part_template_default); // default_value + ADD_COLUMN_SCHEMA_T("is_sub_part_template", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + is_sub_part_template_default, + is_sub_part_template_default); //default_value } if (OB_SUCC(ret)) { ObObj dop_default; dop_default.set_int(1); - ADD_COLUMN_SCHEMA_T("dop", // 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 - true, // is_nullable - false, // is_autoincrement - dop_default, - dop_default); // default_value + ADD_COLUMN_SCHEMA_T("dop", //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 + true, //is_nullable + false, //is_autoincrement + dop_default, + dop_default); //default_value } if (OB_SUCC(ret)) { ObObj character_set_client_default; character_set_client_default.set_int(0); - ADD_COLUMN_SCHEMA_T("character_set_client", // 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 - true, // is_nullable - false, // is_autoincrement - character_set_client_default, - character_set_client_default); // default_value + ADD_COLUMN_SCHEMA_T("character_set_client", //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 + true, //is_nullable + false, //is_autoincrement + character_set_client_default, + character_set_client_default); //default_value } if (OB_SUCC(ret)) { ObObj collation_connection_default; collation_connection_default.set_int(0); - ADD_COLUMN_SCHEMA_T("collation_connection", // 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 - true, // is_nullable - false, // is_autoincrement - collation_connection_default, - collation_connection_default); // default_value + ADD_COLUMN_SCHEMA_T("collation_connection", //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 + true, //is_nullable + false, //is_autoincrement + collation_connection_default, + collation_connection_default); //default_value } if (OB_SUCC(ret)) { ObObj auto_part_size_default; auto_part_size_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("auto_part_size", // 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 - true, // is_nullable - false, // is_autoincrement - auto_part_size_default, - auto_part_size_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_part_size", //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 + true, //is_nullable + false, //is_autoincrement + auto_part_size_default, + auto_part_size_default); //default_value } if (OB_SUCC(ret)) { ObObj auto_part_default; auto_part_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("auto_part", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - auto_part_default, - auto_part_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_part", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + auto_part_default, + auto_part_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8502,17 +8485,16 @@ int ObInnerTableSchema::all_virtual_table_history_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_column_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_column_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8543,460 +8525,460 @@ int ObInnerTableSchema::all_virtual_column_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj column_name_default; column_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("column_name", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - column_name_default, - column_name_default); // default_value + ADD_COLUMN_SCHEMA_T("column_name", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + column_name_default, + column_name_default); //default_value } if (OB_SUCC(ret)) { ObObj rowkey_position_default; rowkey_position_default.set_int(0); - ADD_COLUMN_SCHEMA_T("rowkey_position", // 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 - rowkey_position_default, - rowkey_position_default); // default_value + ADD_COLUMN_SCHEMA_T("rowkey_position", //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 + rowkey_position_default, + rowkey_position_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_position", // 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 + ADD_COLUMN_SCHEMA("index_position", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("order_in_rowkey", // 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 + ADD_COLUMN_SCHEMA("order_in_rowkey", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_key_position", // 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 + ADD_COLUMN_SCHEMA("partition_key_position", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 + ADD_COLUMN_SCHEMA("data_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_length", // 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 + ADD_COLUMN_SCHEMA("data_length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_precision", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_precision", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_scale", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_scale", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zero_fill", // 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 + ADD_COLUMN_SCHEMA("zero_fill", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("nullable", // 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 + ADD_COLUMN_SCHEMA("nullable", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("on_update_current_timestamp", // 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 + ADD_COLUMN_SCHEMA("on_update_current_timestamp", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("autoincrement", // 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 + ADD_COLUMN_SCHEMA("autoincrement", //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 } if (OB_SUCC(ret)) { ObObj is_hidden_default; is_hidden_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_hidden", // 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 - is_hidden_default, - is_hidden_default); // default_value + ADD_COLUMN_SCHEMA_T("is_hidden", //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 + is_hidden_default, + is_hidden_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 + ADD_COLUMN_SCHEMA("collation_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("orig_default_value", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("orig_default_value", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_default_value", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cur_default_value", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { ObObj column_flags_default; column_flags_default.set_int(0); - ADD_COLUMN_SCHEMA_T("column_flags", // 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 - column_flags_default, - column_flags_default); // default_value + ADD_COLUMN_SCHEMA_T("column_flags", //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 + column_flags_default, + column_flags_default); //default_value } if (OB_SUCC(ret)) { ObObj prev_column_id_default; prev_column_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("prev_column_id", // 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 - prev_column_id_default, - prev_column_id_default); // default_value + ADD_COLUMN_SCHEMA_T("prev_column_id", //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 + prev_column_id_default, + prev_column_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("extended_type_info", // 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_VARBINARY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("extended_type_info", //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_VARBINARY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("orig_default_value_v2", // 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_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("orig_default_value_v2", //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_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_default_value_v2", // 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_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cur_default_value_v2", //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_DEFAULT_VALUE_LENGTH, //column_length + -1, //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(FLAT_ROW_STORE); @@ -9006,17 +8988,16 @@ int ObInnerTableSchema::all_virtual_column_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_column_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_column_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9047,475 +9028,475 @@ int ObInnerTableSchema::all_virtual_column_history_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj column_name_default; column_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("column_name", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - column_name_default, - column_name_default); // default_value + ADD_COLUMN_SCHEMA_T("column_name", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + column_name_default, + column_name_default); //default_value } if (OB_SUCC(ret)) { ObObj rowkey_position_default; rowkey_position_default.set_int(0); - ADD_COLUMN_SCHEMA_T("rowkey_position", // 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 - true, // is_nullable - false, // is_autoincrement - rowkey_position_default, - rowkey_position_default); // default_value + ADD_COLUMN_SCHEMA_T("rowkey_position", //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 + true, //is_nullable + false, //is_autoincrement + rowkey_position_default, + rowkey_position_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_position", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("index_position", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("order_in_rowkey", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("order_in_rowkey", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_key_position", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition_key_position", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_length", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_length", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_precision", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_precision", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_scale", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_scale", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zero_fill", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zero_fill", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("nullable", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("nullable", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("on_update_current_timestamp", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("on_update_current_timestamp", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("autoincrement", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("autoincrement", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj is_hidden_default; is_hidden_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_hidden", // 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 - true, // is_nullable - false, // is_autoincrement - is_hidden_default, - is_hidden_default); // default_value + ADD_COLUMN_SCHEMA_T("is_hidden", //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 + true, //is_nullable + false, //is_autoincrement + is_hidden_default, + is_hidden_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("orig_default_value", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("orig_default_value", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_default_value", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cur_default_value", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj column_flags_default; column_flags_default.set_int(0); - ADD_COLUMN_SCHEMA_T("column_flags", // 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 - true, // is_nullable - false, // is_autoincrement - column_flags_default, - column_flags_default); // default_value + ADD_COLUMN_SCHEMA_T("column_flags", //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 + true, //is_nullable + false, //is_autoincrement + column_flags_default, + column_flags_default); //default_value } if (OB_SUCC(ret)) { ObObj prev_column_id_default; prev_column_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("prev_column_id", // 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 - true, // is_nullable - false, // is_autoincrement - prev_column_id_default, - prev_column_id_default); // default_value + ADD_COLUMN_SCHEMA_T("prev_column_id", //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 + true, //is_nullable + false, //is_autoincrement + prev_column_id_default, + prev_column_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("extended_type_info", // 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_VARBINARY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("extended_type_info", //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_VARBINARY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("orig_default_value_v2", // 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_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("orig_default_value_v2", //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_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_default_value_v2", // 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_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cur_default_value_v2", //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_DEFAULT_VALUE_LENGTH, //column_length + -1, //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(FLAT_ROW_STORE); @@ -9525,17 +9506,16 @@ int ObInnerTableSchema::all_virtual_column_history_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_part_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_part_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9566,524 +9546,524 @@ int ObInnerTableSchema::all_virtual_part_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("part_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj part_name_default; part_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("part_name", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - part_name_default, - part_name_default); // default_value + ADD_COLUMN_SCHEMA_T("part_name", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + part_name_default, + part_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_bound_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("high_bound_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_high_bound_val", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_high_bound_val", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_space", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_space", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_sub_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_sub_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_sub_part_space", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_sub_part_space", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("list_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("list_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_list_val", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_list_val", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_idx", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_idx", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj source_partition_id_default; source_partition_id_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("source_partition_id", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - source_partition_id_default, - source_partition_id_default); // default_value + ADD_COLUMN_SCHEMA_T("source_partition_id", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + source_partition_id_default, + source_partition_id_default); //default_value } if (OB_SUCC(ret)) { ObObj mapping_pg_part_id_default; mapping_pg_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("mapping_pg_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - mapping_pg_part_id_default, - mapping_pg_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("mapping_pg_part_id", //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 + true, //is_nullable + false, //is_autoincrement + mapping_pg_part_id_default, + mapping_pg_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj max_used_sub_part_id_default; max_used_sub_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("max_used_sub_part_id", // 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_used_sub_part_id_default, - max_used_sub_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("max_used_sub_part_id", //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_used_sub_part_id_default, + max_used_sub_part_id_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10093,17 +10073,16 @@ int ObInnerTableSchema::all_virtual_part_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_part_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_part_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10134,539 +10113,539 @@ int ObInnerTableSchema::all_virtual_part_history_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("part_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj part_name_default; part_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("part_name", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - part_name_default, - part_name_default); // default_value + ADD_COLUMN_SCHEMA_T("part_name", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + part_name_default, + part_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_bound_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("high_bound_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_high_bound_val", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_high_bound_val", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_space", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_space", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_sub_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_sub_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_sub_part_space", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_sub_part_space", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("list_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("list_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_list_val", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_list_val", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_idx", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_idx", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj source_partition_id_default; source_partition_id_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("source_partition_id", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - source_partition_id_default, - source_partition_id_default); // default_value + ADD_COLUMN_SCHEMA_T("source_partition_id", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + source_partition_id_default, + source_partition_id_default); //default_value } if (OB_SUCC(ret)) { ObObj mapping_pg_part_id_default; mapping_pg_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("mapping_pg_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - mapping_pg_part_id_default, - mapping_pg_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("mapping_pg_part_id", //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 + true, //is_nullable + false, //is_autoincrement + mapping_pg_part_id_default, + mapping_pg_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - true, // is_nullable - false, // is_autoincrement - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + true, //is_nullable + false, //is_autoincrement + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj max_used_sub_part_id_default; max_used_sub_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("max_used_sub_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - max_used_sub_part_id_default, - max_used_sub_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("max_used_sub_part_id", //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 + true, //is_nullable + false, //is_autoincrement + max_used_sub_part_id_default, + max_used_sub_part_id_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10676,17 +10655,16 @@ int ObInnerTableSchema::all_virtual_part_history_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_part_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_part_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10717,425 +10695,425 @@ int ObInnerTableSchema::all_virtual_part_info_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_type", // 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 + ADD_COLUMN_SCHEMA("part_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_num", // 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 + ADD_COLUMN_SCHEMA("part_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_space", // 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 + ADD_COLUMN_SCHEMA("part_space", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_part_space", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_part_space", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_sub_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_sub_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_expr", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_expr", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_expr", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_expr", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_def_sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_def_sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_def_sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_def_sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //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(FLAT_ROW_STORE); @@ -11145,17 +11123,16 @@ int ObInnerTableSchema::all_virtual_part_info_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_part_info_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_part_info_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11186,440 +11163,440 @@ int ObInnerTableSchema::all_virtual_part_info_history_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_space", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_space", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_part_space", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_part_space", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_sub_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_sub_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_expr", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_expr", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_expr", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_expr", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_def_sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_def_sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_def_sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_def_sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //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(FLAT_ROW_STORE); @@ -11629,17 +11606,16 @@ int ObInnerTableSchema::all_virtual_part_info_history_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_def_sub_part_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_def_sub_part_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11670,351 +11646,351 @@ int ObInnerTableSchema::all_virtual_def_sub_part_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("sub_part_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj sub_part_name_default; sub_part_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sub_part_name", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - sub_part_name_default, - sub_part_name_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_name", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + sub_part_name_default, + sub_part_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_bound_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("high_bound_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_high_bound_val", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_high_bound_val", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("list_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("list_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_list_val", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_list_val", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_idx", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_idx", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj source_partition_id_default; source_partition_id_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("source_partition_id", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - source_partition_id_default, - source_partition_id_default); // default_value + ADD_COLUMN_SCHEMA_T("source_partition_id", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + source_partition_id_default, + source_partition_id_default); //default_value } if (OB_SUCC(ret)) { ObObj mapping_pg_sub_part_id_default; mapping_pg_sub_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("mapping_pg_sub_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - mapping_pg_sub_part_id_default, - mapping_pg_sub_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("mapping_pg_sub_part_id", //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 + true, //is_nullable + false, //is_autoincrement + mapping_pg_sub_part_id_default, + mapping_pg_sub_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + tablespace_id_default, + tablespace_id_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -12024,17 +12000,16 @@ int ObInnerTableSchema::all_virtual_def_sub_part_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_def_sub_part_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_def_sub_part_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -12065,366 +12040,366 @@ int ObInnerTableSchema::all_virtual_def_sub_part_history_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("sub_part_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj sub_part_name_default; sub_part_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sub_part_name", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - sub_part_name_default, - sub_part_name_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_name", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + sub_part_name_default, + sub_part_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_bound_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("high_bound_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_high_bound_val", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_high_bound_val", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("list_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("list_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_list_val", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_list_val", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_idx", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_idx", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj source_partition_id_default; source_partition_id_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("source_partition_id", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - source_partition_id_default, - source_partition_id_default); // default_value + ADD_COLUMN_SCHEMA_T("source_partition_id", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + source_partition_id_default, + source_partition_id_default); //default_value } if (OB_SUCC(ret)) { ObObj mapping_pg_sub_part_id_default; mapping_pg_sub_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("mapping_pg_sub_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - mapping_pg_sub_part_id_default, - mapping_pg_sub_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("mapping_pg_sub_part_id", //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 + true, //is_nullable + false, //is_autoincrement + mapping_pg_sub_part_id_default, + mapping_pg_sub_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - true, // is_nullable - false, // is_autoincrement - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + true, //is_nullable + false, //is_autoincrement + tablespace_id_default, + tablespace_id_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -12434,17 +12409,16 @@ int ObInnerTableSchema::all_virtual_def_sub_part_history_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sub_part_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sub_part_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -12475,404 +12449,404 @@ int ObInnerTableSchema::all_virtual_sub_part_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("part_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("sub_part_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj sub_part_name_default; sub_part_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sub_part_name", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - sub_part_name_default, - sub_part_name_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_name", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + sub_part_name_default, + sub_part_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_bound_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("high_bound_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_high_bound_val", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_high_bound_val", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("list_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("list_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_list_val", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_list_val", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { ObObj sub_part_idx_default; sub_part_idx_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("sub_part_idx", // 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 - sub_part_idx_default, - sub_part_idx_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_idx", //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 + sub_part_idx_default, + sub_part_idx_default); //default_value } if (OB_SUCC(ret)) { ObObj source_partition_id_default; source_partition_id_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("source_partition_id", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - source_partition_id_default, - source_partition_id_default); // default_value + ADD_COLUMN_SCHEMA_T("source_partition_id", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + source_partition_id_default, + source_partition_id_default); //default_value } if (OB_SUCC(ret)) { ObObj mapping_pg_sub_part_id_default; mapping_pg_sub_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("mapping_pg_sub_part_id", // 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 - mapping_pg_sub_part_id_default, - mapping_pg_sub_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("mapping_pg_sub_part_id", //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 + mapping_pg_sub_part_id_default, + mapping_pg_sub_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + drop_schema_version_default, + drop_schema_version_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -12882,17 +12856,16 @@ int ObInnerTableSchema::all_virtual_sub_part_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sub_part_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sub_part_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -12923,419 +12896,419 @@ int ObInnerTableSchema::all_virtual_sub_part_history_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("part_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("sub_part_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj sub_part_name_default; sub_part_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sub_part_name", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - sub_part_name_default, - sub_part_name_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_name", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + sub_part_name_default, + sub_part_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_bound_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("high_bound_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_high_bound_val", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_high_bound_val", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("list_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("list_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_list_val", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_list_val", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - true, // is_nullable - false, // is_autoincrement - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + true, //is_nullable + false, //is_autoincrement + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { ObObj sub_part_idx_default; sub_part_idx_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("sub_part_idx", // 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 - true, // is_nullable - false, // is_autoincrement - sub_part_idx_default, - sub_part_idx_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_idx", //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 + true, //is_nullable + false, //is_autoincrement + sub_part_idx_default, + sub_part_idx_default); //default_value } if (OB_SUCC(ret)) { ObObj source_partition_id_default; source_partition_id_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("source_partition_id", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - source_partition_id_default, - source_partition_id_default); // default_value + ADD_COLUMN_SCHEMA_T("source_partition_id", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + source_partition_id_default, + source_partition_id_default); //default_value } if (OB_SUCC(ret)) { ObObj mapping_pg_sub_part_id_default; mapping_pg_sub_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("mapping_pg_sub_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - mapping_pg_sub_part_id_default, - mapping_pg_sub_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("mapping_pg_sub_part_id", //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 + true, //is_nullable + false, //is_autoincrement + mapping_pg_sub_part_id_default, + mapping_pg_sub_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + drop_schema_version_default, + drop_schema_version_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -13345,17 +13318,16 @@ int ObInnerTableSchema::all_virtual_sub_part_history_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_constraint_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_constraint_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -13386,197 +13358,197 @@ int ObInnerTableSchema::all_virtual_constraint_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("constraint_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("constraint_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("constraint_name", // 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 - OB_MAX_CONSTRAINT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("constraint_name", //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 + OB_MAX_CONSTRAINT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("check_expr", // 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 - OB_MAX_CONSTRAINT_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("check_expr", //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 + OB_MAX_CONSTRAINT_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("constraint_type", // 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 + ADD_COLUMN_SCHEMA("constraint_type", //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 } if (OB_SUCC(ret)) { ObObj rely_flag_default; rely_flag_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("rely_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - rely_flag_default, - rely_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("rely_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + rely_flag_default, + rely_flag_default); //default_value } if (OB_SUCC(ret)) { ObObj enable_flag_default; enable_flag_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("enable_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - enable_flag_default, - enable_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("enable_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + enable_flag_default, + enable_flag_default); //default_value } if (OB_SUCC(ret)) { ObObj validate_flag_default; validate_flag_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("validate_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - validate_flag_default, - validate_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("validate_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + validate_flag_default, + validate_flag_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -13586,17 +13558,16 @@ int ObInnerTableSchema::all_virtual_constraint_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_constraint_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_constraint_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -13627,212 +13598,212 @@ int ObInnerTableSchema::all_virtual_constraint_history_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("constraint_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("constraint_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("constraint_name", // 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 - OB_MAX_CONSTRAINT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("constraint_name", //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 + OB_MAX_CONSTRAINT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("check_expr", // 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 - OB_MAX_CONSTRAINT_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("check_expr", //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 + OB_MAX_CONSTRAINT_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("constraint_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("constraint_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj rely_flag_default; rely_flag_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("rely_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - rely_flag_default, - rely_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("rely_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + rely_flag_default, + rely_flag_default); //default_value } if (OB_SUCC(ret)) { ObObj enable_flag_default; enable_flag_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("enable_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - enable_flag_default, - enable_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("enable_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + enable_flag_default, + enable_flag_default); //default_value } if (OB_SUCC(ret)) { ObObj validate_flag_default; validate_flag_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("validate_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - validate_flag_default, - validate_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("validate_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + validate_flag_default, + validate_flag_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -13842,17 +13813,16 @@ int ObInnerTableSchema::all_virtual_constraint_history_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_foreign_key_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_foreign_key_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -13883,239 +13853,239 @@ int ObInnerTableSchema::all_virtual_foreign_key_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("foreign_key_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("foreign_key_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj foreign_key_name_default; foreign_key_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("foreign_key_name", // 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 - OB_MAX_CONSTRAINT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - foreign_key_name_default, - foreign_key_name_default); // default_value + ADD_COLUMN_SCHEMA_T("foreign_key_name", //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 + OB_MAX_CONSTRAINT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + foreign_key_name_default, + foreign_key_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("child_table_id", // 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 + ADD_COLUMN_SCHEMA("child_table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parent_table_id", // 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 + ADD_COLUMN_SCHEMA("parent_table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("update_action", // 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 + ADD_COLUMN_SCHEMA("update_action", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("delete_action", // 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 + ADD_COLUMN_SCHEMA("delete_action", //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 } if (OB_SUCC(ret)) { ObObj enable_flag_default; enable_flag_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("enable_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - enable_flag_default, - enable_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("enable_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + enable_flag_default, + enable_flag_default); //default_value } if (OB_SUCC(ret)) { ObObj ref_cst_type_default; ref_cst_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("ref_cst_type", // 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 - ref_cst_type_default, - ref_cst_type_default); // default_value + ADD_COLUMN_SCHEMA_T("ref_cst_type", //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 + ref_cst_type_default, + ref_cst_type_default); //default_value } if (OB_SUCC(ret)) { ObObj ref_cst_id_default; ref_cst_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("ref_cst_id", // 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 - ref_cst_id_default, - ref_cst_id_default); // default_value + ADD_COLUMN_SCHEMA_T("ref_cst_id", //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 + ref_cst_id_default, + ref_cst_id_default); //default_value } if (OB_SUCC(ret)) { ObObj validate_flag_default; validate_flag_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("validate_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - validate_flag_default, - validate_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("validate_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + validate_flag_default, + validate_flag_default); //default_value } if (OB_SUCC(ret)) { ObObj rely_flag_default; rely_flag_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("rely_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - rely_flag_default, - rely_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("rely_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + rely_flag_default, + rely_flag_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -14125,17 +14095,16 @@ int ObInnerTableSchema::all_virtual_foreign_key_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_foreign_key_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_foreign_key_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -14166,269 +14135,269 @@ int ObInnerTableSchema::all_virtual_foreign_key_history_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("foreign_key_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("foreign_key_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj foreign_key_name_default; foreign_key_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("foreign_key_name", // 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 - OB_MAX_CONSTRAINT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - foreign_key_name_default, - foreign_key_name_default); // default_value + ADD_COLUMN_SCHEMA_T("foreign_key_name", //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 + OB_MAX_CONSTRAINT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + foreign_key_name_default, + foreign_key_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("child_table_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("child_table_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parent_table_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parent_table_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("update_action", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("update_action", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("delete_action", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("delete_action", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj enable_flag_default; enable_flag_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("enable_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - enable_flag_default, - enable_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("enable_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + enable_flag_default, + enable_flag_default); //default_value } if (OB_SUCC(ret)) { ObObj ref_cst_type_default; ref_cst_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("ref_cst_type", // 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 - true, // is_nullable - false, // is_autoincrement - ref_cst_type_default, - ref_cst_type_default); // default_value + ADD_COLUMN_SCHEMA_T("ref_cst_type", //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 + true, //is_nullable + false, //is_autoincrement + ref_cst_type_default, + ref_cst_type_default); //default_value } if (OB_SUCC(ret)) { ObObj ref_cst_id_default; ref_cst_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("ref_cst_id", // 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 - true, // is_nullable - false, // is_autoincrement - ref_cst_id_default, - ref_cst_id_default); // default_value + ADD_COLUMN_SCHEMA_T("ref_cst_id", //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 + true, //is_nullable + false, //is_autoincrement + ref_cst_id_default, + ref_cst_id_default); //default_value } if (OB_SUCC(ret)) { ObObj validate_flag_default; validate_flag_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("validate_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - validate_flag_default, - validate_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("validate_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + validate_flag_default, + validate_flag_default); //default_value } if (OB_SUCC(ret)) { ObObj rely_flag_default; rely_flag_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("rely_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - rely_flag_default, - rely_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("rely_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + rely_flag_default, + rely_flag_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -14438,17 +14407,16 @@ int ObInnerTableSchema::all_virtual_foreign_key_history_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_foreign_key_column_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_foreign_key_column_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -14479,114 +14447,114 @@ int ObInnerTableSchema::all_virtual_foreign_key_column_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("foreign_key_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("foreign_key_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("child_column_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("child_column_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parent_column_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("parent_column_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj position_default; position_default.set_int(0); - ADD_COLUMN_SCHEMA_T("position", // 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 - position_default, - position_default); // default_value + ADD_COLUMN_SCHEMA_T("position", //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 + position_default, + position_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -14596,17 +14564,16 @@ int ObInnerTableSchema::all_virtual_foreign_key_column_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_foreign_key_column_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_foreign_key_column_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -14637,144 +14604,144 @@ int ObInnerTableSchema::all_virtual_foreign_key_column_history_schema(ObTableSch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("foreign_key_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("foreign_key_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("child_column_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("child_column_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parent_column_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("parent_column_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj position_default; position_default.set_int(0); - ADD_COLUMN_SCHEMA_T("position", // 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 - true, // is_nullable - false, // is_autoincrement - position_default, - position_default); // default_value + ADD_COLUMN_SCHEMA_T("position", //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 + true, //is_nullable + false, //is_autoincrement + position_default, + position_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -14784,17 +14751,16 @@ int ObInnerTableSchema::all_virtual_foreign_key_column_history_schema(ObTableSch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_temp_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_temp_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -14825,52 +14791,52 @@ int ObInnerTableSchema::all_virtual_temp_table_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { ObObj create_host_default; create_host_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("create_host", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - create_host_default, - create_host_default); // default_value + ADD_COLUMN_SCHEMA_T("create_host", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + create_host_default, + create_host_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -14880,17 +14846,16 @@ int ObInnerTableSchema::all_virtual_temp_table_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_ori_schema_version_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_ori_schema_version_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -14921,99 +14886,99 @@ int ObInnerTableSchema::all_virtual_ori_schema_version_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ori_schema_version", // 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 + ADD_COLUMN_SCHEMA("ori_schema_version", //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 } if (OB_SUCC(ret)) { ObObj building_snapshot_default; building_snapshot_default.set_int(0); - ADD_COLUMN_SCHEMA_T("building_snapshot", // 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 - building_snapshot_default, - building_snapshot_default); // default_value + ADD_COLUMN_SCHEMA_T("building_snapshot", //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 + building_snapshot_default, + building_snapshot_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -15023,17 +14988,16 @@ int ObInnerTableSchema::all_virtual_ori_schema_version_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sys_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sys_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -15064,125 +15028,125 @@ int ObInnerTableSchema::all_virtual_sys_stat_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_CONFIG_NAME_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_CONFIG_NAME_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 + ADD_COLUMN_SCHEMA("data_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_CONFIG_INFO_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_CONFIG_INFO_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -15192,17 +15156,16 @@ int ObInnerTableSchema::all_virtual_sys_stat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_user_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_user_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -15233,673 +15196,673 @@ int ObInnerTableSchema::all_virtual_user_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_name", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_name", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj host_default; host_default.set_varchar(ObString::make_string("%")); - ADD_COLUMN_SCHEMA_T("host", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - host_default, - host_default); // default_value + ADD_COLUMN_SCHEMA_T("host", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + host_default, + host_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("passwd", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("passwd", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_USER_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_USER_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj priv_alter_default; priv_alter_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter", // 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 - priv_alter_default, - priv_alter_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter", //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 + priv_alter_default, + priv_alter_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_default; priv_create_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create", // 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 - priv_create_default, - priv_create_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create", //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 + priv_create_default, + priv_create_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_delete_default; priv_delete_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_delete", // 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 - priv_delete_default, - priv_delete_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_delete", //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 + priv_delete_default, + priv_delete_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_drop_default; priv_drop_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_drop", // 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 - priv_drop_default, - priv_drop_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_drop", //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 + priv_drop_default, + priv_drop_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_grant_option_default; priv_grant_option_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_grant_option", // 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 - priv_grant_option_default, - priv_grant_option_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_grant_option", //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 + priv_grant_option_default, + priv_grant_option_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_insert_default; priv_insert_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_insert", // 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 - priv_insert_default, - priv_insert_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_insert", //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 + priv_insert_default, + priv_insert_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_update_default; priv_update_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_update", // 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 - priv_update_default, - priv_update_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_update", //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 + priv_update_default, + priv_update_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_select_default; priv_select_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_select", // 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 - priv_select_default, - priv_select_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_select", //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 + priv_select_default, + priv_select_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_index_default; priv_index_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_index", // 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 - priv_index_default, - priv_index_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_index", //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 + priv_index_default, + priv_index_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_view_default; priv_create_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_view", // 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 - priv_create_view_default, - priv_create_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_view", //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 + priv_create_view_default, + priv_create_view_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_show_view_default; priv_show_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_show_view", // 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 - priv_show_view_default, - priv_show_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_show_view", //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 + priv_show_view_default, + priv_show_view_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_show_db_default; priv_show_db_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_show_db", // 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 - priv_show_db_default, - priv_show_db_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_show_db", //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 + priv_show_db_default, + priv_show_db_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_user_default; priv_create_user_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_user", // 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 - priv_create_user_default, - priv_create_user_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_user", //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 + priv_create_user_default, + priv_create_user_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_super_default; priv_super_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_super", // 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 - priv_super_default, - priv_super_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_super", //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 + priv_super_default, + priv_super_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_locked", // 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 + ADD_COLUMN_SCHEMA("is_locked", //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 } if (OB_SUCC(ret)) { ObObj priv_process_default; priv_process_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_process", // 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 - priv_process_default, - priv_process_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_process", //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 + priv_process_default, + priv_process_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_synonym_default; priv_create_synonym_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_synonym", // 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 - priv_create_synonym_default, - priv_create_synonym_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_synonym", //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 + priv_create_synonym_default, + priv_create_synonym_default); //default_value } if (OB_SUCC(ret)) { ObObj ssl_type_default; ssl_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("ssl_type", // 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 - ssl_type_default, - ssl_type_default); // default_value + ADD_COLUMN_SCHEMA_T("ssl_type", //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 + ssl_type_default, + ssl_type_default); //default_value } if (OB_SUCC(ret)) { ObObj ssl_cipher_default; ssl_cipher_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("ssl_cipher", // 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 - ssl_cipher_default, - ssl_cipher_default); // default_value + ADD_COLUMN_SCHEMA_T("ssl_cipher", //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 + ssl_cipher_default, + ssl_cipher_default); //default_value } if (OB_SUCC(ret)) { ObObj x509_issuer_default; x509_issuer_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("x509_issuer", // 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 - x509_issuer_default, - x509_issuer_default); // default_value + ADD_COLUMN_SCHEMA_T("x509_issuer", //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 + x509_issuer_default, + x509_issuer_default); //default_value } if (OB_SUCC(ret)) { ObObj x509_subject_default; x509_subject_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("x509_subject", // 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 - x509_subject_default, - x509_subject_default); // default_value + ADD_COLUMN_SCHEMA_T("x509_subject", //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 + x509_subject_default, + x509_subject_default); //default_value } if (OB_SUCC(ret)) { ObObj type_default; type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("type", // 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 - true, // is_nullable - false, // is_autoincrement - type_default, - type_default); // default_value + ADD_COLUMN_SCHEMA_T("type", //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 + true, //is_nullable + false, //is_autoincrement + type_default, + type_default); //default_value } if (OB_SUCC(ret)) { ObObj profile_id_default; profile_id_default.set_int(OB_INVALID_ID); - ADD_COLUMN_SCHEMA_T("profile_id", // 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 - profile_id_default, - profile_id_default); // default_value + ADD_COLUMN_SCHEMA_T("profile_id", //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 + profile_id_default, + profile_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("password_last_changed", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("password_last_changed", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj priv_file_default; priv_file_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_file", // 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 - priv_file_default, - priv_file_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_file", //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 + priv_file_default, + priv_file_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_alter_tenant_default; priv_alter_tenant_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter_tenant", // 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 - priv_alter_tenant_default, - priv_alter_tenant_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter_tenant", //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 + priv_alter_tenant_default, + priv_alter_tenant_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_alter_system_default; priv_alter_system_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter_system", // 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 - priv_alter_system_default, - priv_alter_system_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter_system", //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 + priv_alter_system_default, + priv_alter_system_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_resource_pool_default; priv_create_resource_pool_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_resource_pool", // 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 - priv_create_resource_pool_default, - priv_create_resource_pool_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_resource_pool", //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 + priv_create_resource_pool_default, + priv_create_resource_pool_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_resource_unit_default; priv_create_resource_unit_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_resource_unit", // 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 - priv_create_resource_unit_default, - priv_create_resource_unit_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_resource_unit", //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 + priv_create_resource_unit_default, + priv_create_resource_unit_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -15909,17 +15872,16 @@ int ObInnerTableSchema::all_virtual_user_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_user_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_user_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -15950,703 +15912,703 @@ int ObInnerTableSchema::all_virtual_user_history_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_name", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_name", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj host_default; host_default.set_varchar(ObString::make_string("%")); - ADD_COLUMN_SCHEMA_T("host", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - host_default, - host_default); // default_value + ADD_COLUMN_SCHEMA_T("host", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + host_default, + host_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("passwd", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("passwd", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_USER_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_USER_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj priv_alter_default; priv_alter_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter", // 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 - true, // is_nullable - false, // is_autoincrement - priv_alter_default, - priv_alter_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter", //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 + true, //is_nullable + false, //is_autoincrement + priv_alter_default, + priv_alter_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_default; priv_create_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_default, - priv_create_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_default, + priv_create_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_delete_default; priv_delete_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_delete", // 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 - true, // is_nullable - false, // is_autoincrement - priv_delete_default, - priv_delete_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_delete", //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 + true, //is_nullable + false, //is_autoincrement + priv_delete_default, + priv_delete_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_drop_default; priv_drop_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_drop", // 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 - true, // is_nullable - false, // is_autoincrement - priv_drop_default, - priv_drop_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_drop", //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 + true, //is_nullable + false, //is_autoincrement + priv_drop_default, + priv_drop_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_grant_option_default; priv_grant_option_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_grant_option", // 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 - true, // is_nullable - false, // is_autoincrement - priv_grant_option_default, - priv_grant_option_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_grant_option", //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 + true, //is_nullable + false, //is_autoincrement + priv_grant_option_default, + priv_grant_option_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_insert_default; priv_insert_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_insert", // 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 - true, // is_nullable - false, // is_autoincrement - priv_insert_default, - priv_insert_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_insert", //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 + true, //is_nullable + false, //is_autoincrement + priv_insert_default, + priv_insert_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_update_default; priv_update_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_update", // 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 - true, // is_nullable - false, // is_autoincrement - priv_update_default, - priv_update_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_update", //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 + true, //is_nullable + false, //is_autoincrement + priv_update_default, + priv_update_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_select_default; priv_select_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_select", // 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 - true, // is_nullable - false, // is_autoincrement - priv_select_default, - priv_select_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_select", //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 + true, //is_nullable + false, //is_autoincrement + priv_select_default, + priv_select_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_index_default; priv_index_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_index", // 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 - true, // is_nullable - false, // is_autoincrement - priv_index_default, - priv_index_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_index", //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 + true, //is_nullable + false, //is_autoincrement + priv_index_default, + priv_index_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_view_default; priv_create_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_view", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_view_default, - priv_create_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_view", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_view_default, + priv_create_view_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_show_view_default; priv_show_view_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_show_view", // 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 - true, // is_nullable - false, // is_autoincrement - priv_show_view_default, - priv_show_view_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_show_view", //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 + true, //is_nullable + false, //is_autoincrement + priv_show_view_default, + priv_show_view_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_show_db_default; priv_show_db_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_show_db", // 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 - true, // is_nullable - false, // is_autoincrement - priv_show_db_default, - priv_show_db_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_show_db", //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 + true, //is_nullable + false, //is_autoincrement + priv_show_db_default, + priv_show_db_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_user_default; priv_create_user_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_user", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_user_default, - priv_create_user_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_user", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_user_default, + priv_create_user_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_super_default; priv_super_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_super", // 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 - true, // is_nullable - false, // is_autoincrement - priv_super_default, - priv_super_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_super", //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 + true, //is_nullable + false, //is_autoincrement + priv_super_default, + priv_super_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_locked", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_locked", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj priv_process_default; priv_process_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_process", // 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 - true, // is_nullable - false, // is_autoincrement - priv_process_default, - priv_process_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_process", //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 + true, //is_nullable + false, //is_autoincrement + priv_process_default, + priv_process_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_synonym_default; priv_create_synonym_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_synonym", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_synonym_default, - priv_create_synonym_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_synonym", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_synonym_default, + priv_create_synonym_default); //default_value } if (OB_SUCC(ret)) { ObObj ssl_type_default; ssl_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("ssl_type", // 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 - true, // is_nullable - false, // is_autoincrement - ssl_type_default, - ssl_type_default); // default_value + ADD_COLUMN_SCHEMA_T("ssl_type", //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 + true, //is_nullable + false, //is_autoincrement + ssl_type_default, + ssl_type_default); //default_value } if (OB_SUCC(ret)) { ObObj ssl_cipher_default; ssl_cipher_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("ssl_cipher", // 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 - true, // is_nullable - false, // is_autoincrement - ssl_cipher_default, - ssl_cipher_default); // default_value + ADD_COLUMN_SCHEMA_T("ssl_cipher", //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 + true, //is_nullable + false, //is_autoincrement + ssl_cipher_default, + ssl_cipher_default); //default_value } if (OB_SUCC(ret)) { ObObj x509_issuer_default; x509_issuer_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("x509_issuer", // 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 - true, // is_nullable - false, // is_autoincrement - x509_issuer_default, - x509_issuer_default); // default_value + ADD_COLUMN_SCHEMA_T("x509_issuer", //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 + true, //is_nullable + false, //is_autoincrement + x509_issuer_default, + x509_issuer_default); //default_value } if (OB_SUCC(ret)) { ObObj x509_subject_default; x509_subject_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("x509_subject", // 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 - true, // is_nullable - false, // is_autoincrement - x509_subject_default, - x509_subject_default); // default_value + ADD_COLUMN_SCHEMA_T("x509_subject", //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 + true, //is_nullable + false, //is_autoincrement + x509_subject_default, + x509_subject_default); //default_value } if (OB_SUCC(ret)) { ObObj type_default; type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("type", // 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 - true, // is_nullable - false, // is_autoincrement - type_default, - type_default); // default_value + ADD_COLUMN_SCHEMA_T("type", //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 + true, //is_nullable + false, //is_autoincrement + type_default, + type_default); //default_value } if (OB_SUCC(ret)) { ObObj profile_id_default; profile_id_default.set_int(OB_INVALID_ID); - ADD_COLUMN_SCHEMA_T("profile_id", // 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 - true, // is_nullable - false, // is_autoincrement - profile_id_default, - profile_id_default); // default_value + ADD_COLUMN_SCHEMA_T("profile_id", //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 + true, //is_nullable + false, //is_autoincrement + profile_id_default, + profile_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("password_last_changed", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("password_last_changed", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj priv_file_default; priv_file_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_file", // 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 - true, // is_nullable - false, // is_autoincrement - priv_file_default, - priv_file_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_file", //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 + true, //is_nullable + false, //is_autoincrement + priv_file_default, + priv_file_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_alter_tenant_default; priv_alter_tenant_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter_tenant", // 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 - true, // is_nullable - false, // is_autoincrement - priv_alter_tenant_default, - priv_alter_tenant_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter_tenant", //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 + true, //is_nullable + false, //is_autoincrement + priv_alter_tenant_default, + priv_alter_tenant_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_alter_system_default; priv_alter_system_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_alter_system", // 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 - true, // is_nullable - false, // is_autoincrement - priv_alter_system_default, - priv_alter_system_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_alter_system", //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 + true, //is_nullable + false, //is_autoincrement + priv_alter_system_default, + priv_alter_system_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_resource_pool_default; priv_create_resource_pool_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_resource_pool", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_resource_pool_default, - priv_create_resource_pool_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_resource_pool", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_resource_pool_default, + priv_create_resource_pool_default); //default_value } if (OB_SUCC(ret)) { ObObj priv_create_resource_unit_default; priv_create_resource_unit_default.set_int(0); - ADD_COLUMN_SCHEMA_T("priv_create_resource_unit", // 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 - true, // is_nullable - false, // is_autoincrement - priv_create_resource_unit_default, - priv_create_resource_unit_default); // default_value + ADD_COLUMN_SCHEMA_T("priv_create_resource_unit", //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 + true, //is_nullable + false, //is_autoincrement + priv_create_resource_unit_default, + priv_create_resource_unit_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -16656,17 +16618,16 @@ int ObInnerTableSchema::all_virtual_user_history_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sys_variable_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sys_variable_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -16697,182 +16658,182 @@ int ObInnerTableSchema::all_virtual_sys_variable_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj name_default; name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_CONFIG_NAME_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - name_default, - name_default); // default_value + ADD_COLUMN_SCHEMA_T("name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_CONFIG_NAME_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + name_default, + name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 + ADD_COLUMN_SCHEMA("data_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_CONFIG_INFO_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_CONFIG_INFO_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flags", // 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 + ADD_COLUMN_SCHEMA("flags", //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 } if (OB_SUCC(ret)) { ObObj min_val_default; min_val_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("min_val", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - min_val_default, - min_val_default); // default_value + ADD_COLUMN_SCHEMA_T("min_val", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + min_val_default, + min_val_default); //default_value } if (OB_SUCC(ret)) { ObObj max_val_default; max_val_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("max_val", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - max_val_default, - max_val_default); // default_value + ADD_COLUMN_SCHEMA_T("max_val", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + max_val_default, + max_val_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -16882,17 +16843,16 @@ int ObInnerTableSchema::all_virtual_sys_variable_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sys_variable_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sys_variable_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -16923,212 +16883,212 @@ int ObInnerTableSchema::all_virtual_sys_variable_history_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj name_default; name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_CONFIG_NAME_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - name_default, - name_default); // default_value + ADD_COLUMN_SCHEMA_T("name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_CONFIG_NAME_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + name_default, + name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 + ADD_COLUMN_SCHEMA("data_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_CONFIG_INFO_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_CONFIG_INFO_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flags", // 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 + ADD_COLUMN_SCHEMA("flags", //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 } if (OB_SUCC(ret)) { ObObj min_val_default; min_val_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("min_val", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - min_val_default, - min_val_default); // default_value + ADD_COLUMN_SCHEMA_T("min_val", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + min_val_default, + min_val_default); //default_value } if (OB_SUCC(ret)) { ObObj max_val_default; max_val_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("max_val", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - max_val_default, - max_val_default); // default_value + ADD_COLUMN_SCHEMA_T("max_val", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + max_val_default, + max_val_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -17138,17 +17098,16 @@ int ObInnerTableSchema::all_virtual_sys_variable_history_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_func_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_func_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -17179,125 +17138,125 @@ int ObInnerTableSchema::all_virtual_func_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_UDF_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_UDF_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ret", // 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 + ADD_COLUMN_SCHEMA("ret", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dl", // 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 - OB_MAX_DL_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dl", //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 + OB_MAX_DL_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("udf_id", // 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 + ADD_COLUMN_SCHEMA("udf_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 + ADD_COLUMN_SCHEMA("type", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -17307,17 +17266,16 @@ int ObInnerTableSchema::all_virtual_func_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_func_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_func_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -17348,155 +17306,155 @@ int ObInnerTableSchema::all_virtual_func_history_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_UDF_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_UDF_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ret", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ret", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dl", // 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 - OB_MAX_DL_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dl", //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 + OB_MAX_DL_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("udf_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("udf_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -17506,17 +17464,16 @@ int ObInnerTableSchema::all_virtual_func_history_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_package_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_package_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -17547,234 +17504,234 @@ int ObInnerTableSchema::all_virtual_package_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("package_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { ObObj package_name_default; package_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("package_name", // 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 - OB_MAX_PACKAGE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - package_name_default, - package_name_default); // default_value + ADD_COLUMN_SCHEMA_T("package_name", //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 + OB_MAX_PACKAGE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + package_name_default, + package_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 + ADD_COLUMN_SCHEMA("type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flag", // 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 + ADD_COLUMN_SCHEMA("flag", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 + ADD_COLUMN_SCHEMA("owner_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comp_flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comp_flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("exec_env", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("exec_env", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("source", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("source", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("route_sql", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("route_sql", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //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(FLAT_ROW_STORE); @@ -17784,10 +17741,10 @@ int ObInnerTableSchema::all_virtual_package_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.12101_12150.cpp b/src/share/inner_table/ob_inner_table_schema.12101_12150.cpp index a592e4388..e68eb2abf 100644 --- a/src/share/inner_table/ob_inner_table_schema.12101_12150.cpp +++ b/src/share/inner_table/ob_inner_table_schema.12101_12150.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::all_virtual_package_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_package_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -58,249 +60,249 @@ int ObInnerTableSchema::all_virtual_package_history_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("package_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj package_name_default; package_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("package_name", // 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 - OB_MAX_PACKAGE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - package_name_default, - package_name_default); // default_value + ADD_COLUMN_SCHEMA_T("package_name", //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 + OB_MAX_PACKAGE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + package_name_default, + package_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comp_flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comp_flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("exec_env", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("exec_env", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("source", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("source", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("route_sql", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("route_sql", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //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(FLAT_ROW_STORE); @@ -310,17 +312,16 @@ int ObInnerTableSchema::all_virtual_package_history_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_routine_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_routine_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -351,290 +352,290 @@ int ObInnerTableSchema::all_virtual_routine_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("routine_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_id", // 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 + ADD_COLUMN_SCHEMA("package_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_name", // 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 - OB_MAX_ROUTINE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("routine_name", //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 + OB_MAX_ROUTINE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("overload", // 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 + ADD_COLUMN_SCHEMA("overload", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subprogram_id", // 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 + ADD_COLUMN_SCHEMA("subprogram_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_type", // 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 + ADD_COLUMN_SCHEMA("routine_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flag", // 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 + ADD_COLUMN_SCHEMA("flag", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 + ADD_COLUMN_SCHEMA("owner_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_user", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("priv_user", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comp_flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comp_flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("exec_env", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("exec_env", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_body", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("routine_body", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("route_sql", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("route_sql", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //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(FLAT_ROW_STORE); @@ -644,17 +645,16 @@ int ObInnerTableSchema::all_virtual_routine_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_routine_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_routine_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -685,305 +685,305 @@ int ObInnerTableSchema::all_virtual_routine_history_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("routine_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_name", // 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 - OB_MAX_ROUTINE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("routine_name", //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 + OB_MAX_ROUTINE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("overload", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("overload", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subprogram_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("subprogram_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("routine_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_user", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("priv_user", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comp_flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comp_flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("exec_env", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("exec_env", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_body", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("routine_body", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("route_sql", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("route_sql", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //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(FLAT_ROW_STORE); @@ -993,17 +993,16 @@ int ObInnerTableSchema::all_virtual_routine_history_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_routine_param_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_routine_param_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1034,366 +1033,366 @@ int ObInnerTableSchema::all_virtual_routine_param_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("routine_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("sequence", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subprogram_id", // 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 + ADD_COLUMN_SCHEMA("subprogram_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_position", // 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 + ADD_COLUMN_SCHEMA("param_position", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_level", // 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 + ADD_COLUMN_SCHEMA("param_level", //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 } if (OB_SUCC(ret)) { ObObj param_name_default; param_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("param_name", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - param_name_default, - param_name_default); // default_value + ADD_COLUMN_SCHEMA_T("param_name", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + param_name_default, + param_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_type", // 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 + ADD_COLUMN_SCHEMA("param_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_length", // 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 + ADD_COLUMN_SCHEMA("param_length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_precision", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_precision", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_scale", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_scale", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_zero_fill", // 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 + ADD_COLUMN_SCHEMA("param_zero_fill", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_charset", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_charset", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_coll_type", // 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 + ADD_COLUMN_SCHEMA("param_coll_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flag", // 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 + ADD_COLUMN_SCHEMA("flag", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("default_value", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("default_value", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_owner", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type_owner", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj type_name_default; type_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("type_name", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - type_name_default, - type_name_default); // default_value + ADD_COLUMN_SCHEMA_T("type_name", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + type_name_default, + type_name_default); //default_value } if (OB_SUCC(ret)) { ObObj type_subname_default; type_subname_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("type_subname", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - type_subname_default, - type_subname_default); // default_value + ADD_COLUMN_SCHEMA_T("type_subname", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + type_subname_default, + type_subname_default); //default_value } if (OB_SUCC(ret)) { ObObj extended_type_info_default; extended_type_info_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("extended_type_info", // 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_VARBINARY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - extended_type_info_default, - extended_type_info_default); // default_value + ADD_COLUMN_SCHEMA_T("extended_type_info", //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_VARBINARY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + extended_type_info_default, + extended_type_info_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1403,17 +1402,16 @@ int ObInnerTableSchema::all_virtual_routine_param_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_routine_param_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_routine_param_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1444,381 +1442,381 @@ int ObInnerTableSchema::all_virtual_routine_param_history_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("routine_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("sequence", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subprogram_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("subprogram_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_position", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_position", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_level", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_level", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj param_name_default; param_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("param_name", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - param_name_default, - param_name_default); // default_value + ADD_COLUMN_SCHEMA_T("param_name", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + param_name_default, + param_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_length", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_length", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_precision", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_precision", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_scale", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_scale", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_zero_fill", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_zero_fill", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_charset", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_charset", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_coll_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_coll_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("default_value", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("default_value", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_owner", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type_owner", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj type_name_default; type_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("type_name", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - type_name_default, - type_name_default); // default_value + ADD_COLUMN_SCHEMA_T("type_name", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + type_name_default, + type_name_default); //default_value } if (OB_SUCC(ret)) { ObObj type_subname_default; type_subname_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("type_subname", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - type_subname_default, - type_subname_default); // default_value + ADD_COLUMN_SCHEMA_T("type_subname", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + type_subname_default, + type_subname_default); //default_value } if (OB_SUCC(ret)) { ObObj extended_type_info_default; extended_type_info_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("extended_type_info", // 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_VARBINARY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - extended_type_info_default, - extended_type_info_default); // default_value + ADD_COLUMN_SCHEMA_T("extended_type_info", //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_VARBINARY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + extended_type_info_default, + extended_type_info_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1828,17 +1826,16 @@ int ObInnerTableSchema::all_virtual_routine_param_history_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_type_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_type_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1869,328 +1866,328 @@ int ObInnerTableSchema::all_virtual_type_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("type_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("typecode", // 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 + ADD_COLUMN_SCHEMA("typecode", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("properties", // 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 + ADD_COLUMN_SCHEMA("properties", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("attributes", // 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 + ADD_COLUMN_SCHEMA("attributes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("methods", // 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 + ADD_COLUMN_SCHEMA("methods", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hiddenmethods", // 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 + ADD_COLUMN_SCHEMA("hiddenmethods", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("supertypes", // 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 + ADD_COLUMN_SCHEMA("supertypes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subtypes", // 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 + ADD_COLUMN_SCHEMA("subtypes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("externtype", // 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 + ADD_COLUMN_SCHEMA("externtype", //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 } if (OB_SUCC(ret)) { ObObj externname_default; externname_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("externname", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - externname_default, - externname_default); // default_value + ADD_COLUMN_SCHEMA_T("externname", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + externname_default, + externname_default); //default_value } if (OB_SUCC(ret)) { ObObj helperclassname_default; helperclassname_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("helperclassname", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - helperclassname_default, - helperclassname_default); // default_value + ADD_COLUMN_SCHEMA_T("helperclassname", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + helperclassname_default, + helperclassname_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("local_attrs", // 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 + ADD_COLUMN_SCHEMA("local_attrs", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("local_methods", // 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 + ADD_COLUMN_SCHEMA("local_methods", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("supertypeid", // 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 + ADD_COLUMN_SCHEMA("supertypeid", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_name", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type_name", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_id", // 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 + ADD_COLUMN_SCHEMA("package_id", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2200,17 +2197,16 @@ int ObInnerTableSchema::all_virtual_type_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_type_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_type_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2241,343 +2237,343 @@ int ObInnerTableSchema::all_virtual_type_history_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("type_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("typecode", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("typecode", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("properties", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("properties", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("attributes", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("attributes", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("methods", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("methods", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hiddenmethods", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("hiddenmethods", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("supertypes", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("supertypes", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subtypes", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("subtypes", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("externtype", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("externtype", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj externname_default; externname_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("externname", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - externname_default, - externname_default); // default_value + ADD_COLUMN_SCHEMA_T("externname", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + externname_default, + externname_default); //default_value } if (OB_SUCC(ret)) { ObObj helperclassname_default; helperclassname_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("helperclassname", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - helperclassname_default, - helperclassname_default); // default_value + ADD_COLUMN_SCHEMA_T("helperclassname", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + helperclassname_default, + helperclassname_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("local_attrs", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("local_attrs", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("local_methods", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("local_methods", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("supertypeid", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("supertypeid", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_name", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type_name", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_id", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2587,17 +2583,16 @@ int ObInnerTableSchema::all_virtual_type_history_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_type_attr_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_type_attr_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2628,309 +2623,309 @@ int ObInnerTableSchema::all_virtual_type_attr_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("type_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("attribute", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("attribute", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_attr_id", // 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 + ADD_COLUMN_SCHEMA("type_attr_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("properties", // 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 + ADD_COLUMN_SCHEMA("properties", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_id", // 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 + ADD_COLUMN_SCHEMA("charset_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_form", // 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 + ADD_COLUMN_SCHEMA("charset_form", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("length", // 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 + ADD_COLUMN_SCHEMA("length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("number_precision", // 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 + ADD_COLUMN_SCHEMA("number_precision", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scale", // 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 + ADD_COLUMN_SCHEMA("scale", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zero_fill", // 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 + ADD_COLUMN_SCHEMA("zero_fill", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_type", // 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 + ADD_COLUMN_SCHEMA("coll_type", //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 } if (OB_SUCC(ret)) { ObObj externname_default; externname_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("externname", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - externname_default, - externname_default); // default_value + ADD_COLUMN_SCHEMA_T("externname", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + externname_default, + externname_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("xflags", // 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 + ADD_COLUMN_SCHEMA("xflags", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("setter", // 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 + ADD_COLUMN_SCHEMA("setter", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("getter", // 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 + ADD_COLUMN_SCHEMA("getter", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2940,17 +2935,16 @@ int ObInnerTableSchema::all_virtual_type_attr_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_type_attr_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_type_attr_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2981,324 +2975,324 @@ int ObInnerTableSchema::all_virtual_type_attr_history_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("type_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("attribute", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("attribute", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_attr_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type_attr_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("properties", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("properties", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("charset_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_form", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("charset_form", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("length", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("length", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("number_precision", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("number_precision", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scale", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("scale", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zero_fill", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zero_fill", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("coll_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj externname_default; externname_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("externname", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - externname_default, - externname_default); // default_value + ADD_COLUMN_SCHEMA_T("externname", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + externname_default, + externname_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("xflags", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("xflags", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("setter", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("setter", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("getter", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("getter", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3308,17 +3302,16 @@ int ObInnerTableSchema::all_virtual_type_attr_history_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_coll_type_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_coll_type_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3349,275 +3342,275 @@ int ObInnerTableSchema::all_virtual_coll_type_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_type_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("coll_type_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("elem_type_id", // 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 + ADD_COLUMN_SCHEMA("elem_type_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("elem_schema_version", // 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 + ADD_COLUMN_SCHEMA("elem_schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("properties", // 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 + ADD_COLUMN_SCHEMA("properties", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_id", // 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 + ADD_COLUMN_SCHEMA("charset_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_form", // 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 + ADD_COLUMN_SCHEMA("charset_form", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("length", // 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 + ADD_COLUMN_SCHEMA("length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("number_precision", // 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 + ADD_COLUMN_SCHEMA("number_precision", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scale", // 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 + ADD_COLUMN_SCHEMA("scale", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zero_fill", // 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 + ADD_COLUMN_SCHEMA("zero_fill", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_type", // 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 + ADD_COLUMN_SCHEMA("coll_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("upper_bound", // 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 + ADD_COLUMN_SCHEMA("upper_bound", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_id", // 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 + ADD_COLUMN_SCHEMA("package_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_name", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("coll_name", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3627,17 +3620,16 @@ int ObInnerTableSchema::all_virtual_coll_type_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_coll_type_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_coll_type_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3668,290 +3660,290 @@ int ObInnerTableSchema::all_virtual_coll_type_history_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_type_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("coll_type_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("elem_type_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("elem_type_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("elem_schema_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("elem_schema_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("properties", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("properties", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("charset_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_form", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("charset_form", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("length", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("length", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("number_precision", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("number_precision", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scale", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("scale", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zero_fill", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zero_fill", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("coll_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("upper_bound", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("upper_bound", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_name", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("coll_name", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //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(FLAT_ROW_STORE); @@ -3961,17 +3953,16 @@ int ObInnerTableSchema::all_virtual_coll_type_history_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_column_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_column_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4002,321 +3993,321 @@ int ObInnerTableSchema::all_virtual_column_stat_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_type", // 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 + ADD_COLUMN_SCHEMA("object_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("last_analyzed", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("last_analyzed", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("distinct_cnt", // 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 + ADD_COLUMN_SCHEMA("distinct_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("null_cnt", // 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 + ADD_COLUMN_SCHEMA("null_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_value", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_value", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_max_value", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_max_value", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_value", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("min_value", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_min_value", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_min_value", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("avg_len", // 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 + ADD_COLUMN_SCHEMA("avg_len", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("distinct_cnt_synopsis", // 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 - MAX_LLC_BITMAP_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("distinct_cnt_synopsis", //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 + MAX_LLC_BITMAP_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("distinct_cnt_synopsis_size", // 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 + ADD_COLUMN_SCHEMA("distinct_cnt_synopsis_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sample_size", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sample_size", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("density", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("density", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("bucket_cnt", // 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 + ADD_COLUMN_SCHEMA("bucket_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("histogram_type", // 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 + ADD_COLUMN_SCHEMA("histogram_type", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4326,17 +4317,16 @@ int ObInnerTableSchema::all_virtual_column_stat_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_table_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_table_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4367,201 +4357,201 @@ int ObInnerTableSchema::all_virtual_table_stat_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_type", // 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 + ADD_COLUMN_SCHEMA("object_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("last_analyzed", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("last_analyzed", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sstable_row_cnt", // 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 + ADD_COLUMN_SCHEMA("sstable_row_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sstable_avg_row_len", // 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 + ADD_COLUMN_SCHEMA("sstable_avg_row_len", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_blk_cnt", // 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 + ADD_COLUMN_SCHEMA("macro_blk_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("micro_blk_cnt", // 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 + ADD_COLUMN_SCHEMA("micro_blk_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memtable_row_cnt", // 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 + ADD_COLUMN_SCHEMA("memtable_row_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memtable_avg_row_len", // 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 + ADD_COLUMN_SCHEMA("memtable_avg_row_len", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4571,17 +4561,16 @@ int ObInnerTableSchema::all_virtual_table_stat_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_histogram_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_histogram_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4612,170 +4601,170 @@ int ObInnerTableSchema::all_virtual_histogram_stat_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("endpoint_num", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("endpoint_num", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_type", // 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 + ADD_COLUMN_SCHEMA("object_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("endpoint_value", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("endpoint_value", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_endpoint_value", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_endpoint_value", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("endpoint_repeat_cnt", // 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 + ADD_COLUMN_SCHEMA("endpoint_repeat_cnt", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4785,17 +4774,16 @@ int ObInnerTableSchema::all_virtual_histogram_stat_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_column_statistic_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_column_statistic_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4826,215 +4814,215 @@ int ObInnerTableSchema::all_virtual_column_statistic_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("num_distinct", // 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 + ADD_COLUMN_SCHEMA("num_distinct", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("num_null", // 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 + ADD_COLUMN_SCHEMA("num_null", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_value", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("min_value", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_value", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_value", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("llc_bitmap", // 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 - MAX_LLC_BITMAP_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("llc_bitmap", //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 + MAX_LLC_BITMAP_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("llc_bitmap_size", // 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 + ADD_COLUMN_SCHEMA("llc_bitmap_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("version", // 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 + ADD_COLUMN_SCHEMA("version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_rebuild_version", // 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 + ADD_COLUMN_SCHEMA("last_rebuild_version", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5044,17 +5032,16 @@ int ObInnerTableSchema::all_virtual_column_statistic_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_recyclebin_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_recyclebin_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5085,124 +5072,124 @@ int ObInnerTableSchema::all_virtual_recyclebin_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_OBJECT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("object_name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_OBJECT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("type", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // 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 + ADD_COLUMN_SCHEMA("tablegroup_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("original_name", // 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 - OB_MAX_ORIGINAL_NANE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("original_name", //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 + OB_MAX_ORIGINAL_NANE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5212,17 +5199,16 @@ int ObInnerTableSchema::all_virtual_recyclebin_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_gc_partition_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_gc_partition_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5253,80 +5239,80 @@ int ObInnerTableSchema::all_virtual_tenant_gc_partition_info_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5336,17 +5322,16 @@ int ObInnerTableSchema::all_virtual_tenant_gc_partition_info_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_plan_baseline_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_plan_baseline_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5377,254 +5362,254 @@ int ObInnerTableSchema::all_virtual_tenant_plan_baseline_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_baseline_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("plan_baseline_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj database_id_default; database_id_default.set_uint64(0); - ADD_COLUMN_SCHEMA_T("database_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - database_id_default, - database_id_default); // default_value + ADD_COLUMN_SCHEMA_T("database_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + database_id_default, + database_id_default); //default_value } if (OB_SUCC(ret)) { ObObj schema_version_default; schema_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("schema_version", // 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 - schema_version_default, - schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("schema_version", //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 + schema_version_default, + schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj sql_id_default; sql_id_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sql_id", // 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_SQL_ID_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - sql_id_default, - sql_id_default); // default_value + ADD_COLUMN_SCHEMA_T("sql_id", //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_SQL_ID_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + sql_id_default, + sql_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_hash_value", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("plan_hash_value", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("params_info", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_BINARY, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("params_info", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_BINARY, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_data", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("outline_data", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_text", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_text", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj fixed_default; fixed_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("fixed", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - fixed_default, - fixed_default); // default_value + ADD_COLUMN_SCHEMA_T("fixed", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + fixed_default, + fixed_default); //default_value } if (OB_SUCC(ret)) { ObObj enabled_default; enabled_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("enabled", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - enabled_default, - enabled_default); // default_value + ADD_COLUMN_SCHEMA_T("enabled", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + enabled_default, + enabled_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hints_info", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("hints_info", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj hints_all_worked_default; hints_all_worked_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("hints_all_worked", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - hints_all_worked_default, - hints_all_worked_default); // default_value + ADD_COLUMN_SCHEMA_T("hints_all_worked", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + hints_all_worked_default, + hints_all_worked_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5634,17 +5619,16 @@ int ObInnerTableSchema::all_virtual_tenant_plan_baseline_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_plan_baseline_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_plan_baseline_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5675,265 +5659,265 @@ int ObInnerTableSchema::all_virtual_tenant_plan_baseline_history_schema(ObTableS table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_baseline_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("plan_baseline_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj database_id_default; database_id_default.set_uint64(0); - ADD_COLUMN_SCHEMA_T("database_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - database_id_default, - database_id_default); // default_value + ADD_COLUMN_SCHEMA_T("database_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + database_id_default, + database_id_default); //default_value } if (OB_SUCC(ret)) { ObObj sql_id_default; sql_id_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sql_id", // 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_SQL_ID_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - sql_id_default, - sql_id_default); // default_value + ADD_COLUMN_SCHEMA_T("sql_id", //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_SQL_ID_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + sql_id_default, + sql_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_hash_value", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("plan_hash_value", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("params_info", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_BINARY, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("params_info", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_BINARY, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_data", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("outline_data", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_text", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_text", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj fixed_default; fixed_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("fixed", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - fixed_default, - fixed_default); // default_value + ADD_COLUMN_SCHEMA_T("fixed", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + fixed_default, + fixed_default); //default_value } if (OB_SUCC(ret)) { ObObj enabled_default; enabled_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("enabled", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - enabled_default, - enabled_default); // default_value + ADD_COLUMN_SCHEMA_T("enabled", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + enabled_default, + enabled_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hints_info", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("hints_info", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj hints_all_worked_default; hints_all_worked_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("hints_all_worked", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - hints_all_worked_default, - hints_all_worked_default); // default_value + ADD_COLUMN_SCHEMA_T("hints_all_worked", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + hints_all_worked_default, + hints_all_worked_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5943,17 +5927,16 @@ int ObInnerTableSchema::all_virtual_tenant_plan_baseline_history_schema(ObTableS table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sequence_object_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sequence_object_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5984,215 +5967,215 @@ int ObInnerTableSchema::all_virtual_sequence_object_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("sequence_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_name", // 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 - OB_MAX_SEQUENCE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sequence_name", //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 + OB_MAX_SEQUENCE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_value", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("min_value", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_value", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_value", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("increment_by", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("increment_by", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_with", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("start_with", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cache_size", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cache_size", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("order_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("order_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cycle_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cycle_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6202,17 +6185,16 @@ int ObInnerTableSchema::all_virtual_sequence_object_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sequence_object_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sequence_object_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6243,230 +6225,230 @@ int ObInnerTableSchema::all_virtual_sequence_object_history_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("sequence_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_name", // 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 - OB_MAX_SEQUENCE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sequence_name", //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 + OB_MAX_SEQUENCE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_value", // 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 - 28, // column_precision - 0, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("min_value", //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 + 28, //column_precision + 0, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_value", // 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 - 28, // column_precision - 0, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_value", //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 + 28, //column_precision + 0, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("increment_by", // 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 - 28, // column_precision - 0, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("increment_by", //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 + 28, //column_precision + 0, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_with", // 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 - 28, // column_precision - 0, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("start_with", //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 + 28, //column_precision + 0, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cache_size", // 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 - 28, // column_precision - 0, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cache_size", //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 + 28, //column_precision + 0, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("order_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("order_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cycle_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cycle_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //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(FLAT_ROW_STORE); @@ -6476,17 +6458,16 @@ int ObInnerTableSchema::all_virtual_sequence_object_history_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_raid_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_raid_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6517,168 +6498,168 @@ int ObInnerTableSchema::all_virtual_raid_stat_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_idx", // 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 + ADD_COLUMN_SCHEMA("disk_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("install_seq", // 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 + ADD_COLUMN_SCHEMA("install_seq", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_num", // 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 + ADD_COLUMN_SCHEMA("data_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parity_num", // 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 + ADD_COLUMN_SCHEMA("parity_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_ts", // 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 + ADD_COLUMN_SCHEMA("create_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_ts", // 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 + ADD_COLUMN_SCHEMA("finish_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("alias_name", // 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 - MAX_PATH_SIZE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("alias_name", //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 + MAX_PATH_SIZE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("percent", // 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 + ADD_COLUMN_SCHEMA("percent", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -6696,17 +6677,16 @@ int ObInnerTableSchema::all_virtual_raid_stat_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_server_log_meta_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_server_log_meta_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6737,185 +6717,185 @@ int ObInnerTableSchema::all_virtual_server_log_meta_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_idx", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_log_id", // column_name - ++column_id, // column_id - 5, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("start_log_id", //column_name + ++column_id, //column_id + 5, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_log_timestamp", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("start_log_timestamp", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 7, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 7, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 8, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 8, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("end_log_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("end_log_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("end_log_timestamp", // 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 + ADD_COLUMN_SCHEMA("end_log_timestamp", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6925,17 +6905,16 @@ int ObInnerTableSchema::all_virtual_server_log_meta_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_dtl_channel_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_dtl_channel_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6966,352 +6945,352 @@ int ObInnerTableSchema::all_virtual_dtl_channel_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("channel_id", // 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 + ADD_COLUMN_SCHEMA("channel_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("op_id", // 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 + ADD_COLUMN_SCHEMA("op_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("peer_id", // 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 + ADD_COLUMN_SCHEMA("peer_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_local", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_local", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_data", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_data", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_transmit", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_transmit", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("alloc_buffer_cnt", // 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 + ADD_COLUMN_SCHEMA("alloc_buffer_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("free_buffer_cnt", // 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 + ADD_COLUMN_SCHEMA("free_buffer_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("send_buffer_cnt", // 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 + ADD_COLUMN_SCHEMA("send_buffer_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("recv_buffer_cnt", // 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 + ADD_COLUMN_SCHEMA("recv_buffer_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("processed_buffer_cnt", // 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 + ADD_COLUMN_SCHEMA("processed_buffer_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("send_buffer_size", // 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 + ADD_COLUMN_SCHEMA("send_buffer_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hash_val", // 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 + ADD_COLUMN_SCHEMA("hash_val", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("buffer_pool_id", // 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 + ADD_COLUMN_SCHEMA("buffer_pool_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pins", // 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 + ADD_COLUMN_SCHEMA("pins", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("first_in_ts", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("first_in_ts", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("first_out_ts", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("first_out_ts", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("last_int_ts", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("last_int_ts", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("last_out_ts", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("last_out_ts", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 + ADD_COLUMN_SCHEMA("status", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -7329,17 +7308,16 @@ int ObInnerTableSchema::all_virtual_dtl_channel_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_dtl_memory_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_dtl_memory_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7370,243 +7348,243 @@ int ObInnerTableSchema::all_virtual_dtl_memory_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("channel_total_cnt", // 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 + ADD_COLUMN_SCHEMA("channel_total_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("channel_block_cnt", // 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 + ADD_COLUMN_SCHEMA("channel_block_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_parallel_cnt", // 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 + ADD_COLUMN_SCHEMA("max_parallel_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_blocked_buffer_size", // 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 + ADD_COLUMN_SCHEMA("max_blocked_buffer_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("accumulated_blocked_cnt", // 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 + ADD_COLUMN_SCHEMA("accumulated_blocked_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("current_buffer_used", // 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 + ADD_COLUMN_SCHEMA("current_buffer_used", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("seqno", // 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 + ADD_COLUMN_SCHEMA("seqno", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("alloc_cnt", // 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 + ADD_COLUMN_SCHEMA("alloc_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("free_cnt", // 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 + ADD_COLUMN_SCHEMA("free_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("free_queue_len", // 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 + ADD_COLUMN_SCHEMA("free_queue_len", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_memory_size", // 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 + ADD_COLUMN_SCHEMA("total_memory_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("real_alloc_cnt", // 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 + ADD_COLUMN_SCHEMA("real_alloc_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("real_free_cnt", // 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 + ADD_COLUMN_SCHEMA("real_free_cnt", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -7624,17 +7602,16 @@ int ObInnerTableSchema::all_virtual_dtl_memory_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_dtl_first_cached_buffer_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_dtl_first_cached_buffer_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7665,109 +7642,109 @@ int ObInnerTableSchema::all_virtual_dtl_first_cached_buffer_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("channel_id", // 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 + ADD_COLUMN_SCHEMA("channel_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("calced_val", // 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 + ADD_COLUMN_SCHEMA("calced_val", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("buffer_pool_id", // 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 + ADD_COLUMN_SCHEMA("buffer_pool_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("timeout_ts", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("timeout_ts", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -7785,17 +7762,16 @@ int ObInnerTableSchema::all_virtual_dtl_first_cached_buffer_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_dblink_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_dblink_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7826,185 +7802,185 @@ int ObInnerTableSchema::all_virtual_dblink_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dblink_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("dblink_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dblink_name", // 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 - OB_MAX_DBLINK_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dblink_name", //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 + OB_MAX_DBLINK_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 + ADD_COLUMN_SCHEMA("owner_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("host_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("host_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("host_port", // 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 + ADD_COLUMN_SCHEMA("host_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_name", // 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 - OB_MAX_CLUSTER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_name", //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 + OB_MAX_CLUSTER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_name", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_name", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("password", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8014,17 +7990,16 @@ int ObInnerTableSchema::all_virtual_dblink_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_dblink_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_dblink_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8055,215 +8030,215 @@ int ObInnerTableSchema::all_virtual_dblink_history_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dblink_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("dblink_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dblink_name", // 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 - OB_MAX_DBLINK_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dblink_name", //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 + OB_MAX_DBLINK_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("host_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("host_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("host_port", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("host_port", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_name", // 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 - OB_MAX_CLUSTER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_name", //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 + OB_MAX_CLUSTER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_name", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_name", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("password", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //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(FLAT_ROW_STORE); @@ -8273,17 +8248,16 @@ int ObInnerTableSchema::all_virtual_dblink_history_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_partition_meta_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_partition_meta_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8314,246 +8288,246 @@ int ObInnerTableSchema::all_virtual_tenant_partition_meta_table_schema(ObTableSc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - 32, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + 32, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role", // 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 + ADD_COLUMN_SCHEMA("role", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_count", // 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 + ADD_COLUMN_SCHEMA("row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_size", // 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 + ADD_COLUMN_SCHEMA("data_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_version", // 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 + ADD_COLUMN_SCHEMA("data_version", //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 } if (OB_SUCC(ret)) { ObObj required_size_default; required_size_default.set_int(0); - ADD_COLUMN_SCHEMA_T("required_size", // 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 - required_size_default, - required_size_default); // default_value + ADD_COLUMN_SCHEMA_T("required_size", //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 + required_size_default, + required_size_default); //default_value } if (OB_SUCC(ret)) { ObObj replica_type_default; replica_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("replica_type", // 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 - replica_type_default, - replica_type_default); // default_value + ADD_COLUMN_SCHEMA_T("replica_type", //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 + replica_type_default, + replica_type_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("REPLICA_STATUS_NORMAL")); - ADD_COLUMN_SCHEMA_T("status", // 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 - MAX_REPLICA_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + MAX_REPLICA_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { ObObj data_checksum_default; data_checksum_default.set_int(0); - ADD_COLUMN_SCHEMA_T("data_checksum", // 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 - data_checksum_default, - data_checksum_default); // default_value + ADD_COLUMN_SCHEMA_T("data_checksum", //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 + data_checksum_default, + data_checksum_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8563,17 +8537,16 @@ int ObInnerTableSchema::all_virtual_tenant_partition_meta_table_schema(ObTableSc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_role_grantee_map_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_role_grantee_map_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8604,118 +8577,118 @@ int ObInnerTableSchema::all_virtual_tenant_role_grantee_map_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grantee_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("grantee_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("role_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj admin_option_default; admin_option_default.set_int(0); - ADD_COLUMN_SCHEMA_T("admin_option", // 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 - admin_option_default, - admin_option_default); // default_value + ADD_COLUMN_SCHEMA_T("admin_option", //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 + admin_option_default, + admin_option_default); //default_value } if (OB_SUCC(ret)) { ObObj disable_flag_default; disable_flag_default.set_int(0); - ADD_COLUMN_SCHEMA_T("disable_flag", // 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 - disable_flag_default, - disable_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("disable_flag", //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 + disable_flag_default, + disable_flag_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8725,17 +8698,16 @@ int ObInnerTableSchema::all_virtual_tenant_role_grantee_map_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_role_grantee_map_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_role_grantee_map_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8766,148 +8738,148 @@ int ObInnerTableSchema::all_virtual_tenant_role_grantee_map_history_schema(ObTab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grantee_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("grantee_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("role_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj admin_option_default; admin_option_default.set_int(0); - ADD_COLUMN_SCHEMA_T("admin_option", // 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 - true, // is_nullable - false, // is_autoincrement - admin_option_default, - admin_option_default); // default_value + ADD_COLUMN_SCHEMA_T("admin_option", //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 + true, //is_nullable + false, //is_autoincrement + admin_option_default, + admin_option_default); //default_value } if (OB_SUCC(ret)) { ObObj disable_flag_default; disable_flag_default.set_int(0); - ADD_COLUMN_SCHEMA_T("disable_flag", // 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 - true, // is_nullable - false, // is_autoincrement - disable_flag_default, - disable_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("disable_flag", //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 + true, //is_nullable + false, //is_autoincrement + disable_flag_default, + disable_flag_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8917,17 +8889,16 @@ int ObInnerTableSchema::all_virtual_tenant_role_grantee_map_history_schema(ObTab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_keystore_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_keystore_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8958,144 +8929,144 @@ int ObInnerTableSchema::all_virtual_tenant_keystore_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("keystore_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("keystore_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("keystore_name", // 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 - OB_MAX_KEYSTORE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("keystore_name", //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 + OB_MAX_KEYSTORE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("password", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("status", // 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 - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("master_key_id", // 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 + ADD_COLUMN_SCHEMA("master_key_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("master_key", // 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 - OB_MAX_MASTER_KEY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("master_key", //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 + OB_MAX_MASTER_KEY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9105,17 +9076,16 @@ int ObInnerTableSchema::all_virtual_tenant_keystore_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_keystore_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_keystore_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9146,174 +9116,174 @@ int ObInnerTableSchema::all_virtual_tenant_keystore_history_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("keystore_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("keystore_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("keystore_name", // 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 - OB_MAX_KEYSTORE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("keystore_name", //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 + OB_MAX_KEYSTORE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("password", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("status", // 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 - true, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + true, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("master_key_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("master_key_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("master_key", // 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 - OB_MAX_MASTER_KEY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("master_key", //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 + OB_MAX_MASTER_KEY_LENGTH, //column_length + -1, //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(FLAT_ROW_STORE); @@ -9323,17 +9293,16 @@ int ObInnerTableSchema::all_virtual_tenant_keystore_history_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_deadlock_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_deadlock_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9364,183 +9333,183 @@ int ObInnerTableSchema::all_virtual_deadlock_stat_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cycle_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cycle_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cycle_seq", // 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 + ADD_COLUMN_SCHEMA("cycle_seq", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // 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 + ADD_COLUMN_SCHEMA("session_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_key", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("row_key", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("waiter_trans_id", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("waiter_trans_id", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("holder_trans_id", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("holder_trans_id", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("deadlock_rollbacked", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("deadlock_rollbacked", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cycle_detect_ts", // 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 + ADD_COLUMN_SCHEMA("cycle_detect_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("lock_wait_ts", // 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 + ADD_COLUMN_SCHEMA("lock_wait_ts", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -9558,17 +9527,16 @@ int ObInnerTableSchema::all_virtual_deadlock_stat_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_tablespace_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_tablespace_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9599,125 +9567,125 @@ int ObInnerTableSchema::all_virtual_tenant_tablespace_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablespace_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("tablespace_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablespace_name", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tablespace_name", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("encryption_name", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("encryption_name", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("encrypt_key", // 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_MASTER_KEY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("encrypt_key", //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_MASTER_KEY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("master_key_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("master_key_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9727,17 +9695,16 @@ int ObInnerTableSchema::all_virtual_tenant_tablespace_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_tablespace_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_tablespace_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9768,155 +9735,155 @@ int ObInnerTableSchema::all_virtual_tenant_tablespace_history_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablespace_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("tablespace_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablespace_name", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tablespace_name", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("encryption_name", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("encryption_name", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("encrypt_key", // 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_MASTER_KEY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("encrypt_key", //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_MASTER_KEY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("master_key_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("master_key_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //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(FLAT_ROW_STORE); @@ -9926,17 +9893,16 @@ int ObInnerTableSchema::all_virtual_tenant_tablespace_history_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_information_columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_information_columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9967,358 +9933,358 @@ int ObInnerTableSchema::all_virtual_information_columns_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLE_SCHEMA", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TABLE_SCHEMA", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLE_NAME", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TABLE_NAME", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj table_catalog_default; table_catalog_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("TABLE_CATALOG", // 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 - MAX_TABLE_CATALOG_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_catalog_default, - table_catalog_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_CATALOG", //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 + MAX_TABLE_CATALOG_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_catalog_default, + table_catalog_default); //default_value } if (OB_SUCC(ret)) { ObObj column_name_default; column_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("COLUMN_NAME", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - column_name_default, - column_name_default); // default_value + ADD_COLUMN_SCHEMA_T("COLUMN_NAME", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + column_name_default, + column_name_default); //default_value } if (OB_SUCC(ret)) { ObObj ordinal_position_default; ordinal_position_default.set_uint64(0); - ADD_COLUMN_SCHEMA_T("ORDINAL_POSITION", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - ordinal_position_default, - ordinal_position_default); // default_value + ADD_COLUMN_SCHEMA_T("ORDINAL_POSITION", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + ordinal_position_default, + ordinal_position_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COLUMN_DEFAULT", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLUMN_DEFAULT", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj is_nullable_default; is_nullable_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("IS_NULLABLE", // 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 - COLUMN_NULLABLE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_nullable_default, - is_nullable_default); // default_value + ADD_COLUMN_SCHEMA_T("IS_NULLABLE", //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 + COLUMN_NULLABLE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_nullable_default, + is_nullable_default); //default_value } if (OB_SUCC(ret)) { ObObj data_type_default; data_type_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("DATA_TYPE", // 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 - COLUMN_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - data_type_default, - data_type_default); // default_value + ADD_COLUMN_SCHEMA_T("DATA_TYPE", //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 + COLUMN_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + data_type_default, + data_type_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHARACTER_MAXIMUM_LENGTH", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CHARACTER_MAXIMUM_LENGTH", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHARACTER_OCTET_LENGTH", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CHARACTER_OCTET_LENGTH", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NUMERIC_PRECISION", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NUMERIC_PRECISION", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NUMERIC_SCALE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NUMERIC_SCALE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATETIME_PRECISION", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DATETIME_PRECISION", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHARACTER_SET_NAME", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CHARACTER_SET_NAME", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COLLATION_NAME", // 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 - MAX_COLLATION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLLATION_NAME", //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 + MAX_COLLATION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COLUMN_TYPE", // 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 - COLUMN_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLUMN_TYPE", //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 + COLUMN_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj column_key_default; column_key_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("COLUMN_KEY", // 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 - MAX_COLUMN_KEY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - column_key_default, - column_key_default); // default_value + ADD_COLUMN_SCHEMA_T("COLUMN_KEY", //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 + MAX_COLUMN_KEY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + column_key_default, + column_key_default); //default_value } if (OB_SUCC(ret)) { ObObj extra_default; extra_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("EXTRA", // 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 - COLUMN_EXTRA_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - extra_default, - extra_default); // default_value + ADD_COLUMN_SCHEMA_T("EXTRA", //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 + COLUMN_EXTRA_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + extra_default, + extra_default); //default_value } if (OB_SUCC(ret)) { ObObj privileges_default; privileges_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("PRIVILEGES", // 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 - MAX_COLUMN_PRIVILEGE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - privileges_default, - privileges_default); // default_value + ADD_COLUMN_SCHEMA_T("PRIVILEGES", //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 + MAX_COLUMN_PRIVILEGE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + privileges_default, + privileges_default); //default_value } if (OB_SUCC(ret)) { ObObj column_comment_default; column_comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("COLUMN_COMMENT", // 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 - MAX_COLUMN_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - column_comment_default, - column_comment_default); // default_value + ADD_COLUMN_SCHEMA_T("COLUMN_COMMENT", //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 + MAX_COLUMN_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + column_comment_default, + column_comment_default); //default_value } if (OB_SUCC(ret)) { ObObj generation_expression_default; generation_expression_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("GENERATION_EXPRESSION", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - generation_expression_default, - generation_expression_default); // default_value + ADD_COLUMN_SCHEMA_T("GENERATION_EXPRESSION", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + generation_expression_default, + generation_expression_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10328,17 +10294,16 @@ int ObInnerTableSchema::all_virtual_information_columns_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_pg_partition_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_pg_partition_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10369,293 +10334,293 @@ int ObInnerTableSchema::all_virtual_pg_partition_info_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_idx", // 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 + ADD_COLUMN_SCHEMA("partition_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tg_id", // 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 + ADD_COLUMN_SCHEMA("tg_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pg_idx", // 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 + ADD_COLUMN_SCHEMA("pg_idx", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_decided_trans_version", // 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 + ADD_COLUMN_SCHEMA("max_decided_trans_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_passed_trans_ts", // 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 + ADD_COLUMN_SCHEMA("max_passed_trans_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("freeze_ts", // 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 + ADD_COLUMN_SCHEMA("freeze_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("allow_gc", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("allow_gc", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_state", // 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 - TABLE_MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition_state", //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 + TABLE_MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj min_log_service_ts_default; min_log_service_ts_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("min_log_service_ts", // 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 - min_log_service_ts_default, - min_log_service_ts_default); // default_value + ADD_COLUMN_SCHEMA_T("min_log_service_ts", //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 + min_log_service_ts_default, + min_log_service_ts_default); //default_value } if (OB_SUCC(ret)) { ObObj min_trans_service_ts_default; min_trans_service_ts_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("min_trans_service_ts", // 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 - min_trans_service_ts_default, - min_trans_service_ts_default); // default_value + ADD_COLUMN_SCHEMA_T("min_trans_service_ts", //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 + min_trans_service_ts_default, + min_trans_service_ts_default); //default_value } if (OB_SUCC(ret)) { ObObj min_replay_engine_ts_default; min_replay_engine_ts_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("min_replay_engine_ts", // 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 - min_replay_engine_ts_default, - min_replay_engine_ts_default); // default_value + ADD_COLUMN_SCHEMA_T("min_replay_engine_ts", //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 + min_replay_engine_ts_default, + min_replay_engine_ts_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_pg", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_pg", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj weak_read_timestamp_default; weak_read_timestamp_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("weak_read_timestamp", // 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 - weak_read_timestamp_default, - weak_read_timestamp_default); // default_value + ADD_COLUMN_SCHEMA_T("weak_read_timestamp", //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 + weak_read_timestamp_default, + weak_read_timestamp_default); //default_value } if (OB_SUCC(ret)) { ObObj replica_type_default; replica_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("replica_type", // 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 - replica_type_default, - replica_type_default); // default_value + ADD_COLUMN_SCHEMA_T("replica_type", //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 + replica_type_default, + replica_type_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -10673,17 +10638,16 @@ int ObInnerTableSchema::all_virtual_pg_partition_info_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_user_failed_login_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_user_failed_login_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10714,114 +10678,114 @@ int ObInnerTableSchema::all_virtual_tenant_user_failed_login_stat_schema(ObTable table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_name", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_name", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("failed_login_attempts", // 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 + ADD_COLUMN_SCHEMA("failed_login_attempts", //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 } if (OB_SUCC(ret)) { ObObj last_failed_login_svr_ip_default; last_failed_login_svr_ip_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("last_failed_login_svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - last_failed_login_svr_ip_default, - last_failed_login_svr_ip_default); // default_value + ADD_COLUMN_SCHEMA_T("last_failed_login_svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + last_failed_login_svr_ip_default, + last_failed_login_svr_ip_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10831,17 +10795,16 @@ int ObInnerTableSchema::all_virtual_tenant_user_failed_login_stat_schema(ObTable table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_profile_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_profile_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10872,220 +10835,220 @@ int ObInnerTableSchema::all_virtual_tenant_profile_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("profile_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("profile_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("profile_name", // 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 - OB_MAX_SQL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("profile_name", //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 + OB_MAX_SQL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("failed_login_attempts", // 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 + ADD_COLUMN_SCHEMA("failed_login_attempts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password_lock_time", // 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 + ADD_COLUMN_SCHEMA("password_lock_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password_verify_function", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("password_verify_function", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj password_life_time_default; password_life_time_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("password_life_time", // 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 - password_life_time_default, - password_life_time_default); // default_value + ADD_COLUMN_SCHEMA_T("password_life_time", //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 + password_life_time_default, + password_life_time_default); //default_value } if (OB_SUCC(ret)) { ObObj password_grace_time_default; password_grace_time_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("password_grace_time", // 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 - password_grace_time_default, - password_grace_time_default); // default_value + ADD_COLUMN_SCHEMA_T("password_grace_time", //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 + password_grace_time_default, + password_grace_time_default); //default_value } if (OB_SUCC(ret)) { ObObj password_reuse_time_default; password_reuse_time_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("password_reuse_time", // 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 - password_reuse_time_default, - password_reuse_time_default); // default_value + ADD_COLUMN_SCHEMA_T("password_reuse_time", //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 + password_reuse_time_default, + password_reuse_time_default); //default_value } if (OB_SUCC(ret)) { ObObj password_reuse_max_default; password_reuse_max_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("password_reuse_max", // 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 - password_reuse_max_default, - password_reuse_max_default); // default_value + ADD_COLUMN_SCHEMA_T("password_reuse_max", //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 + password_reuse_max_default, + password_reuse_max_default); //default_value } if (OB_SUCC(ret)) { ObObj inactive_account_time_default; inactive_account_time_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("inactive_account_time", // 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 - inactive_account_time_default, - inactive_account_time_default); // default_value + ADD_COLUMN_SCHEMA_T("inactive_account_time", //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 + inactive_account_time_default, + inactive_account_time_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11095,17 +11058,16 @@ int ObInnerTableSchema::all_virtual_tenant_profile_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_profile_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_profile_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11136,250 +11098,250 @@ int ObInnerTableSchema::all_virtual_tenant_profile_history_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("profile_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("profile_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("profile_name", // 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 - OB_MAX_SQL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("profile_name", //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 + OB_MAX_SQL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("failed_login_attempts", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("failed_login_attempts", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password_lock_time", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("password_lock_time", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password_verify_function", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("password_verify_function", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj password_life_time_default; password_life_time_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("password_life_time", // 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 - true, // is_nullable - false, // is_autoincrement - password_life_time_default, - password_life_time_default); // default_value + ADD_COLUMN_SCHEMA_T("password_life_time", //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 + true, //is_nullable + false, //is_autoincrement + password_life_time_default, + password_life_time_default); //default_value } if (OB_SUCC(ret)) { ObObj password_grace_time_default; password_grace_time_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("password_grace_time", // 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 - true, // is_nullable - false, // is_autoincrement - password_grace_time_default, - password_grace_time_default); // default_value + ADD_COLUMN_SCHEMA_T("password_grace_time", //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 + true, //is_nullable + false, //is_autoincrement + password_grace_time_default, + password_grace_time_default); //default_value } if (OB_SUCC(ret)) { ObObj password_reuse_time_default; password_reuse_time_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("password_reuse_time", // 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 - true, // is_nullable - false, // is_autoincrement - password_reuse_time_default, - password_reuse_time_default); // default_value + ADD_COLUMN_SCHEMA_T("password_reuse_time", //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 + true, //is_nullable + false, //is_autoincrement + password_reuse_time_default, + password_reuse_time_default); //default_value } if (OB_SUCC(ret)) { ObObj password_reuse_max_default; password_reuse_max_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("password_reuse_max", // 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 - true, // is_nullable - false, // is_autoincrement - password_reuse_max_default, - password_reuse_max_default); // default_value + ADD_COLUMN_SCHEMA_T("password_reuse_max", //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 + true, //is_nullable + false, //is_autoincrement + password_reuse_max_default, + password_reuse_max_default); //default_value } if (OB_SUCC(ret)) { ObObj inactive_account_time_default; inactive_account_time_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("inactive_account_time", // 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 - true, // is_nullable - false, // is_autoincrement - inactive_account_time_default, - inactive_account_time_default); // default_value + ADD_COLUMN_SCHEMA_T("inactive_account_time", //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 + true, //is_nullable + false, //is_autoincrement + inactive_account_time_default, + inactive_account_time_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11389,17 +11351,16 @@ int ObInnerTableSchema::all_virtual_tenant_profile_history_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_security_audit_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_security_audit_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11430,140 +11391,140 @@ int ObInnerTableSchema::all_virtual_security_audit_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("audit_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("audit_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("audit_type", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("audit_type", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("operation_type", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("operation_type", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("in_success", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("in_success", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("in_failure", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("in_failure", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11573,10 +11534,10 @@ int ObInnerTableSchema::all_virtual_security_audit_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.12151_12200.cpp b/src/share/inner_table/ob_inner_table_schema.12151_12200.cpp index d872f8359..1e2ff6648 100644 --- a/src/share/inner_table/ob_inner_table_schema.12151_12200.cpp +++ b/src/share/inner_table/ob_inner_table_schema.12151_12200.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::all_virtual_security_audit_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_security_audit_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -58,170 +60,170 @@ int ObInnerTableSchema::all_virtual_security_audit_history_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("audit_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("audit_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("audit_type", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("audit_type", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("operation_type", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("operation_type", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("in_success", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("in_success", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("in_failure", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("in_failure", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //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(FLAT_ROW_STORE); @@ -231,17 +233,16 @@ int ObInnerTableSchema::all_virtual_security_audit_history_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_trigger_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_trigger_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -272,395 +273,395 @@ int ObInnerTableSchema::all_virtual_trigger_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("trigger_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_name", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trigger_name", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 + ADD_COLUMN_SCHEMA("owner_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_type", // 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 + ADD_COLUMN_SCHEMA("trigger_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_events", // 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 + ADD_COLUMN_SCHEMA("trigger_events", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("timing_points", // 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 + ADD_COLUMN_SCHEMA("timing_points", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("base_object_type", // 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 + ADD_COLUMN_SCHEMA("base_object_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("base_object_id", // 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 + ADD_COLUMN_SCHEMA("base_object_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_flags", // 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 + ADD_COLUMN_SCHEMA("trigger_flags", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("update_columns", // 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 - OB_MAX_UPDATE_COLUMNS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("update_columns", //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 + OB_MAX_UPDATE_COLUMNS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_old_name", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ref_old_name", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_new_name", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ref_new_name", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_parent_name", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ref_parent_name", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("when_condition", // 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 - OB_MAX_WHEN_CONDITION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("when_condition", //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 + OB_MAX_WHEN_CONDITION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_body", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trigger_body", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_spec_source", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_spec_source", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_body_source", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_body_source", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_flag", // 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 + ADD_COLUMN_SCHEMA("package_flag", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_comp_flag", // 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 + ADD_COLUMN_SCHEMA("package_comp_flag", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_exec_env", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_exec_env", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_mode", // 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 + ADD_COLUMN_SCHEMA("sql_mode", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -670,17 +671,16 @@ int ObInnerTableSchema::all_virtual_trigger_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_trigger_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_trigger_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -711,410 +711,410 @@ int ObInnerTableSchema::all_virtual_trigger_history_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("trigger_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_name", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trigger_name", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trigger_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_events", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trigger_events", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("timing_points", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("timing_points", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("base_object_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("base_object_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("base_object_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("base_object_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_flags", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trigger_flags", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("update_columns", // 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 - OB_MAX_UPDATE_COLUMNS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("update_columns", //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 + OB_MAX_UPDATE_COLUMNS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_old_name", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ref_old_name", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_new_name", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ref_new_name", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_parent_name", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ref_parent_name", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("when_condition", // 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 - OB_MAX_WHEN_CONDITION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("when_condition", //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 + OB_MAX_WHEN_CONDITION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_body", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trigger_body", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_spec_source", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_spec_source", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_body_source", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_body_source", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_comp_flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_comp_flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_exec_env", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_exec_env", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_mode", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_mode", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1124,17 +1124,16 @@ int ObInnerTableSchema::all_virtual_trigger_history_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_cluster_stats_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_cluster_stats_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1165,78 +1164,78 @@ int ObInnerTableSchema::all_virtual_cluster_stats_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("refreshed_schema_version", // 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 + ADD_COLUMN_SCHEMA("refreshed_schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ddl_lag", // 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 + ADD_COLUMN_SCHEMA("ddl_lag", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_sys_table_scn", // 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 + ADD_COLUMN_SCHEMA("min_sys_table_scn", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_user_table_scn", // 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 + ADD_COLUMN_SCHEMA("min_user_table_scn", //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 } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1246,17 +1245,16 @@ int ObInnerTableSchema::all_virtual_cluster_stats_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sstable_column_checksum_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sstable_column_checksum_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1287,230 +1285,230 @@ int ObInnerTableSchema::all_virtual_sstable_column_checksum_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("data_table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("index_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sstable_type", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("sstable_type", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 7, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 7, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 8, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 8, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_checksum", // 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 + ADD_COLUMN_SCHEMA("column_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("checksum_method", // 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 + ADD_COLUMN_SCHEMA("checksum_method", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_type", // 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 + ADD_COLUMN_SCHEMA("replica_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("major_version", // 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 + ADD_COLUMN_SCHEMA("major_version", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1520,17 +1518,16 @@ int ObInnerTableSchema::all_virtual_sstable_column_checksum_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_ps_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_ps_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1561,108 +1558,108 @@ int ObInnerTableSchema::all_virtual_ps_stat_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("stmt_count", // 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 + ADD_COLUMN_SCHEMA("stmt_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hit_count", // 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 + ADD_COLUMN_SCHEMA("hit_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("access_count", // 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 + ADD_COLUMN_SCHEMA("access_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mem_hold", // 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 + ADD_COLUMN_SCHEMA("mem_hold", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -1680,17 +1677,16 @@ int ObInnerTableSchema::all_virtual_ps_stat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_ps_item_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_ps_item_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1721,198 +1717,198 @@ int ObInnerTableSchema::all_virtual_ps_item_info_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("stmt_id", // 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 + ADD_COLUMN_SCHEMA("stmt_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("db_id", // 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 + ADD_COLUMN_SCHEMA("db_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ps_sql", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ps_sql", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_count", // 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 + ADD_COLUMN_SCHEMA("param_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("stmt_item_ref_count", // 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 + ADD_COLUMN_SCHEMA("stmt_item_ref_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("stmt_info_ref_count", // 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 + ADD_COLUMN_SCHEMA("stmt_info_ref_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mem_hold", // 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 + ADD_COLUMN_SCHEMA("mem_hold", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("stmt_type", // 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 + ADD_COLUMN_SCHEMA("stmt_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("checksum", // 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 + ADD_COLUMN_SCHEMA("checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("expired", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("expired", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -1930,17 +1926,16 @@ int ObInnerTableSchema::all_virtual_ps_item_info_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_workarea_history_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_workarea_history_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1971,303 +1966,303 @@ int ObInnerTableSchema::all_virtual_sql_workarea_history_stat_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_id", // 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 + ADD_COLUMN_SCHEMA("plan_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_id", // 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 - OB_MAX_SQL_ID_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_id", //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 + OB_MAX_SQL_ID_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("operation_type", // 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 - 40, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("operation_type", //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 + 40, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("operation_id", // 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 + ADD_COLUMN_SCHEMA("operation_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("estimated_optimal_size", // 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 + ADD_COLUMN_SCHEMA("estimated_optimal_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("estimated_onepass_size", // 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 + ADD_COLUMN_SCHEMA("estimated_onepass_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_memory_used", // 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 + ADD_COLUMN_SCHEMA("last_memory_used", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_execution", // 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 - 10, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("last_execution", //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 + 10, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_degree", // 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 + ADD_COLUMN_SCHEMA("last_degree", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_executions", // 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 + ADD_COLUMN_SCHEMA("total_executions", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("optimal_executions", // 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 + ADD_COLUMN_SCHEMA("optimal_executions", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("onepass_executions", // 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 + ADD_COLUMN_SCHEMA("onepass_executions", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("multipasses_executions", // 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 + ADD_COLUMN_SCHEMA("multipasses_executions", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("active_time", // 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 + ADD_COLUMN_SCHEMA("active_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_tempseg_size", // 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 + ADD_COLUMN_SCHEMA("max_tempseg_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("last_tempseg_size", // 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 + ADD_COLUMN_SCHEMA("last_tempseg_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("policy", // 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 - 10, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("policy", //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 + 10, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -2285,17 +2280,16 @@ int ObInnerTableSchema::all_virtual_sql_workarea_history_stat_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_workarea_active_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_workarea_active_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2326,258 +2320,258 @@ int ObInnerTableSchema::all_virtual_sql_workarea_active_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_id", // 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 + ADD_COLUMN_SCHEMA("plan_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_id", // 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 - OB_MAX_SQL_ID_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_id", //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 + OB_MAX_SQL_ID_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_exec_id", // 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 + ADD_COLUMN_SCHEMA("sql_exec_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("operation_type", // 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 - 40, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("operation_type", //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 + 40, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("operation_id", // 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 + ADD_COLUMN_SCHEMA("operation_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sid", // 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 + ADD_COLUMN_SCHEMA("sid", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("active_time", // 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 + ADD_COLUMN_SCHEMA("active_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("work_area_size", // 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 + ADD_COLUMN_SCHEMA("work_area_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("expect_size", // 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 + ADD_COLUMN_SCHEMA("expect_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("actual_mem_used", // 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 + ADD_COLUMN_SCHEMA("actual_mem_used", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_mem_used", // 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 + ADD_COLUMN_SCHEMA("max_mem_used", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("number_passes", // 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 + ADD_COLUMN_SCHEMA("number_passes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tempseg_size", // 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 + ADD_COLUMN_SCHEMA("tempseg_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("policy", // 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 - 6, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("policy", //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 + 6, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -2595,17 +2589,16 @@ int ObInnerTableSchema::all_virtual_sql_workarea_active_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_workarea_histogram_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_workarea_histogram_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2636,138 +2629,138 @@ int ObInnerTableSchema::all_virtual_sql_workarea_histogram_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("low_optimal_size", // 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 + ADD_COLUMN_SCHEMA("low_optimal_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_optimal_size", // 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 + ADD_COLUMN_SCHEMA("high_optimal_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("optimal_executions", // 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 + ADD_COLUMN_SCHEMA("optimal_executions", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("onepass_executions", // 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 + ADD_COLUMN_SCHEMA("onepass_executions", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("multipasses_executions", // 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 + ADD_COLUMN_SCHEMA("multipasses_executions", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_executions", // 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 + ADD_COLUMN_SCHEMA("total_executions", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -2785,17 +2778,16 @@ int ObInnerTableSchema::all_virtual_sql_workarea_histogram_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_workarea_memory_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_workarea_memory_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2826,183 +2818,183 @@ int ObInnerTableSchema::all_virtual_sql_workarea_memory_info_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_workarea_size", // 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 + ADD_COLUMN_SCHEMA("max_workarea_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("workarea_hold_size", // 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 + ADD_COLUMN_SCHEMA("workarea_hold_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_auto_workarea_size", // 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 + ADD_COLUMN_SCHEMA("max_auto_workarea_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("mem_target", // 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 + ADD_COLUMN_SCHEMA("mem_target", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_mem_used", // 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 + ADD_COLUMN_SCHEMA("total_mem_used", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("global_mem_bound", // 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 + ADD_COLUMN_SCHEMA("global_mem_bound", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("drift_size", // 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 + ADD_COLUMN_SCHEMA("drift_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("workarea_count", // 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 + ADD_COLUMN_SCHEMA("workarea_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("manual_calc_count", // 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 + ADD_COLUMN_SCHEMA("manual_calc_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -3020,17 +3012,16 @@ int ObInnerTableSchema::all_virtual_sql_workarea_memory_info_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_security_audit_record_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_security_audit_record_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3061,667 +3052,667 @@ int ObInnerTableSchema::all_virtual_security_audit_record_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("record_timestamp_us", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("record_timestamp_us", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_name", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_name", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("effective_user_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("effective_user_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("effective_user_name", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("effective_user_name", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("client_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("client_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_client_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_client_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("proxy_session_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("proxy_session_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("session_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("entry_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("entry_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("statement_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("statement_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_id", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trans_id", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("commit_version", // 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 + ADD_COLUMN_SCHEMA("commit_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trace_id", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trace_id", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("db_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("db_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_db_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cur_db_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("sql_timestamp_us", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("sql_timestamp_us", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("audit_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("audit_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("audit_type", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("audit_type", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("operation_type", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("operation_type", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("action_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("action_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("return_code", // 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 + ADD_COLUMN_SCHEMA("return_code", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("obj_owner_name", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("obj_owner_name", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("obj_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("obj_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_obj_owner_name", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_obj_owner_name", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_obj_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_obj_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("auth_privileges", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("auth_privileges", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("auth_grantee", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("auth_grantee", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logoff_logical_read", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("logoff_logical_read", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logoff_physical_read", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("logoff_physical_read", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logoff_logical_write", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("logoff_logical_write", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logoff_lock_count", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("logoff_lock_count", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logoff_dead_lock", // 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 - 40, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("logoff_dead_lock", //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 + 40, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logoff_cpu_time_us", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("logoff_cpu_time_us", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logoff_exec_time_us", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("logoff_exec_time_us", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logoff_alive_time_us", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("logoff_alive_time_us", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment_text", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment_text", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_bind", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_bind", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_text", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_text", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //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(FLAT_ROW_STORE); @@ -3731,17 +3722,16 @@ int ObInnerTableSchema::all_virtual_security_audit_record_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sysauth_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sysauth_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3772,95 +3762,95 @@ int ObInnerTableSchema::all_virtual_sysauth_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grantee_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("grantee_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("priv_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_option", // 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 + ADD_COLUMN_SCHEMA("priv_option", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3870,17 +3860,16 @@ int ObInnerTableSchema::all_virtual_sysauth_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sysauth_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sysauth_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3911,125 +3900,125 @@ int ObInnerTableSchema::all_virtual_sysauth_history_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grantee_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("grantee_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("priv_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_option", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("priv_option", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4039,17 +4028,16 @@ int ObInnerTableSchema::all_virtual_sysauth_history_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_objauth_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_objauth_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4080,155 +4068,155 @@ int ObInnerTableSchema::all_virtual_objauth_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("obj_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("obj_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("objtype", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("objtype", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("col_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("col_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grantor_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("grantor_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grantee_id", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("grantee_id", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_id", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("priv_id", //column_name + ++column_id, //column_id + 7, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_option", // 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 + ADD_COLUMN_SCHEMA("priv_option", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4238,17 +4226,16 @@ int ObInnerTableSchema::all_virtual_objauth_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_objauth_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_objauth_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4279,185 +4266,185 @@ int ObInnerTableSchema::all_virtual_objauth_history_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("obj_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("obj_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("objtype", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("objtype", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("col_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("col_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grantor_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("grantor_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grantee_id", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("grantee_id", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_id", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("priv_id", //column_name + ++column_id, //column_id + 7, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 8, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 8, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_option", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("priv_option", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4467,17 +4454,16 @@ int ObInnerTableSchema::all_virtual_objauth_history_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_backup_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_backup_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4508,80 +4494,80 @@ int ObInnerTableSchema::all_virtual_backup_info_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_INNER_TABLE_DEFAULT_KEY_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_INNER_TABLE_DEFAULT_KEY_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_INNER_TABLE_DEFAULT_VALUE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_INNER_TABLE_DEFAULT_VALUE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4591,17 +4577,16 @@ int ObInnerTableSchema::all_virtual_backup_info_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_backup_log_archive_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_backup_log_archive_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4632,264 +4617,264 @@ int ObInnerTableSchema::all_virtual_backup_log_archive_status_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_archive_round", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("log_archive_round", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("min_first_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("min_first_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("max_next_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("max_next_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj input_bytes_default; input_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("input_bytes", // 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 - input_bytes_default, - input_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("input_bytes", //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 + input_bytes_default, + input_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj output_bytes_default; output_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("output_bytes", // 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 - output_bytes_default, - output_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("output_bytes", //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 + output_bytes_default, + output_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj deleted_input_bytes_default; deleted_input_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("deleted_input_bytes", // 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 - deleted_input_bytes_default, - deleted_input_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("deleted_input_bytes", //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 + deleted_input_bytes_default, + deleted_input_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj deleted_output_bytes_default; deleted_output_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("deleted_output_bytes", // 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 - deleted_output_bytes_default, - deleted_output_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("deleted_output_bytes", //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 + deleted_output_bytes_default, + deleted_output_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj pg_count_default; pg_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("pg_count", // 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 - pg_count_default, - pg_count_default); // default_value + ADD_COLUMN_SCHEMA_T("pg_count", //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 + pg_count_default, + pg_count_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { ObObj is_mount_file_created_default; is_mount_file_created_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_mount_file_created", // 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 - is_mount_file_created_default, - is_mount_file_created_default); // default_value + ADD_COLUMN_SCHEMA_T("is_mount_file_created", //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 + is_mount_file_created_default, + is_mount_file_created_default); //default_value } if (OB_SUCC(ret)) { ObObj compatible_default; compatible_default.set_int(0); - ADD_COLUMN_SCHEMA_T("compatible", // 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 - compatible_default, - compatible_default); // default_value + ADD_COLUMN_SCHEMA_T("compatible", //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 + compatible_default, + compatible_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4899,17 +4884,16 @@ int ObInnerTableSchema::all_virtual_backup_log_archive_status_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_backup_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_backup_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4940,495 +4924,495 @@ int ObInnerTableSchema::all_virtual_backup_task_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_type", // 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 - OB_INNER_TABLE_BACKUP_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_type", //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 + OB_INNER_TABLE_BACKUP_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("device_type", // 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 - OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("device_type", //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 + OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_full_backup_set_id", // 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 + ADD_COLUMN_SCHEMA("prev_full_backup_set_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_inc_backup_set_id", // 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 + ADD_COLUMN_SCHEMA("prev_inc_backup_set_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_backup_data_version", // 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 + ADD_COLUMN_SCHEMA("prev_backup_data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pg_count", // 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 + ADD_COLUMN_SCHEMA("pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_block_count", // 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 + ADD_COLUMN_SCHEMA("macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_pg_count", // 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 + ADD_COLUMN_SCHEMA("finish_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("input_bytes", // 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 + ADD_COLUMN_SCHEMA("input_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("output_bytes", // 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 + ADD_COLUMN_SCHEMA("output_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("end_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("end_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compatible", // 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 + ADD_COLUMN_SCHEMA("compatible", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version", // 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 + ADD_COLUMN_SCHEMA("cluster_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_data_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_data_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_schema_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_schema_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version_display", // 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 - OB_INNER_TABLE_BACKUP_TASK_CLUSTER_FORMAT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_version_display", //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 + OB_INNER_TABLE_BACKUP_TASK_CLUSTER_FORMAT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_count", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition_count", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("finish_partition_count", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj encryption_mode_default; encryption_mode_default.set_varchar(ObString::make_string("None")); - ADD_COLUMN_SCHEMA_T("encryption_mode", // 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 - OB_MAX_ENCRYPTION_MODE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - encryption_mode_default, - encryption_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("encryption_mode", //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 + OB_MAX_ENCRYPTION_MODE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + encryption_mode_default, + encryption_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj passwd_default; passwd_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("passwd", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - passwd_default, - passwd_default); // default_value + ADD_COLUMN_SCHEMA_T("passwd", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + passwd_default, + passwd_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5438,17 +5422,16 @@ int ObInnerTableSchema::all_virtual_backup_task_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_pg_backup_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_pg_backup_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5479,397 +5462,397 @@ int ObInnerTableSchema::all_virtual_pg_backup_task_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_type", // 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 - OB_INNER_TABLE_BACKUP_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_type", //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 + OB_INNER_TABLE_BACKUP_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_count", // 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 + ADD_COLUMN_SCHEMA("partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_block_count", // 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 + ADD_COLUMN_SCHEMA("macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 + ADD_COLUMN_SCHEMA("finish_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("input_bytes", // 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 + ADD_COLUMN_SCHEMA("input_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("output_bytes", // 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 + ADD_COLUMN_SCHEMA("output_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("end_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("end_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("retry_count", // 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 + ADD_COLUMN_SCHEMA("retry_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_role", // 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 + ADD_COLUMN_SCHEMA("replica_role", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_type", // 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 + ADD_COLUMN_SCHEMA("replica_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - OB_MAX_SERVER_ADDR_SIZE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + OB_MAX_SERVER_ADDR_SIZE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_id", // 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 + ADD_COLUMN_SCHEMA("task_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trace_id", // 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 - OB_MAX_TRACE_ID_BUFFER_SIZE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trace_id", //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 + OB_MAX_TRACE_ID_BUFFER_SIZE, //column_length + -1, //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(FLAT_ROW_STORE); @@ -5879,17 +5862,16 @@ int ObInnerTableSchema::all_virtual_pg_backup_task_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_pg_backup_log_archive_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_pg_backup_log_archive_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5920,198 +5902,198 @@ int ObInnerTableSchema::all_virtual_pg_backup_log_archive_status_schema(ObTableS table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // 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 + ADD_COLUMN_SCHEMA("incarnation", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_archive_round", // 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 + ADD_COLUMN_SCHEMA("log_archive_round", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_archive_start_ts", // 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 + ADD_COLUMN_SCHEMA("log_archive_start_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_archive_status", // 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 + ADD_COLUMN_SCHEMA("log_archive_status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_archive_cur_log_id", // 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 + ADD_COLUMN_SCHEMA("log_archive_cur_log_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_archive_cur_ts", // 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 + ADD_COLUMN_SCHEMA("log_archive_cur_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_log_id", // 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 + ADD_COLUMN_SCHEMA("max_log_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_log_ts", // 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 + ADD_COLUMN_SCHEMA("max_log_ts", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -6129,17 +6111,16 @@ int ObInnerTableSchema::all_virtual_pg_backup_log_archive_status_schema(ObTableS table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_server_backup_log_archive_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_server_backup_log_archive_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6170,123 +6151,123 @@ int ObInnerTableSchema::all_virtual_server_backup_log_archive_status_schema(ObTa table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // 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 + ADD_COLUMN_SCHEMA("incarnation", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_archive_round", // 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 + ADD_COLUMN_SCHEMA("log_archive_round", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_archive_start_ts", // 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 + ADD_COLUMN_SCHEMA("log_archive_start_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_archive_cur_ts", // 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 + ADD_COLUMN_SCHEMA("log_archive_cur_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pg_count", // 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 + ADD_COLUMN_SCHEMA("pg_count", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -6304,17 +6285,16 @@ int ObInnerTableSchema::all_virtual_server_backup_log_archive_status_schema(ObTa table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_error_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_error_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6345,200 +6325,200 @@ int ObInnerTableSchema::all_virtual_error_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("obj_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("obj_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("obj_seq", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("obj_seq", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("obj_type", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("obj_type", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("line", // 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 + ADD_COLUMN_SCHEMA("line", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("position", // 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 + ADD_COLUMN_SCHEMA("position", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("text_length", // 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 + ADD_COLUMN_SCHEMA("text_length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("text", // 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 - MAX_ORACLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("text", //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 + MAX_ORACLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("property", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("property", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("error_number", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("error_number", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6548,17 +6528,16 @@ int ObInnerTableSchema::all_virtual_error_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_timestamp_service_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_timestamp_service_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6589,48 +6568,48 @@ int ObInnerTableSchema::all_virtual_timestamp_service_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ts_type", // 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 + ADD_COLUMN_SCHEMA("ts_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ts_value", // 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 + ADD_COLUMN_SCHEMA("ts_value", //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 } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6640,17 +6619,16 @@ int ObInnerTableSchema::all_virtual_timestamp_service_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::referential_constraints_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::referential_constraints_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -6683,210 +6661,210 @@ int ObInnerTableSchema::referential_constraints_schema(ObTableSchema& table_sche if (OB_SUCC(ret)) { ObObj constraint_catalog_default; constraint_catalog_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("CONSTRAINT_CATALOG", // 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 - MAX_TABLE_CATALOG_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - constraint_catalog_default, - constraint_catalog_default); // default_value + ADD_COLUMN_SCHEMA_T("CONSTRAINT_CATALOG", //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 + MAX_TABLE_CATALOG_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + constraint_catalog_default, + constraint_catalog_default); //default_value } if (OB_SUCC(ret)) { ObObj constraint_schema_default; constraint_schema_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("CONSTRAINT_SCHEMA", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - constraint_schema_default, - constraint_schema_default); // default_value + ADD_COLUMN_SCHEMA_T("CONSTRAINT_SCHEMA", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + constraint_schema_default, + constraint_schema_default); //default_value } if (OB_SUCC(ret)) { ObObj constraint_name_default; constraint_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("CONSTRAINT_NAME", // 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 - OB_MAX_CONSTRAINT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - constraint_name_default, - constraint_name_default); // default_value + ADD_COLUMN_SCHEMA_T("CONSTRAINT_NAME", //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 + OB_MAX_CONSTRAINT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + constraint_name_default, + constraint_name_default); //default_value } if (OB_SUCC(ret)) { ObObj unique_constraint_catalog_default; unique_constraint_catalog_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("UNIQUE_CONSTRAINT_CATALOG", // 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 - MAX_TABLE_CATALOG_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - unique_constraint_catalog_default, - unique_constraint_catalog_default); // default_value + ADD_COLUMN_SCHEMA_T("UNIQUE_CONSTRAINT_CATALOG", //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 + MAX_TABLE_CATALOG_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + unique_constraint_catalog_default, + unique_constraint_catalog_default); //default_value } if (OB_SUCC(ret)) { ObObj unique_constraint_schema_default; unique_constraint_schema_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("UNIQUE_CONSTRAINT_SCHEMA", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - unique_constraint_schema_default, - unique_constraint_schema_default); // default_value + ADD_COLUMN_SCHEMA_T("UNIQUE_CONSTRAINT_SCHEMA", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + unique_constraint_schema_default, + unique_constraint_schema_default); //default_value } if (OB_SUCC(ret)) { ObObj unique_constraint_name_default; unique_constraint_name_default.set_null(); - ADD_COLUMN_SCHEMA_T("UNIQUE_CONSTRAINT_NAME", // 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 - OB_MAX_CONSTRAINT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - unique_constraint_name_default, - unique_constraint_name_default); // default_value + ADD_COLUMN_SCHEMA_T("UNIQUE_CONSTRAINT_NAME", //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 + OB_MAX_CONSTRAINT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + unique_constraint_name_default, + unique_constraint_name_default); //default_value } if (OB_SUCC(ret)) { ObObj match_option_default; match_option_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("MATCH_OPTION", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - match_option_default, - match_option_default); // default_value + ADD_COLUMN_SCHEMA_T("MATCH_OPTION", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + match_option_default, + match_option_default); //default_value } if (OB_SUCC(ret)) { ObObj update_rule_default; update_rule_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("UPDATE_RULE", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - update_rule_default, - update_rule_default); // default_value + ADD_COLUMN_SCHEMA_T("UPDATE_RULE", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + update_rule_default, + update_rule_default); //default_value } if (OB_SUCC(ret)) { ObObj delete_rule_default; delete_rule_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("DELETE_RULE", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - delete_rule_default, - delete_rule_default); // default_value + ADD_COLUMN_SCHEMA_T("DELETE_RULE", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + delete_rule_default, + delete_rule_default); //default_value } if (OB_SUCC(ret)) { ObObj table_name_default; table_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("TABLE_NAME", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_name_default, - table_name_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_NAME", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_name_default, + table_name_default); //default_value } if (OB_SUCC(ret)) { ObObj referenced_table_name_default; referenced_table_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("REFERENCED_TABLE_NAME", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - referenced_table_name_default, - referenced_table_name_default); // default_value + ADD_COLUMN_SCHEMA_T("REFERENCED_TABLE_NAME", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + referenced_table_name_default, + referenced_table_name_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6896,17 +6874,16 @@ int ObInnerTableSchema::referential_constraints_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_table_modifications_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_table_modifications_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6937,138 +6914,138 @@ int ObInnerTableSchema::all_virtual_table_modifications_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("insert_row_count", // 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 + ADD_COLUMN_SCHEMA("insert_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("update_row_count", // 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 + ADD_COLUMN_SCHEMA("update_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("delete_row_count", // 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 + ADD_COLUMN_SCHEMA("delete_row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_snapshot_version", // 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 + ADD_COLUMN_SCHEMA("max_snapshot_version", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -7086,17 +7063,16 @@ int ObInnerTableSchema::all_virtual_table_modifications_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_backup_clean_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_backup_clean_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7127,232 +7103,232 @@ int ObInnerTableSchema::all_virtual_backup_clean_info_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // 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 + ADD_COLUMN_SCHEMA("job_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("end_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("end_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // 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 + ADD_COLUMN_SCHEMA("incarnation", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 - OB_INNER_TABLE_BACKUP_CLEAN_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type", //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 + OB_INNER_TABLE_BACKUP_CLEAN_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parameter", // 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 - OB_INNER_TABLE_BACKUP_CLEAN_PARAMETER_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parameter", //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 + OB_INNER_TABLE_BACKUP_CLEAN_PARAMETER_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("error_msg", // 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 - OB_MAX_ERROR_MSG_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("error_msg", //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 + OB_MAX_ERROR_MSG_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("clog_gc_snapshot", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("clog_gc_snapshot", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("result", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("copy_id", // 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 + ADD_COLUMN_SCHEMA("copy_id", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -7362,17 +7338,16 @@ int ObInnerTableSchema::all_virtual_backup_clean_info_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_restore_pg_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_restore_pg_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7403,171 +7378,171 @@ int ObInnerTableSchema::all_virtual_restore_pg_info_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj macro_block_count_default; macro_block_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("macro_block_count", // 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 - macro_block_count_default, - macro_block_count_default); // default_value + ADD_COLUMN_SCHEMA_T("macro_block_count", //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 + macro_block_count_default, + macro_block_count_default); //default_value } if (OB_SUCC(ret)) { ObObj finish_macro_block_count_default; finish_macro_block_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("finish_macro_block_count", // 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 - finish_macro_block_count_default, - finish_macro_block_count_default); // default_value + ADD_COLUMN_SCHEMA_T("finish_macro_block_count", //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 + finish_macro_block_count_default, + finish_macro_block_count_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_count_default; partition_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_count", // 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 - partition_count_default, - partition_count_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_count", //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 + partition_count_default, + partition_count_default); //default_value } if (OB_SUCC(ret)) { ObObj finish_partition_count_default; finish_partition_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("finish_partition_count", // 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 - finish_partition_count_default, - finish_partition_count_default); // default_value + ADD_COLUMN_SCHEMA_T("finish_partition_count", //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 + finish_partition_count_default, + finish_partition_count_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("restore_info", // 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 - OB_INNER_TABLE_DEFAULT_VALUE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("restore_info", //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 + OB_INNER_TABLE_DEFAULT_VALUE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -7577,17 +7552,16 @@ int ObInnerTableSchema::all_virtual_restore_pg_info_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_object_type_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_object_type_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7618,350 +7592,350 @@ int ObInnerTableSchema::all_virtual_object_type_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_type_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("object_type_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("type", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("properties", // 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 + ADD_COLUMN_SCHEMA("properties", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_id", // 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 + ADD_COLUMN_SCHEMA("charset_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_form", // 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 + ADD_COLUMN_SCHEMA("charset_form", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("length", // 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 + ADD_COLUMN_SCHEMA("length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("number_precision", // 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 + ADD_COLUMN_SCHEMA("number_precision", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scale", // 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 + ADD_COLUMN_SCHEMA("scale", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zero_fill", // 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 + ADD_COLUMN_SCHEMA("zero_fill", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_type", // 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 + ADD_COLUMN_SCHEMA("coll_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flag", // 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 + ADD_COLUMN_SCHEMA("flag", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 + ADD_COLUMN_SCHEMA("owner_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comp_flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comp_flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_name", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("object_name", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("exec_env", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("exec_env", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("source", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("source", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("route_sql", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("route_sql", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //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(FLAT_ROW_STORE); @@ -7971,17 +7945,16 @@ int ObInnerTableSchema::all_virtual_object_type_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_trans_table_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_trans_table_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8012,123 +7985,123 @@ int ObInnerTableSchema::all_virtual_trans_table_status_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 + ADD_COLUMN_SCHEMA("partition_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("end_log_id", // 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 + ADD_COLUMN_SCHEMA("end_log_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_cnt", // 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 + ADD_COLUMN_SCHEMA("trans_cnt", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -8146,17 +8119,16 @@ int ObInnerTableSchema::all_virtual_trans_table_status_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_pg_log_archive_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_pg_log_archive_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8187,453 +8159,453 @@ int ObInnerTableSchema::all_virtual_pg_log_archive_stat_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // 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 + ADD_COLUMN_SCHEMA("incarnation", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_archive_round", // 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 + ADD_COLUMN_SCHEMA("log_archive_round", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("epoch", // 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 + ADD_COLUMN_SCHEMA("epoch", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("been_deleted", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("been_deleted", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_first_record_finish", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_first_record_finish", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("encount_error", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("encount_error", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("current_ilog_id", // 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 + ADD_COLUMN_SCHEMA("current_ilog_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_log_id", // 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 + ADD_COLUMN_SCHEMA("max_log_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("round_start_log_id", // 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 + ADD_COLUMN_SCHEMA("round_start_log_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("round_start_ts", // 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 + ADD_COLUMN_SCHEMA("round_start_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("round_snapshot_version", // 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 + ADD_COLUMN_SCHEMA("round_snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_start_log_id", // 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 + ADD_COLUMN_SCHEMA("cur_start_log_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("fetcher_max_split_log_id", // 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 + ADD_COLUMN_SCHEMA("fetcher_max_split_log_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("clog_split_max_log_id", // 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 + ADD_COLUMN_SCHEMA("clog_split_max_log_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("clog_split_max_log_ts", // 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 + ADD_COLUMN_SCHEMA("clog_split_max_log_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("clog_split_checkpoint_ts", // 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 + ADD_COLUMN_SCHEMA("clog_split_checkpoint_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_archived_log_id", // 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 + ADD_COLUMN_SCHEMA("max_archived_log_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_archived_log_ts", // 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 + ADD_COLUMN_SCHEMA("max_archived_log_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_archived_checkpoint_ts", // 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 + ADD_COLUMN_SCHEMA("max_archived_checkpoint_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("clog_epoch", // 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 + ADD_COLUMN_SCHEMA("clog_epoch", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("clog_accum_checksum", // 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 + ADD_COLUMN_SCHEMA("clog_accum_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_index_file_id", // 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 + ADD_COLUMN_SCHEMA("cur_index_file_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_index_file_offset", // 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 + ADD_COLUMN_SCHEMA("cur_index_file_offset", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_data_file_id", // 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 + ADD_COLUMN_SCHEMA("cur_data_file_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_data_file_offset", // 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 + ADD_COLUMN_SCHEMA("cur_data_file_offset", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -8651,17 +8623,16 @@ int ObInnerTableSchema::all_virtual_pg_log_archive_stat_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_plan_monitor_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_plan_monitor_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8692,532 +8663,532 @@ int ObInnerTableSchema::all_virtual_sql_plan_monitor_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REQUEST_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("REQUEST_ID", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TRACE_ID", // 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 - OB_MAX_TRACE_ID_BUFFER_SIZE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TRACE_ID", //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 + OB_MAX_TRACE_ID_BUFFER_SIZE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("FIRST_REFRESH_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("FIRST_REFRESH_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("LAST_REFRESH_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("LAST_REFRESH_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("FIRST_CHANGE_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("FIRST_CHANGE_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("LAST_CHANGE_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("LAST_CHANGE_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_1_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_1_ID", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_1_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_1_VALUE", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_2_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_2_ID", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_2_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_2_VALUE", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_3_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_3_ID", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_3_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_3_VALUE", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_4_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_4_ID", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_4_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_4_VALUE", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_5_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_5_ID", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_5_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_5_VALUE", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_6_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_6_ID", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_6_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_6_VALUE", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_7_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_7_ID", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_7_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_7_VALUE", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_8_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_8_ID", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_8_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_8_VALUE", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_9_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_9_ID", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_9_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_9_VALUE", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_10_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_10_ID", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_10_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_10_VALUE", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("THREAD_ID", // 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 + ADD_COLUMN_SCHEMA("THREAD_ID", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PLAN_OPERATION", // 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 - OB_MAX_OPERATOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PLAN_OPERATION", //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 + OB_MAX_OPERATOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STARTS", // 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 + ADD_COLUMN_SCHEMA("STARTS", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OUTPUT_ROWS", // 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 + ADD_COLUMN_SCHEMA("OUTPUT_ROWS", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PLAN_LINE_ID", // 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 + ADD_COLUMN_SCHEMA("PLAN_LINE_ID", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PLAN_DEPTH", // 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 + ADD_COLUMN_SCHEMA("PLAN_DEPTH", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -9235,22 +9206,20 @@ int ObInnerTableSchema::all_virtual_sql_plan_monitor_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_plan_monitor_all_virtual_sql_plan_monitor_i1_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_plan_monitor_all_virtual_sql_plan_monitor_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID))); - table_schema.set_table_id( - combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TID)); + table_schema.set_table_id(combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TID)); table_schema.set_rowkey_split_pos(0); table_schema.set_is_use_bloomfilter(false); table_schema.set_progressive_merge_num(0); @@ -9290,63 +9259,63 @@ int ObInnerTableSchema::all_virtual_sql_plan_monitor_all_virtual_sql_plan_monito table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - column_id + 3, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + column_id + 3, //column_id + 1, //rowkey_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REQUEST_ID", // column_name - column_id + 4, // column_id - 2, // rowkey_id - 2, // 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 + ADD_COLUMN_SCHEMA("REQUEST_ID", //column_name + column_id + 4, //column_id + 2, //rowkey_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // column_name - column_id + 1, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + column_id + 1, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - column_id + 2, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + column_id + 2, //column_id + 4, //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 } table_schema.set_index_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -9356,12 +9325,12 @@ int ObInnerTableSchema::all_virtual_sql_plan_monitor_all_virtual_sql_plan_monito return ret; } -int ObInnerTableSchema::all_virtual_sql_monitor_statname_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_monitor_statname_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9392,63 +9361,63 @@ int ObInnerTableSchema::all_virtual_sql_monitor_statname_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ID", // 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 + ADD_COLUMN_SCHEMA("ID", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GROUP_ID", // 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 + ADD_COLUMN_SCHEMA("GROUP_ID", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NAME", // 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 - 40, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NAME", //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 + 40, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DESCRIPTION", // 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 - 200, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DESCRIPTION", //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 + 200, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9458,17 +9427,16 @@ int ObInnerTableSchema::all_virtual_sql_monitor_statname_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_open_cursor_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_open_cursor_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9499,184 +9467,184 @@ int ObInnerTableSchema::all_virtual_open_cursor_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SADDR", // 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 - 8, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SADDR", //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 + 8, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SID", // 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 + ADD_COLUMN_SCHEMA("SID", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("USER_NAME", // 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 - 30, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USER_NAME", //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 + 30, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ADDRESS", // 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 - 8, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ADDRESS", //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 + 8, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("HASH_VALUE", // 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 + ADD_COLUMN_SCHEMA("HASH_VALUE", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_ID", // 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 - OB_MAX_SQL_ID_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_ID", //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 + OB_MAX_SQL_ID_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_TEXT", // 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 - 60, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_TEXT", //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 + 60, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("LAST_SQL_ACTIVE_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("LAST_SQL_ACTIVE_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_EXEC_ID", // 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 + ADD_COLUMN_SCHEMA("SQL_EXEC_ID", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -9694,17 +9662,16 @@ int ObInnerTableSchema::all_virtual_open_cursor_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_backup_validation_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_backup_validation_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9735,307 +9702,307 @@ int ObInnerTableSchema::all_virtual_backup_validation_task_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("task_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("end_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("end_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_pg_count", // 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 + ADD_COLUMN_SCHEMA("total_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_pg_count", // 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 + ADD_COLUMN_SCHEMA("finish_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_partition_count", // 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 + ADD_COLUMN_SCHEMA("total_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 + ADD_COLUMN_SCHEMA("finish_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("total_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_size", // 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 + ADD_COLUMN_SCHEMA("log_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10045,17 +10012,16 @@ int ObInnerTableSchema::all_virtual_backup_validation_task_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_pg_backup_validation_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_pg_backup_validation_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10086,335 +10052,335 @@ int ObInnerTableSchema::all_virtual_pg_backup_validation_task_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("task_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 7, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("archive_round", // 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 + ADD_COLUMN_SCHEMA("archive_round", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trace_id", // 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 - OB_MAX_TRACE_ID_BUFFER_SIZE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trace_id", //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 + OB_MAX_TRACE_ID_BUFFER_SIZE, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_partition_count", // 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 + ADD_COLUMN_SCHEMA("total_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 + ADD_COLUMN_SCHEMA("finish_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("total_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_info", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("log_info", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_size", // 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 + ADD_COLUMN_SCHEMA("log_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10424,17 +10390,16 @@ int ObInnerTableSchema::all_virtual_pg_backup_validation_task_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_time_zone_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_time_zone_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10467,73 +10432,73 @@ int ObInnerTableSchema::all_virtual_time_zone_schema(ObTableSchema& table_schema if (OB_SUCC(ret)) { ObObj tenant_id_default; tenant_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 - tenant_id_default, - tenant_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tenant_id", //column_name + ++column_id, //column_id + 1, //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 + tenant_id_default, + tenant_id_default); //default_value } if (OB_SUCC(ret)) { ObObj time_zone_id_default; time_zone_id_default.set_null(); - ADD_COLUMN_SCHEMA_T("time_zone_id", // column_name - ++column_id, // column_id - 2, // 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 - time_zone_id_default, - time_zone_id_default); // default_value + ADD_COLUMN_SCHEMA_T("time_zone_id", //column_name + ++column_id, //column_id + 2, //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 + time_zone_id_default, + time_zone_id_default); //default_value } if (OB_SUCC(ret)) { ObObj use_leap_seconds_default; use_leap_seconds_default.set_varchar(ObString::make_string("N")); - ADD_COLUMN_SCHEMA_T("use_leap_seconds", // 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 - 8, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - use_leap_seconds_default, - use_leap_seconds_default); // default_value + ADD_COLUMN_SCHEMA_T("use_leap_seconds", //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 + 8, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + use_leap_seconds_default, + use_leap_seconds_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("version", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10543,17 +10508,16 @@ int ObInnerTableSchema::all_virtual_time_zone_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_time_zone_name_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_time_zone_name_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10586,73 +10550,73 @@ int ObInnerTableSchema::all_virtual_time_zone_name_schema(ObTableSchema& table_s if (OB_SUCC(ret)) { ObObj tenant_id_default; tenant_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 - tenant_id_default, - tenant_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tenant_id", //column_name + ++column_id, //column_id + 1, //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 + tenant_id_default, + tenant_id_default); //default_value } if (OB_SUCC(ret)) { ObObj name_default; name_default.set_null(); - ADD_COLUMN_SCHEMA_T("name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - name_default, - name_default); // default_value + ADD_COLUMN_SCHEMA_T("name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + name_default, + name_default); //default_value } if (OB_SUCC(ret)) { ObObj time_zone_id_default; time_zone_id_default.set_null(); - ADD_COLUMN_SCHEMA_T("time_zone_id", // 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 - time_zone_id_default, - time_zone_id_default); // default_value + ADD_COLUMN_SCHEMA_T("time_zone_id", //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 + time_zone_id_default, + time_zone_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("version", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10662,17 +10626,16 @@ int ObInnerTableSchema::all_virtual_time_zone_name_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_time_zone_transition_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_time_zone_transition_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10705,92 +10668,92 @@ int ObInnerTableSchema::all_virtual_time_zone_transition_schema(ObTableSchema& t if (OB_SUCC(ret)) { ObObj tenant_id_default; tenant_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 - tenant_id_default, - tenant_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tenant_id", //column_name + ++column_id, //column_id + 1, //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 + tenant_id_default, + tenant_id_default); //default_value } if (OB_SUCC(ret)) { ObObj time_zone_id_default; time_zone_id_default.set_null(); - ADD_COLUMN_SCHEMA_T("time_zone_id", // column_name - ++column_id, // column_id - 2, // 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 - time_zone_id_default, - time_zone_id_default); // default_value + ADD_COLUMN_SCHEMA_T("time_zone_id", //column_name + ++column_id, //column_id + 2, //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 + time_zone_id_default, + time_zone_id_default); //default_value } if (OB_SUCC(ret)) { ObObj transition_time_default; transition_time_default.set_null(); - ADD_COLUMN_SCHEMA_T("transition_time", // column_name - ++column_id, // column_id - 3, // 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 - transition_time_default, - transition_time_default); // default_value + ADD_COLUMN_SCHEMA_T("transition_time", //column_name + ++column_id, //column_id + 3, //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 + transition_time_default, + transition_time_default); //default_value } if (OB_SUCC(ret)) { ObObj transition_type_id_default; transition_type_id_default.set_null(); - ADD_COLUMN_SCHEMA_T("transition_type_id", // 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 - transition_type_id_default, - transition_type_id_default); // default_value + ADD_COLUMN_SCHEMA_T("transition_type_id", //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 + transition_type_id_default, + transition_type_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("version", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10800,17 +10763,16 @@ int ObInnerTableSchema::all_virtual_time_zone_transition_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_time_zone_transition_type_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_time_zone_transition_type_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10843,130 +10805,130 @@ int ObInnerTableSchema::all_virtual_time_zone_transition_type_schema(ObTableSche if (OB_SUCC(ret)) { ObObj tenant_id_default; tenant_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 - tenant_id_default, - tenant_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tenant_id", //column_name + ++column_id, //column_id + 1, //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 + tenant_id_default, + tenant_id_default); //default_value } if (OB_SUCC(ret)) { ObObj time_zone_id_default; time_zone_id_default.set_null(); - ADD_COLUMN_SCHEMA_T("time_zone_id", // column_name - ++column_id, // column_id - 2, // 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 - time_zone_id_default, - time_zone_id_default); // default_value + ADD_COLUMN_SCHEMA_T("time_zone_id", //column_name + ++column_id, //column_id + 2, //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 + time_zone_id_default, + time_zone_id_default); //default_value } if (OB_SUCC(ret)) { ObObj transition_type_id_default; transition_type_id_default.set_null(); - ADD_COLUMN_SCHEMA_T("transition_type_id", // column_name - ++column_id, // column_id - 3, // 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 - transition_type_id_default, - transition_type_id_default); // default_value + ADD_COLUMN_SCHEMA_T("transition_type_id", //column_name + ++column_id, //column_id + 3, //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 + transition_type_id_default, + transition_type_id_default); //default_value } if (OB_SUCC(ret)) { ObObj offset_default; offset_default.set_int(0); - ADD_COLUMN_SCHEMA_T("offset", // 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 - offset_default, - offset_default); // default_value + ADD_COLUMN_SCHEMA_T("offset", //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 + offset_default, + offset_default); //default_value } if (OB_SUCC(ret)) { ObObj is_dst_default; is_dst_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_dst", // 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 - is_dst_default, - is_dst_default); // default_value + ADD_COLUMN_SCHEMA_T("is_dst", //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 + is_dst_default, + is_dst_default); //default_value } if (OB_SUCC(ret)) { ObObj abbreviation_default; abbreviation_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("abbreviation", // 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 - 8, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - abbreviation_default, - abbreviation_default); // default_value + ADD_COLUMN_SCHEMA_T("abbreviation", //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 + 8, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + abbreviation_default, + abbreviation_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("version", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10976,17 +10938,16 @@ int ObInnerTableSchema::all_virtual_time_zone_transition_type_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_constraint_column_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_constraint_column_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11017,110 +10978,110 @@ int ObInnerTableSchema::all_virtual_constraint_column_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("constraint_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("constraint_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11130,17 +11091,16 @@ int ObInnerTableSchema::all_virtual_constraint_column_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_constraint_column_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_constraint_column_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11171,125 +11131,125 @@ int ObInnerTableSchema::all_virtual_constraint_column_history_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("constraint_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("constraint_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11299,17 +11259,16 @@ int ObInnerTableSchema::all_virtual_constraint_column_history_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_files_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_files_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11342,705 +11301,705 @@ int ObInnerTableSchema::all_virtual_files_schema(ObTableSchema& table_schema) if (OB_SUCC(ret)) { ObObj file_id_default; file_id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("FILE_ID", // 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 - 4, // column_precision - 0, // column_scale - false, // is_nullable - false, // is_autoincrement - file_id_default, - file_id_default); // default_value + ADD_COLUMN_SCHEMA_T("FILE_ID", //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 + 4, //column_precision + 0, //column_scale + false, //is_nullable + false, //is_autoincrement + file_id_default, + file_id_default); //default_value } if (OB_SUCC(ret)) { ObObj file_name_default; file_name_default.set_null(); - ADD_COLUMN_SCHEMA_T("FILE_NAME", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - file_name_default, - file_name_default); // default_value + ADD_COLUMN_SCHEMA_T("FILE_NAME", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + file_name_default, + file_name_default); //default_value } if (OB_SUCC(ret)) { ObObj file_type_default; file_type_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("FILE_TYPE", // 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 - 20, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - file_type_default, - file_type_default); // default_value + ADD_COLUMN_SCHEMA_T("FILE_TYPE", //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 + 20, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + file_type_default, + file_type_default); //default_value } if (OB_SUCC(ret)) { ObObj tablespace_name_default; tablespace_name_default.set_null(); - ADD_COLUMN_SCHEMA_T("TABLESPACE_NAME", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - tablespace_name_default, - tablespace_name_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLESPACE_NAME", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + tablespace_name_default, + tablespace_name_default); //default_value } if (OB_SUCC(ret)) { ObObj table_catalog_default; table_catalog_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("TABLE_CATALOG", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_catalog_default, - table_catalog_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_CATALOG", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_catalog_default, + table_catalog_default); //default_value } if (OB_SUCC(ret)) { ObObj table_schema_default; table_schema_default.set_null(); - ADD_COLUMN_SCHEMA_T("TABLE_SCHEMA", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - table_schema_default, - table_schema_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_SCHEMA", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + table_schema_default, + table_schema_default); //default_value } if (OB_SUCC(ret)) { ObObj table_name_default; table_name_default.set_null(); - ADD_COLUMN_SCHEMA_T("TABLE_NAME", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - table_name_default, - table_name_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_NAME", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + table_name_default, + table_name_default); //default_value } if (OB_SUCC(ret)) { ObObj logfile_group_name_default; logfile_group_name_default.set_null(); - ADD_COLUMN_SCHEMA_T("LOGFILE_GROUP_NAME", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - logfile_group_name_default, - logfile_group_name_default); // default_value + ADD_COLUMN_SCHEMA_T("LOGFILE_GROUP_NAME", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + logfile_group_name_default, + logfile_group_name_default); //default_value } if (OB_SUCC(ret)) { ObObj logfile_group_number_default; logfile_group_number_default.set_null(); - ADD_COLUMN_SCHEMA_T("LOGFILE_GROUP_NUMBER", // 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 - 4, // column_precision - 0, // column_scale - true, // is_nullable - false, // is_autoincrement - logfile_group_number_default, - logfile_group_number_default); // default_value + ADD_COLUMN_SCHEMA_T("LOGFILE_GROUP_NUMBER", //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 + 4, //column_precision + 0, //column_scale + true, //is_nullable + false, //is_autoincrement + logfile_group_number_default, + logfile_group_number_default); //default_value } if (OB_SUCC(ret)) { ObObj engine_default; engine_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("ENGINE", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - engine_default, - engine_default); // default_value + ADD_COLUMN_SCHEMA_T("ENGINE", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + engine_default, + engine_default); //default_value } if (OB_SUCC(ret)) { ObObj fulltext_keys_default; fulltext_keys_default.set_null(); - ADD_COLUMN_SCHEMA_T("FULLTEXT_KEYS", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - fulltext_keys_default, - fulltext_keys_default); // default_value + ADD_COLUMN_SCHEMA_T("FULLTEXT_KEYS", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + fulltext_keys_default, + fulltext_keys_default); //default_value } if (OB_SUCC(ret)) { ObObj deleted_rows_default; deleted_rows_default.set_null(); - ADD_COLUMN_SCHEMA_T("DELETED_ROWS", // 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 - 4, // column_precision - 0, // column_scale - true, // is_nullable - false, // is_autoincrement - deleted_rows_default, - deleted_rows_default); // default_value + ADD_COLUMN_SCHEMA_T("DELETED_ROWS", //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 + 4, //column_precision + 0, //column_scale + true, //is_nullable + false, //is_autoincrement + deleted_rows_default, + deleted_rows_default); //default_value } if (OB_SUCC(ret)) { ObObj update_count_default; update_count_default.set_null(); - ADD_COLUMN_SCHEMA_T("UPDATE_COUNT", // 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 - 4, // column_precision - 0, // column_scale - true, // is_nullable - false, // is_autoincrement - update_count_default, - update_count_default); // default_value + ADD_COLUMN_SCHEMA_T("UPDATE_COUNT", //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 + 4, //column_precision + 0, //column_scale + true, //is_nullable + false, //is_autoincrement + update_count_default, + update_count_default); //default_value } if (OB_SUCC(ret)) { ObObj free_extents_default; free_extents_default.set_null(); - ADD_COLUMN_SCHEMA_T("FREE_EXTENTS", // 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 - 4, // column_precision - 0, // column_scale - true, // is_nullable - false, // is_autoincrement - free_extents_default, - free_extents_default); // default_value + ADD_COLUMN_SCHEMA_T("FREE_EXTENTS", //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 + 4, //column_precision + 0, //column_scale + true, //is_nullable + false, //is_autoincrement + free_extents_default, + free_extents_default); //default_value } if (OB_SUCC(ret)) { ObObj total_extents_default; total_extents_default.set_null(); - ADD_COLUMN_SCHEMA_T("TOTAL_EXTENTS", // 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 - 4, // column_precision - 0, // column_scale - true, // is_nullable - false, // is_autoincrement - total_extents_default, - total_extents_default); // default_value + ADD_COLUMN_SCHEMA_T("TOTAL_EXTENTS", //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 + 4, //column_precision + 0, //column_scale + true, //is_nullable + false, //is_autoincrement + total_extents_default, + total_extents_default); //default_value } if (OB_SUCC(ret)) { ObObj extent_size_default; extent_size_default.set_int(0); - ADD_COLUMN_SCHEMA_T("EXTENT_SIZE", // 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 - 4, // column_precision - 0, // column_scale - false, // is_nullable - false, // is_autoincrement - extent_size_default, - extent_size_default); // default_value + ADD_COLUMN_SCHEMA_T("EXTENT_SIZE", //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 + 4, //column_precision + 0, //column_scale + false, //is_nullable + false, //is_autoincrement + extent_size_default, + extent_size_default); //default_value } if (OB_SUCC(ret)) { ObObj initial_size_default; initial_size_default.set_null(); - ADD_COLUMN_SCHEMA_T("INITIAL_SIZE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - initial_size_default, - initial_size_default); // default_value + ADD_COLUMN_SCHEMA_T("INITIAL_SIZE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + initial_size_default, + initial_size_default); //default_value } if (OB_SUCC(ret)) { ObObj maximum_size_default; maximum_size_default.set_null(); - ADD_COLUMN_SCHEMA_T("MAXIMUM_SIZE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - maximum_size_default, - maximum_size_default); // default_value + ADD_COLUMN_SCHEMA_T("MAXIMUM_SIZE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + maximum_size_default, + maximum_size_default); //default_value } if (OB_SUCC(ret)) { ObObj autoextend_size_default; autoextend_size_default.set_null(); - ADD_COLUMN_SCHEMA_T("AUTOEXTEND_SIZE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - autoextend_size_default, - autoextend_size_default); // default_value + ADD_COLUMN_SCHEMA_T("AUTOEXTEND_SIZE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + autoextend_size_default, + autoextend_size_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("CREATION_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("CREATION_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("LAST_UPDATE_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("LAST_UPDATE_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("LAST_ACCESS_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("LAST_ACCESS_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj recover_time_default; recover_time_default.set_null(); - ADD_COLUMN_SCHEMA_T("RECOVER_TIME", // 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 - 4, // column_precision - 0, // column_scale - true, // is_nullable - false, // is_autoincrement - recover_time_default, - recover_time_default); // default_value + ADD_COLUMN_SCHEMA_T("RECOVER_TIME", //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 + 4, //column_precision + 0, //column_scale + true, //is_nullable + false, //is_autoincrement + recover_time_default, + recover_time_default); //default_value } if (OB_SUCC(ret)) { ObObj transaction_counter_default; transaction_counter_default.set_null(); - ADD_COLUMN_SCHEMA_T("TRANSACTION_COUNTER", // 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 - 4, // column_precision - 0, // column_scale - true, // is_nullable - false, // is_autoincrement - transaction_counter_default, - transaction_counter_default); // default_value + ADD_COLUMN_SCHEMA_T("TRANSACTION_COUNTER", //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 + 4, //column_precision + 0, //column_scale + true, //is_nullable + false, //is_autoincrement + transaction_counter_default, + transaction_counter_default); //default_value } if (OB_SUCC(ret)) { ObObj version_default; version_default.set_null(); - ADD_COLUMN_SCHEMA_T("VERSION", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - version_default, - version_default); // default_value + ADD_COLUMN_SCHEMA_T("VERSION", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + version_default, + version_default); //default_value } if (OB_SUCC(ret)) { ObObj row_format_default; row_format_default.set_null(); - ADD_COLUMN_SCHEMA_T("ROW_FORMAT", // 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 - 10, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - row_format_default, - row_format_default); // default_value + ADD_COLUMN_SCHEMA_T("ROW_FORMAT", //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 + 10, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + row_format_default, + row_format_default); //default_value } if (OB_SUCC(ret)) { ObObj table_rows_default; table_rows_default.set_null(); - ADD_COLUMN_SCHEMA_T("TABLE_ROWS", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - table_rows_default, - table_rows_default); // default_value + ADD_COLUMN_SCHEMA_T("TABLE_ROWS", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + table_rows_default, + table_rows_default); //default_value } if (OB_SUCC(ret)) { ObObj avg_row_length_default; avg_row_length_default.set_null(); - ADD_COLUMN_SCHEMA_T("AVG_ROW_LENGTH", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - avg_row_length_default, - avg_row_length_default); // default_value + ADD_COLUMN_SCHEMA_T("AVG_ROW_LENGTH", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + avg_row_length_default, + avg_row_length_default); //default_value } if (OB_SUCC(ret)) { ObObj data_length_default; data_length_default.set_null(); - ADD_COLUMN_SCHEMA_T("DATA_LENGTH", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - data_length_default, - data_length_default); // default_value + ADD_COLUMN_SCHEMA_T("DATA_LENGTH", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + data_length_default, + data_length_default); //default_value } if (OB_SUCC(ret)) { ObObj max_data_length_default; max_data_length_default.set_null(); - ADD_COLUMN_SCHEMA_T("MAX_DATA_LENGTH", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - max_data_length_default, - max_data_length_default); // default_value + ADD_COLUMN_SCHEMA_T("MAX_DATA_LENGTH", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + max_data_length_default, + max_data_length_default); //default_value } if (OB_SUCC(ret)) { ObObj index_length_default; index_length_default.set_null(); - ADD_COLUMN_SCHEMA_T("INDEX_LENGTH", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - index_length_default, - index_length_default); // default_value + ADD_COLUMN_SCHEMA_T("INDEX_LENGTH", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + index_length_default, + index_length_default); //default_value } if (OB_SUCC(ret)) { ObObj data_free_default; data_free_default.set_null(); - ADD_COLUMN_SCHEMA_T("DATA_FREE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - data_free_default, - data_free_default); // default_value + ADD_COLUMN_SCHEMA_T("DATA_FREE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + data_free_default, + data_free_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("CREATE_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("CREATE_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("UPDATE_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("UPDATE_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("CHECK_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("CHECK_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj checksum_default; checksum_default.set_null(); - ADD_COLUMN_SCHEMA_T("CHECKSUM", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - checksum_default, - checksum_default); // default_value + ADD_COLUMN_SCHEMA_T("CHECKSUM", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + checksum_default, + checksum_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("STATUS", // 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 - 20, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("STATUS", //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 + 20, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { ObObj extra_default; extra_default.set_null(); - ADD_COLUMN_SCHEMA_T("EXTRA", // 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 - 255, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - extra_default, - extra_default); // default_value + ADD_COLUMN_SCHEMA_T("EXTRA", //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 + 255, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + extra_default, + extra_default); //default_value } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -12050,17 +12009,16 @@ int ObInnerTableSchema::all_virtual_files_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::files_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::files_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -12103,17 +12061,16 @@ int ObInnerTableSchema::files_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_dependency_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_dependency_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -12144,245 +12101,245 @@ int ObInnerTableSchema::all_virtual_dependency_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dep_obj_type", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("dep_obj_type", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dep_obj_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("dep_obj_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dep_order", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("dep_order", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dep_timestamp", // 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 + ADD_COLUMN_SCHEMA("dep_timestamp", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_obj_type", // 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 + ADD_COLUMN_SCHEMA("ref_obj_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_obj_id", // 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 + ADD_COLUMN_SCHEMA("ref_obj_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_timestamp", // 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 + ADD_COLUMN_SCHEMA("ref_timestamp", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dep_obj_owner_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dep_obj_owner_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("property", // 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 + ADD_COLUMN_SCHEMA("property", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dep_attrs", // 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_ORACLE_RAW_SQL_COL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dep_attrs", //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_ORACLE_RAW_SQL_COL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dep_reason", // 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_ORACLE_RAW_SQL_COL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dep_reason", //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_ORACLE_RAW_SQL_COL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_obj_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ref_obj_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //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(FLAT_ROW_STORE); @@ -12392,17 +12349,16 @@ int ObInnerTableSchema::all_virtual_dependency_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_object_definition_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_object_definition_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -12433,198 +12389,198 @@ int ObInnerTableSchema::tenant_virtual_object_definition_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_type", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("object_type", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_ORIGINAL_NANE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("object_name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_ORIGINAL_NANE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("schema", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("version", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - 10, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("version", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + 10, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("model", // column_name - ++column_id, // column_id - 5, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("model", //column_name + ++column_id, //column_id + 5, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("transform", // column_name - ++column_id, // column_id - 6, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - 8, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("transform", //column_name + ++column_id, //column_id + 6, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + 8, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("definition", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("definition", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_database_with_if_not_exists", // 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 - DATABASE_DEFINE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_database_with_if_not_exists", //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 + DATABASE_DEFINE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("character_set_client", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("character_set_client", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_connection", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation_connection", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("proc_type", // 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 + ADD_COLUMN_SCHEMA("proc_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_database", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation_database", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_mode", // 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 - MAX_CHARSET_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_mode", //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 + MAX_CHARSET_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -12634,10 +12590,10 @@ int ObInnerTableSchema::tenant_virtual_object_definition_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase 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 b100388c6..78920ff15 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 @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::all_virtual_reserved_table_mgr_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_reserved_table_mgr_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -58,228 +60,228 @@ int ObInnerTableSchema::all_virtual_reserved_table_mgr_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_SERVER_ADDR_SIZE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_SERVER_ADDR_SIZE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_type", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("table_type", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_id", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("index_id", //column_name + ++column_id, //column_id + 7, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("base_version", // column_name - ++column_id, // column_id - 8, // 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 + ADD_COLUMN_SCHEMA("base_version", //column_name + ++column_id, //column_id + 8, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("multi_version_start", // column_name - ++column_id, // column_id - 9, // 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 + ADD_COLUMN_SCHEMA("multi_version_start", //column_name + ++column_id, //column_id + 9, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // column_name - ++column_id, // column_id - 10, // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //column_name + ++column_id, //column_id + 10, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("version", // column_name - ++column_id, // column_id - 11, // 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 + ADD_COLUMN_SCHEMA("version", //column_name + ++column_id, //column_id + 11, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("size", // 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 + ADD_COLUMN_SCHEMA("size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref", // 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 + ADD_COLUMN_SCHEMA("ref", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("reserve_type", // 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 - OB_MAX_RESERVED_POINT_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("reserve_type", //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 + OB_MAX_RESERVED_POINT_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("reserve_point_version", // 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 + ADD_COLUMN_SCHEMA("reserve_point_version", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -297,17 +299,16 @@ int ObInnerTableSchema::all_virtual_reserved_table_mgr_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_backupset_history_mgr_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_backupset_history_mgr_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -338,493 +339,493 @@ int ObInnerTableSchema::all_virtual_backupset_history_mgr_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_type", // 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 - OB_INNER_TABLE_BACKUP_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_type", //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 + OB_INNER_TABLE_BACKUP_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("device_type", // 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 - OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("device_type", //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 + OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_full_backup_set_id", // 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 + ADD_COLUMN_SCHEMA("prev_full_backup_set_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_inc_backup_set_id", // 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 + ADD_COLUMN_SCHEMA("prev_inc_backup_set_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_backup_data_version", // 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 + ADD_COLUMN_SCHEMA("prev_backup_data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pg_count", // 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 + ADD_COLUMN_SCHEMA("pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_block_count", // 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 + ADD_COLUMN_SCHEMA("macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_pg_count", // 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 + ADD_COLUMN_SCHEMA("finish_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("input_bytes", // 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 + ADD_COLUMN_SCHEMA("input_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("output_bytes", // 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 + ADD_COLUMN_SCHEMA("output_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("end_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("end_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compatible", // 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 + ADD_COLUMN_SCHEMA("compatible", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version", // 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 + ADD_COLUMN_SCHEMA("cluster_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_data_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_data_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_schema_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_schema_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version_display", // 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 - OB_INNER_TABLE_BACKUP_TASK_CLUSTER_FORMAT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_version_display", //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 + OB_INNER_TABLE_BACKUP_TASK_CLUSTER_FORMAT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_count", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition_count", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("finish_partition_count", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_mark_deleted", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_mark_deleted", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj encryption_mode_default; encryption_mode_default.set_varchar(ObString::make_string("None")); - ADD_COLUMN_SCHEMA_T("encryption_mode", // 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 - OB_MAX_ENCRYPTION_MODE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - encryption_mode_default, - encryption_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("encryption_mode", //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 + OB_MAX_ENCRYPTION_MODE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + encryption_mode_default, + encryption_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj passwd_default; passwd_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("passwd", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - passwd_default, - passwd_default); // default_value + ADD_COLUMN_SCHEMA_T("passwd", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + passwd_default, + passwd_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_recovery_window", // 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 + ADD_COLUMN_SCHEMA("backup_recovery_window", //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 } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -834,17 +835,16 @@ int ObInnerTableSchema::all_virtual_backupset_history_mgr_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_backup_backupset_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_backup_backupset_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -875,555 +875,555 @@ int ObInnerTableSchema::all_virtual_backup_backupset_task_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("copy_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("copy_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_type", // 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 - OB_INNER_TABLE_BACKUP_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_type", //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 + OB_INNER_TABLE_BACKUP_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_full_backup_set_id", // 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 + ADD_COLUMN_SCHEMA("prev_full_backup_set_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_inc_backup_set_id", // 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 + ADD_COLUMN_SCHEMA("prev_inc_backup_set_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_backup_data_version", // 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 + ADD_COLUMN_SCHEMA("prev_backup_data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("input_bytes", // 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 + ADD_COLUMN_SCHEMA("input_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("output_bytes", // 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 + ADD_COLUMN_SCHEMA("output_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("end_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("end_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compatible", // 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 + ADD_COLUMN_SCHEMA("compatible", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version", // 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 + ADD_COLUMN_SCHEMA("cluster_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version_display", // 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 - OB_INNER_TABLE_BACKUP_TASK_CLUSTER_FORMAT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_version_display", //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 + OB_INNER_TABLE_BACKUP_TASK_CLUSTER_FORMAT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("src_backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("src_backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dst_backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dst_backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("src_device_type", // 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 - OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("src_device_type", //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 + OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dst_device_type", // 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 - OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dst_device_type", //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 + OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_data_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_data_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_schema_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_schema_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_pg_count", // 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 + ADD_COLUMN_SCHEMA("total_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_pg_count", // 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 + ADD_COLUMN_SCHEMA("finish_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_partition_count", // 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 + ADD_COLUMN_SCHEMA("total_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 + ADD_COLUMN_SCHEMA("finish_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("total_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { ObObj encryption_mode_default; encryption_mode_default.set_varchar(ObString::make_string("None")); - ADD_COLUMN_SCHEMA_T("encryption_mode", // 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 - OB_MAX_ENCRYPTION_MODE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - encryption_mode_default, - encryption_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("encryption_mode", //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 + OB_MAX_ENCRYPTION_MODE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + encryption_mode_default, + encryption_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj passwd_default; passwd_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("passwd", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - passwd_default, - passwd_default); // default_value + ADD_COLUMN_SCHEMA_T("passwd", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + passwd_default, + passwd_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1433,17 +1433,16 @@ int ObInnerTableSchema::all_virtual_backup_backupset_task_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_pg_backup_backupset_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_pg_backup_backupset_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1474,290 +1473,290 @@ int ObInnerTableSchema::all_virtual_pg_backup_backupset_task_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("copy_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("copy_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 7, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trace_id", // 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 - OB_MAX_TRACE_ID_BUFFER_SIZE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trace_id", //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 + OB_MAX_TRACE_ID_BUFFER_SIZE, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - OB_MAX_SERVER_ADDR_SIZE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + OB_MAX_SERVER_ADDR_SIZE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_partition_count", // 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 + ADD_COLUMN_SCHEMA("total_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 + ADD_COLUMN_SCHEMA("finish_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("total_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1767,17 +1766,16 @@ int ObInnerTableSchema::all_virtual_pg_backup_backupset_task_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_backup_backup_log_archive_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_backup_backup_log_archive_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1808,241 +1806,241 @@ int ObInnerTableSchema::all_virtual_backup_backup_log_archive_status_schema(ObTa table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_archive_round", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("log_archive_round", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("copy_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("copy_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("min_first_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("min_first_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("max_next_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("max_next_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj input_bytes_default; input_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("input_bytes", // 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 - input_bytes_default, - input_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("input_bytes", //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 + input_bytes_default, + input_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj output_bytes_default; output_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("output_bytes", // 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 - output_bytes_default, - output_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("output_bytes", //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 + output_bytes_default, + output_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj deleted_input_bytes_default; deleted_input_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("deleted_input_bytes", // 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 - deleted_input_bytes_default, - deleted_input_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("deleted_input_bytes", //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 + deleted_input_bytes_default, + deleted_input_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj deleted_output_bytes_default; deleted_output_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("deleted_output_bytes", // 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 - deleted_output_bytes_default, - deleted_output_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("deleted_output_bytes", //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 + deleted_output_bytes_default, + deleted_output_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj pg_count_default; pg_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("pg_count", // 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 - pg_count_default, - pg_count_default); // default_value + ADD_COLUMN_SCHEMA_T("pg_count", //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 + pg_count_default, + pg_count_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2052,17 +2050,16 @@ int ObInnerTableSchema::all_virtual_backup_backup_log_archive_status_schema(ObTa table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_global_transaction_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_global_transaction_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2093,208 +2090,208 @@ int ObInnerTableSchema::all_virtual_global_transaction_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("gtrid", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_BINARY, // column_collation_type - 128, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("gtrid", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_BINARY, //column_collation_type + 128, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("bqual", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_BINARY, // column_collation_type - 128, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("bqual", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_BINARY, //column_collation_type + 128, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj format_id_default; format_id_default.set_int(1); - ADD_COLUMN_SCHEMA_T("format_id", // column_name - ++column_id, // column_id - 4, // 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 - format_id_default, - format_id_default); // default_value + ADD_COLUMN_SCHEMA_T("format_id", //column_name + ++column_id, //column_id + 4, //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 + format_id_default, + format_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_id", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trans_id", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coordinator", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("coordinator", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scheduler_ip", // 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 - OB_MAX_SERVER_ADDR_SIZE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("scheduler_ip", //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 + OB_MAX_SERVER_ADDR_SIZE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scheduler_port", // 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 + ADD_COLUMN_SCHEMA("scheduler_port", //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 } if (OB_SUCC(ret)) { ObObj is_readonly_default; is_readonly_default.set_tinyint(0); - ADD_COLUMN_SCHEMA_T("is_readonly", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_readonly_default, - is_readonly_default); // default_value + ADD_COLUMN_SCHEMA_T("is_readonly", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_readonly_default, + is_readonly_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("state", // 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 + ADD_COLUMN_SCHEMA("state", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("end_flag", // 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 + ADD_COLUMN_SCHEMA("end_flag", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2304,10 +2301,10 @@ int ObInnerTableSchema::all_virtual_global_transaction_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.15001_15050.cpp b/src/share/inner_table/ob_inner_table_schema.15001_15050.cpp index 2d1c4c685..053716692 100644 --- a/src/share/inner_table/ob_inner_table_schema.15001_15050.cpp +++ b/src/share/inner_table/ob_inner_table_schema.15001_15050.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::all_virtual_table_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_table_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -58,1098 +60,1098 @@ int ObInnerTableSchema::all_virtual_table_agent_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLE_NAME", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATABASE_ID", // 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("TABLE_TYPE", // 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("LOAD_TYPE", // 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("DEF_TYPE", // 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("ROWKEY_COLUMN_NUM", // 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("INDEX_COLUMN_NUM", // 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_USED_COLUMN_ID", // 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("REPLICA_NUM", // 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("AUTOINC_COLUMN_ID", // 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("AUTO_INCREMENT", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("READ_ONLY", // 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("ROWKEY_SPLIT_POS", // 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("COMPRESS_FUNC_NAME", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXPIRE_CONDITION", // 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 - OB_MAX_EXPIRE_INFO_STRING_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IS_USE_BLOOMFILTER", // 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("COMMENT", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BLOCK_SIZE", // 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("COLLATION_TYPE", // 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("DATA_TABLE_ID", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INDEX_STATUS", // 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("TABLEGROUP_ID", // 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("PROGRESSIVE_MERGE_NUM", // 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("INDEX_TYPE", // 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("PART_LEVEL", // 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("PART_FUNC_TYPE", // 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("PART_FUNC_EXPR", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PART_NUM", // 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("SUB_PART_FUNC_TYPE", // 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("SUB_PART_FUNC_EXPR", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUB_PART_NUM", // 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("CREATE_MEM_VERSION", // 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("SCHEMA_VERSION", // 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("VIEW_DEFINITION", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VIEW_CHECK_OPTION", // 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("VIEW_IS_UPDATABLE", // 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("ZONE_LIST", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIMARY_ZONE", // 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 - MAX_ZONE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INDEX_USING_TYPE", // 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("PARSER_NAME", // 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 - OB_MAX_PARSER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INDEX_ATTRIBUTES_SET", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LOCALITY", // 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 - MAX_LOCALITY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLET_SIZE", // 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("PCTFREE", // 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("PREVIOUS_LOCALITY", // 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 - MAX_LOCALITY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAX_USED_PART_ID", // 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("PARTITION_CNT_WITHIN_PARTITION_TABLE", // 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("PARTITION_STATUS", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARTITION_SCHEMA_VERSION", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAX_USED_CONSTRAINT_ID", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SESSION_ID", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PK_COMMENT", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SESS_ACTIVE_TIME", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROW_STORE_TYPE", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STORE_FORMAT", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DUPLICATE_SCOPE", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BINDING", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROGRESSIVE_MERGE_ROUND", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STORAGE_FORMAT_VERSION", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLE_MODE", // 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("ENCRYPTION", // 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 - OB_MAX_ENCRYPTION_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLESPACE_ID", // 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("DROP_SCHEMA_VERSION", // 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("IS_SUB_PART_TEMPLATE", // 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("DOP", // 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("CHARACTER_SET_CLIENT", // 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("COLLATION_CONNECTION", // 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("AUTO_PART_SIZE", // 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("AUTO_PART", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("TABLE_NAME", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("TABLE_TYPE", //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("LOAD_TYPE", //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("DEF_TYPE", //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("ROWKEY_COLUMN_NUM", //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("INDEX_COLUMN_NUM", //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_USED_COLUMN_ID", //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("REPLICA_NUM", //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("AUTOINC_COLUMN_ID", //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("AUTO_INCREMENT", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("READ_ONLY", //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("ROWKEY_SPLIT_POS", //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("COMPRESS_FUNC_NAME", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("EXPIRE_CONDITION", //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 + OB_MAX_EXPIRE_INFO_STRING_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("IS_USE_BLOOMFILTER", //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("COMMENT", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("BLOCK_SIZE", //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("COLLATION_TYPE", //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("DATA_TABLE_ID", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("INDEX_STATUS", //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("TABLEGROUP_ID", //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("PROGRESSIVE_MERGE_NUM", //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("INDEX_TYPE", //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("PART_LEVEL", //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("PART_FUNC_TYPE", //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("PART_FUNC_EXPR", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PART_NUM", //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("SUB_PART_FUNC_TYPE", //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("SUB_PART_FUNC_EXPR", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("SUB_PART_NUM", //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("CREATE_MEM_VERSION", //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("SCHEMA_VERSION", //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("VIEW_DEFINITION", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("VIEW_CHECK_OPTION", //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("VIEW_IS_UPDATABLE", //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("ZONE_LIST", //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 + MAX_ZONE_LIST_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PRIMARY_ZONE", //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 + MAX_ZONE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("INDEX_USING_TYPE", //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("PARSER_NAME", //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 + OB_MAX_PARSER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("INDEX_ATTRIBUTES_SET", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("LOCALITY", //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 + MAX_LOCALITY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("TABLET_SIZE", //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("PCTFREE", //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("PREVIOUS_LOCALITY", //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 + MAX_LOCALITY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("MAX_USED_PART_ID", //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("PARTITION_CNT_WITHIN_PARTITION_TABLE", //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("PARTITION_STATUS", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PARTITION_SCHEMA_VERSION", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("MAX_USED_CONSTRAINT_ID", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("SESSION_ID", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PK_COMMENT", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("SESS_ACTIVE_TIME", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("ROW_STORE_TYPE", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("STORE_FORMAT", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("DUPLICATE_SCOPE", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("BINDING", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PROGRESSIVE_MERGE_ROUND", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("STORAGE_FORMAT_VERSION", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("TABLE_MODE", //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("ENCRYPTION", //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 + OB_MAX_ENCRYPTION_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("TABLESPACE_ID", //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("DROP_SCHEMA_VERSION", //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("IS_SUB_PART_TEMPLATE", //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("DOP", //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("CHARACTER_SET_CLIENT", //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("COLLATION_CONNECTION", //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("AUTO_PART_SIZE", //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("AUTO_PART", //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(FLAT_ROW_STORE); @@ -1159,17 +1161,16 @@ int ObInnerTableSchema::all_virtual_table_agent_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_column_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_column_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1200,438 +1201,438 @@ int ObInnerTableSchema::all_virtual_column_agent_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("COLUMN_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("COLUMN_ID", //column_name + ++column_id, //column_id + 3, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COLUMN_NAME", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLUMN_NAME", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROWKEY_POSITION", // 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 + ADD_COLUMN_SCHEMA("ROWKEY_POSITION", //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("INDEX_POSITION", // 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 + ADD_COLUMN_SCHEMA("INDEX_POSITION", //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("ORDER_IN_ROWKEY", // 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 + ADD_COLUMN_SCHEMA("ORDER_IN_ROWKEY", //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("PARTITION_KEY_POSITION", // 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 + ADD_COLUMN_SCHEMA("PARTITION_KEY_POSITION", //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("DATA_TYPE", // 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 + ADD_COLUMN_SCHEMA("DATA_TYPE", //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("DATA_LENGTH", // 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 + ADD_COLUMN_SCHEMA("DATA_LENGTH", //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("DATA_PRECISION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DATA_PRECISION", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATA_SCALE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DATA_SCALE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ZERO_FILL", // 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 + ADD_COLUMN_SCHEMA("ZERO_FILL", //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("NULLABLE", // 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 + ADD_COLUMN_SCHEMA("NULLABLE", //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("ON_UPDATE_CURRENT_TIMESTAMP", // 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 + ADD_COLUMN_SCHEMA("ON_UPDATE_CURRENT_TIMESTAMP", //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("AUTOINCREMENT", // 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 + ADD_COLUMN_SCHEMA("AUTOINCREMENT", //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("IS_HIDDEN", // 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 + ADD_COLUMN_SCHEMA("IS_HIDDEN", //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("COLLATION_TYPE", // 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 + ADD_COLUMN_SCHEMA("COLLATION_TYPE", //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("ORIG_DEFAULT_VALUE", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ORIG_DEFAULT_VALUE", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CUR_DEFAULT_VALUE", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CUR_DEFAULT_VALUE", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("COLUMN_FLAGS", // 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 + ADD_COLUMN_SCHEMA("COLUMN_FLAGS", //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("PREV_COLUMN_ID", // 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 + ADD_COLUMN_SCHEMA("PREV_COLUMN_ID", //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("EXTENDED_TYPE_INFO", // 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_VARBINARY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXTENDED_TYPE_INFO", //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_VARBINARY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ORIG_DEFAULT_VALUE_V2", // 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_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ORIG_DEFAULT_VALUE_V2", //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_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CUR_DEFAULT_VALUE_V2", // 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_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CUR_DEFAULT_VALUE_V2", //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_DEFAULT_VALUE_LENGTH, //column_length + -1, //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(FLAT_ROW_STORE); @@ -1641,17 +1642,16 @@ int ObInnerTableSchema::all_virtual_column_agent_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_database_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_database_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1682,213 +1682,213 @@ int ObInnerTableSchema::all_virtual_database_agent_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("DATABASE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATABASE_NAME", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DATABASE_NAME", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REPLICA_NUM", // 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 + ADD_COLUMN_SCHEMA("REPLICA_NUM", //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("ZONE_LIST", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ZONE_LIST", //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 + MAX_ZONE_LIST_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIMARY_ZONE", // 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 - MAX_ZONE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PRIMARY_ZONE", //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 + MAX_ZONE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COLLATION_TYPE", // 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 + ADD_COLUMN_SCHEMA("COLLATION_TYPE", //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("COMMENT", // 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 - MAX_DATABASE_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + MAX_DATABASE_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("READ_ONLY", // 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 + ADD_COLUMN_SCHEMA("READ_ONLY", //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("DEFAULT_TABLEGROUP_ID", // 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 + ADD_COLUMN_SCHEMA("DEFAULT_TABLEGROUP_ID", //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("IN_RECYCLEBIN", // 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 + ADD_COLUMN_SCHEMA("IN_RECYCLEBIN", //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("DROP_SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("DROP_SCHEMA_VERSION", //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(FLAT_ROW_STORE); @@ -1898,17 +1898,16 @@ int ObInnerTableSchema::all_virtual_database_agent_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sequence_v2_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sequence_v2_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1939,123 +1938,123 @@ int ObInnerTableSchema::all_virtual_sequence_v2_agent_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("SEQUENCE_KEY", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("SEQUENCE_KEY", //column_name + ++column_id, //column_id + 2, //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("COLUMN_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("COLUMN_ID", //column_name + ++column_id, //column_id + 3, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SEQUENCE_NAME", // 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 - OB_MAX_SEQUENCE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SEQUENCE_NAME", //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 + OB_MAX_SEQUENCE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SEQUENCE_VALUE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SEQUENCE_VALUE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SYNC_VALUE", // 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 + ADD_COLUMN_SCHEMA("SYNC_VALUE", //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(FLAT_ROW_STORE); @@ -2065,17 +2064,16 @@ int ObInnerTableSchema::all_virtual_sequence_v2_agent_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_part_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_part_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2106,498 +2104,498 @@ int ObInnerTableSchema::all_virtual_part_agent_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("PART_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PART_ID", //column_name + ++column_id, //column_id + 3, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PART_NAME", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PART_NAME", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("HIGH_BOUND_VAL", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HIGH_BOUND_VAL", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("B_HIGH_BOUND_VAL", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("B_HIGH_BOUND_VAL", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUB_PART_NUM", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUB_PART_NUM", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUB_PART_SPACE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUB_PART_SPACE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NEW_SUB_PART_NUM", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NEW_SUB_PART_NUM", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NEW_SUB_PART_SPACE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NEW_SUB_PART_SPACE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUB_PART_INTERVAL", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUB_PART_INTERVAL", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUB_INTERVAL_START", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUB_INTERVAL_START", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NEW_SUB_PART_INTERVAL", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NEW_SUB_PART_INTERVAL", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NEW_SUB_INTERVAL_START", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NEW_SUB_INTERVAL_START", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BLOCK_SIZE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("BLOCK_SIZE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REPLICA_NUM", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REPLICA_NUM", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMPRESS_FUNC_NAME", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMPRESS_FUNC_NAME", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STATUS", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("STATUS", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LIST_VAL", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LIST_VAL", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("B_LIST_VAL", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("B_LIST_VAL", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PART_IDX", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PART_IDX", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SOURCE_PARTITION_ID", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SOURCE_PARTITION_ID", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAPPING_PG_PART_ID", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MAPPING_PG_PART_ID", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLESPACE_ID", // 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 + ADD_COLUMN_SCHEMA("TABLESPACE_ID", //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("DROP_SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("DROP_SCHEMA_VERSION", //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_USED_SUB_PART_ID", // 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 + ADD_COLUMN_SCHEMA("MAX_USED_SUB_PART_ID", //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(FLAT_ROW_STORE); @@ -2607,17 +2605,16 @@ int ObInnerTableSchema::all_virtual_part_agent_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sub_part_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sub_part_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2648,378 +2645,378 @@ int ObInnerTableSchema::all_virtual_sub_part_agent_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("PART_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PART_ID", //column_name + ++column_id, //column_id + 3, //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("SUB_PART_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("SUB_PART_ID", //column_name + ++column_id, //column_id + 4, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUB_PART_NAME", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUB_PART_NAME", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("HIGH_BOUND_VAL", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HIGH_BOUND_VAL", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("B_HIGH_BOUND_VAL", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("B_HIGH_BOUND_VAL", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BLOCK_SIZE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("BLOCK_SIZE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REPLICA_NUM", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REPLICA_NUM", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMPRESS_FUNC_NAME", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMPRESS_FUNC_NAME", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STATUS", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("STATUS", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LIST_VAL", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LIST_VAL", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("B_LIST_VAL", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("B_LIST_VAL", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLESPACE_ID", // 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 + ADD_COLUMN_SCHEMA("TABLESPACE_ID", //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("SUB_PART_IDX", // 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 + ADD_COLUMN_SCHEMA("SUB_PART_IDX", //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("SOURCE_PARTITION_ID", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SOURCE_PARTITION_ID", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAPPING_PG_SUB_PART_ID", // 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 + ADD_COLUMN_SCHEMA("MAPPING_PG_SUB_PART_ID", //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("DROP_SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("DROP_SCHEMA_VERSION", //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(FLAT_ROW_STORE); @@ -3029,17 +3026,16 @@ int ObInnerTableSchema::all_virtual_sub_part_agent_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_package_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_package_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -3070,228 +3066,228 @@ int ObInnerTableSchema::all_virtual_package_agent_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("PACKAGE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("PACKAGE_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("PACKAGE_NAME", // 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 - OB_MAX_PACKAGE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PACKAGE_NAME", //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 + OB_MAX_PACKAGE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("TYPE", // 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 + ADD_COLUMN_SCHEMA("TYPE", //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("FLAG", // 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 + ADD_COLUMN_SCHEMA("FLAG", //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("OWNER_ID", // 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 + ADD_COLUMN_SCHEMA("OWNER_ID", //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("COMP_FLAG", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMP_FLAG", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXEC_ENV", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXEC_ENV", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SOURCE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SOURCE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROUTE_SQL", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROUTE_SQL", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //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(FLAT_ROW_STORE); @@ -3301,17 +3297,16 @@ int ObInnerTableSchema::all_virtual_package_agent_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_meta_table_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_meta_table_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -3342,498 +3337,498 @@ int ObInnerTableSchema::all_virtual_tenant_meta_table_agent_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("PARTITION_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PARTITION_ID", //column_name + ++column_id, //column_id + 3, //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("SVR_IP", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 5, //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("SQL_PORT", // 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 + ADD_COLUMN_SCHEMA("SQL_PORT", //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("UNIT_ID", // 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 + ADD_COLUMN_SCHEMA("UNIT_ID", //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("PARTITION_CNT", // 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 + ADD_COLUMN_SCHEMA("PARTITION_CNT", //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("ZONE", // 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 - MAX_ZONE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ZONE", //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 + MAX_ZONE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROLE", // 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 + ADD_COLUMN_SCHEMA("ROLE", //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("MEMBER_LIST", // 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 - MAX_MEMBER_LIST_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MEMBER_LIST", //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 + MAX_MEMBER_LIST_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROW_COUNT", // 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 + ADD_COLUMN_SCHEMA("ROW_COUNT", //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("DATA_SIZE", // 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 + ADD_COLUMN_SCHEMA("DATA_SIZE", //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("DATA_VERSION", // 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 + ADD_COLUMN_SCHEMA("DATA_VERSION", //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("DATA_CHECKSUM", // 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 + ADD_COLUMN_SCHEMA("DATA_CHECKSUM", //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("ROW_CHECKSUM", // 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 + ADD_COLUMN_SCHEMA("ROW_CHECKSUM", //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("COLUMN_CHECKSUM", // 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 - COLUMN_CHECKSUM_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLUMN_CHECKSUM", //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 + COLUMN_CHECKSUM_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IS_ORIGINAL_LEADER", // 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 + ADD_COLUMN_SCHEMA("IS_ORIGINAL_LEADER", //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("IS_PREVIOUS_LEADER", // 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 + ADD_COLUMN_SCHEMA("IS_PREVIOUS_LEADER", //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("CREATE_TIME", // 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 + ADD_COLUMN_SCHEMA("CREATE_TIME", //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("REBUILD", // 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 + ADD_COLUMN_SCHEMA("REBUILD", //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("REPLICA_TYPE", // 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 + ADD_COLUMN_SCHEMA("REPLICA_TYPE", //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("REQUIRED_SIZE", // 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 + ADD_COLUMN_SCHEMA("REQUIRED_SIZE", //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("STATUS", // 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 - MAX_REPLICA_STATUS_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("STATUS", //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 + MAX_REPLICA_STATUS_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IS_RESTORE", // 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 + ADD_COLUMN_SCHEMA("IS_RESTORE", //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("PARTITION_CHECKSUM", // 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 + ADD_COLUMN_SCHEMA("PARTITION_CHECKSUM", //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("QUORUM", // 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 + ADD_COLUMN_SCHEMA("QUORUM", //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("FAIL_LIST", // 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 - OB_MAX_FAILLIST_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("FAIL_LIST", //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 + OB_MAX_FAILLIST_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("RECOVERY_TIMESTAMP", // 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 + ADD_COLUMN_SCHEMA("RECOVERY_TIMESTAMP", //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("MEMSTORE_PERCENT", // 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 + ADD_COLUMN_SCHEMA("MEMSTORE_PERCENT", //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("DATA_FILE_ID", // 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 + ADD_COLUMN_SCHEMA("DATA_FILE_ID", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3843,17 +3838,16 @@ int ObInnerTableSchema::all_virtual_tenant_meta_table_agent_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_audit_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_audit_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -3884,1248 +3878,1248 @@ int ObInnerTableSchema::all_virtual_sql_audit_ora_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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("TENANT_ID", // column_name - ++column_id, // column_id - 3, // 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("REQUEST_ID", // column_name - ++column_id, // column_id - 4, // 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("TRACE_ID", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CLIENT_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CLIENT_PORT", // 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("TENANT_NAME", // 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 - OB_MAX_TENANT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EFFECTIVE_TENANT_ID", // 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("USER_ID", // 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("USER_NAME", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DB_ID", // 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("DB_NAME", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_ID", // 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 - OB_MAX_SQL_ID_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("QUERY_SQL", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PLAN_ID", // 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("AFFECTED_ROWS", // 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("RETURN_ROWS", // 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("PARTITION_CNT", // 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("RET_CODE", // 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("QC_ID", // 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("DFO_ID", // 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("SQC_ID", // 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("WORKER_ID", // 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("EVENT", // 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 - OB_MAX_WAIT_EVENT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("P1TEXT", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("P1", // 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("P2TEXT", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("P2", // 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("P3TEXT", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("P3", // 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("LEVEL", // 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("WAIT_CLASS_ID", // 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("WAIT_CLASS#", // 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("WAIT_CLASS", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STATE", // 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 - 19, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("WAIT_TIME_MICRO", // 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("TOTAL_WAIT_TIME_MICRO", // 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("TOTAL_WAITS", // 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("RPC_COUNT", // 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("PLAN_TYPE", // 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("IS_INNER_SQL", // 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("IS_EXECUTOR_RPC", // 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("IS_HIT_PLAN", // 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("REQUEST_TIME", // 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("ELAPSED_TIME", // 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("NET_TIME", // 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("NET_WAIT_TIME", // 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("QUEUE_TIME", // 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("DECODE_TIME", // 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("GET_PLAN_TIME", // 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("EXECUTE_TIME", // 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("APPLICATION_WAIT_TIME", // 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("CONCURRENCY_WAIT_TIME", // 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("USER_IO_WAIT_TIME", // 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("SCHEDULE_TIME", // 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("ROW_CACHE_HIT", // 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("BLOOM_FILTER_CACHE_HIT", // 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("BLOCK_CACHE_HIT", // 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("BLOCK_INDEX_CACHE_HIT", // 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("DISK_READS", // 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("EXECUTION_ID", // 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("SESSION_ID", // 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("RETRY_CNT", // 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("TABLE_SCAN", // 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("CONSISTENCY_LEVEL", // 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("MEMSTORE_READ_ROW_COUNT", // 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("SSSTORE_READ_ROW_COUNT", // 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("REQUEST_MEMORY_USED", // 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("EXPECTED_WORKER_COUNT", // 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("USED_WORKER_COUNT", // 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("SCHED_INFO", // 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 - 16384, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("FUSE_ROW_CACHE_HIT", // 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("USER_CLIENT_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PS_STMT_ID", // 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("TRANSACTION_HASH", // 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("REQUEST_TYPE", // 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("IS_BATCHED_MULTI_STMT", // 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("OB_TRACE_INFO", // 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 - 4096, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PLAN_HASH", // 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("USER_GROUP", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LOCK_FOR_READ_TIME", // 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("WAIT_TRX_MIGRATE_TIME", // 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 + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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("TENANT_ID", //column_name + ++column_id, //column_id + 3, //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("REQUEST_ID", //column_name + ++column_id, //column_id + 4, //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("TRACE_ID", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("CLIENT_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("CLIENT_PORT", //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("TENANT_NAME", //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 + OB_MAX_TENANT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("EFFECTIVE_TENANT_ID", //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("USER_ID", //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("USER_NAME", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("DB_ID", //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("DB_NAME", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("SQL_ID", //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 + OB_MAX_SQL_ID_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("QUERY_SQL", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PLAN_ID", //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("AFFECTED_ROWS", //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("RETURN_ROWS", //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("PARTITION_CNT", //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("RET_CODE", //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("QC_ID", //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("DFO_ID", //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("SQC_ID", //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("WORKER_ID", //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("EVENT", //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 + OB_MAX_WAIT_EVENT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("P1TEXT", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("P1", //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("P2TEXT", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("P2", //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("P3TEXT", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("P3", //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("LEVEL", //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("WAIT_CLASS_ID", //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("WAIT_CLASS#", //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("WAIT_CLASS", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("STATE", //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 + 19, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("WAIT_TIME_MICRO", //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("TOTAL_WAIT_TIME_MICRO", //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("TOTAL_WAITS", //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("RPC_COUNT", //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("PLAN_TYPE", //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("IS_INNER_SQL", //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("IS_EXECUTOR_RPC", //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("IS_HIT_PLAN", //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("REQUEST_TIME", //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("ELAPSED_TIME", //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("NET_TIME", //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("NET_WAIT_TIME", //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("QUEUE_TIME", //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("DECODE_TIME", //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("GET_PLAN_TIME", //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("EXECUTE_TIME", //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("APPLICATION_WAIT_TIME", //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("CONCURRENCY_WAIT_TIME", //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("USER_IO_WAIT_TIME", //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("SCHEDULE_TIME", //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("ROW_CACHE_HIT", //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("BLOOM_FILTER_CACHE_HIT", //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("BLOCK_CACHE_HIT", //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("BLOCK_INDEX_CACHE_HIT", //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("DISK_READS", //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("EXECUTION_ID", //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("SESSION_ID", //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("RETRY_CNT", //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("TABLE_SCAN", //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("CONSISTENCY_LEVEL", //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("MEMSTORE_READ_ROW_COUNT", //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("SSSTORE_READ_ROW_COUNT", //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("REQUEST_MEMORY_USED", //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("EXPECTED_WORKER_COUNT", //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("USED_WORKER_COUNT", //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("SCHED_INFO", //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 + 16384, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("FUSE_ROW_CACHE_HIT", //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("USER_CLIENT_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PS_STMT_ID", //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("TRANSACTION_HASH", //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("REQUEST_TYPE", //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("IS_BATCHED_MULTI_STMT", //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("OB_TRACE_INFO", //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 + 4096, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PLAN_HASH", //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("USER_GROUP", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("LOCK_FOR_READ_TIME", //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("WAIT_TRX_MIGRATE_TIME", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -5143,17 +5137,16 @@ int ObInnerTableSchema::all_virtual_sql_audit_ora_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_audit_ora_all_virtual_sql_audit_i1_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_audit_ora_all_virtual_sql_audit_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -5197,63 +5190,63 @@ int ObInnerTableSchema::all_virtual_sql_audit_ora_all_virtual_sql_audit_i1_schem table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - column_id + 3, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + column_id + 3, //column_id + 1, //rowkey_id + 1, //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("REQUEST_ID", // column_name - column_id + 4, // column_id - 2, // rowkey_id - 2, // 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 + ADD_COLUMN_SCHEMA("REQUEST_ID", //column_name + column_id + 4, //column_id + 2, //rowkey_id + 2, //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("SVR_IP", // column_name - column_id + 1, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + column_id + 1, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - column_id + 2, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + column_id + 2, //column_id + 4, //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_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -5263,12 +5256,12 @@ int ObInnerTableSchema::all_virtual_sql_audit_ora_all_virtual_sql_audit_i1_schem return ret; } -int ObInnerTableSchema::all_virtual_plan_stat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_plan_stat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -5299,978 +5292,978 @@ int ObInnerTableSchema::all_virtual_plan_stat_ora_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("SVR_IP", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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("PLAN_ID", // 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 + ADD_COLUMN_SCHEMA("PLAN_ID", //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("SQL_ID", // 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 - OB_MAX_SQL_ID_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_ID", //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 + OB_MAX_SQL_ID_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TYPE", // 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 + ADD_COLUMN_SCHEMA("TYPE", //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("IS_BIND_SENSITIVE", // 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 + ADD_COLUMN_SCHEMA("IS_BIND_SENSITIVE", //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("IS_BIND_AWARE", // 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 + ADD_COLUMN_SCHEMA("IS_BIND_AWARE", //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("STATEMENT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("STATEMENT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("QUERY_SQL", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("QUERY_SQL", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPECIAL_PARAMS", // 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 - OB_MAX_COMMAND_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPECIAL_PARAMS", //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 + OB_MAX_COMMAND_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARAM_INFOS", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARAM_INFOS", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SYS_VARS", // 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 - OB_MAX_COMMAND_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SYS_VARS", //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 + OB_MAX_COMMAND_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PLAN_HASH", // 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 + ADD_COLUMN_SCHEMA("PLAN_HASH", //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("FIRST_LOAD_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("FIRST_LOAD_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("MERGED_VERSION", // 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 + ADD_COLUMN_SCHEMA("MERGED_VERSION", //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("LAST_ACTIVE_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LAST_ACTIVE_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("AVG_EXE_USEC", // 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 + ADD_COLUMN_SCHEMA("AVG_EXE_USEC", //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("SLOWEST_EXE_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SLOWEST_EXE_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SLOWEST_EXE_USEC", // 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 + ADD_COLUMN_SCHEMA("SLOWEST_EXE_USEC", //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("SLOW_COUNT", // 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 + ADD_COLUMN_SCHEMA("SLOW_COUNT", //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("HIT_COUNT", // 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 + ADD_COLUMN_SCHEMA("HIT_COUNT", //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("PLAN_SIZE", // 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 + ADD_COLUMN_SCHEMA("PLAN_SIZE", //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("EXECUTIONS", // 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 + ADD_COLUMN_SCHEMA("EXECUTIONS", //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("DISK_READS", // 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 + ADD_COLUMN_SCHEMA("DISK_READS", //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("DIRECT_WRITES", // 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 + ADD_COLUMN_SCHEMA("DIRECT_WRITES", //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("BUFFER_GETS", // 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 + ADD_COLUMN_SCHEMA("BUFFER_GETS", //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("APPLICATION_WAIT_TIME", // 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 + ADD_COLUMN_SCHEMA("APPLICATION_WAIT_TIME", //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("CONCURRENCY_WAIT_TIME", // 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 + ADD_COLUMN_SCHEMA("CONCURRENCY_WAIT_TIME", //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("USER_IO_WAIT_TIME", // 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 + ADD_COLUMN_SCHEMA("USER_IO_WAIT_TIME", //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("ROWS_PROCESSED", // 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 + ADD_COLUMN_SCHEMA("ROWS_PROCESSED", //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("ELAPSED_TIME", // 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 + ADD_COLUMN_SCHEMA("ELAPSED_TIME", //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("CPU_TIME", // 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 + ADD_COLUMN_SCHEMA("CPU_TIME", //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("LARGE_QUERYS", // 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 + ADD_COLUMN_SCHEMA("LARGE_QUERYS", //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("DELAYED_LARGE_QUERYS", // 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 + ADD_COLUMN_SCHEMA("DELAYED_LARGE_QUERYS", //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("OUTLINE_VERSION", // 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 + ADD_COLUMN_SCHEMA("OUTLINE_VERSION", //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("OUTLINE_ID", // 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 + ADD_COLUMN_SCHEMA("OUTLINE_ID", //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("OUTLINE_DATA", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OUTLINE_DATA", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ACS_SEL_INFO", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ACS_SEL_INFO", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLE_SCAN", // 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 + ADD_COLUMN_SCHEMA("TABLE_SCAN", //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("DB_ID", // 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 + ADD_COLUMN_SCHEMA("DB_ID", //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("EVOLUTION", // 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 + ADD_COLUMN_SCHEMA("EVOLUTION", //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("EVO_EXECUTIONS", // 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 + ADD_COLUMN_SCHEMA("EVO_EXECUTIONS", //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("EVO_CPU_TIME", // 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 + ADD_COLUMN_SCHEMA("EVO_CPU_TIME", //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("TIMEOUT_COUNT", // 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 + ADD_COLUMN_SCHEMA("TIMEOUT_COUNT", //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("PS_STMT_ID", // 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 + ADD_COLUMN_SCHEMA("PS_STMT_ID", //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("DELAYED_PX_QUERYS", // 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 + ADD_COLUMN_SCHEMA("DELAYED_PX_QUERYS", //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("SESSID", // 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 + ADD_COLUMN_SCHEMA("SESSID", //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("TEMP_TABLES", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TEMP_TABLES", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IS_USE_JIT", // 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 + ADD_COLUMN_SCHEMA("IS_USE_JIT", //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("OBJECT_TYPE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OBJECT_TYPE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ENABLE_BF_CACHE", // 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 + ADD_COLUMN_SCHEMA("ENABLE_BF_CACHE", //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("BF_FILTER_CNT", // 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 + ADD_COLUMN_SCHEMA("BF_FILTER_CNT", //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("BF_ACCESS_CNT", // 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 + ADD_COLUMN_SCHEMA("BF_ACCESS_CNT", //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("ENABLE_ROW_CACHE", // 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 + ADD_COLUMN_SCHEMA("ENABLE_ROW_CACHE", //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("ROW_CACHE_HIT_CNT", // 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 + ADD_COLUMN_SCHEMA("ROW_CACHE_HIT_CNT", //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("ROW_CACHE_MISS_CNT", // 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 + ADD_COLUMN_SCHEMA("ROW_CACHE_MISS_CNT", //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("ENABLE_FUSE_ROW_CACHE", // 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 + ADD_COLUMN_SCHEMA("ENABLE_FUSE_ROW_CACHE", //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("FUSE_ROW_CACHE_HIT_CNT", // 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 + ADD_COLUMN_SCHEMA("FUSE_ROW_CACHE_HIT_CNT", //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("FUSE_ROW_CACHE_MISS_CNT", // 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 + ADD_COLUMN_SCHEMA("FUSE_ROW_CACHE_MISS_CNT", //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("HINTS_INFO", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HINTS_INFO", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("HINTS_ALL_WORKED", // 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 + ADD_COLUMN_SCHEMA("HINTS_ALL_WORKED", //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("PL_SCHEMA_ID", // 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 + ADD_COLUMN_SCHEMA("PL_SCHEMA_ID", //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("IS_BATCHED_MULTI_STMT", // 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 + ADD_COLUMN_SCHEMA("IS_BATCHED_MULTI_STMT", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -6288,17 +6281,16 @@ int ObInnerTableSchema::all_virtual_plan_stat_ora_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_plan_statistics_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_plan_statistics_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -6329,228 +6321,228 @@ int ObInnerTableSchema::all_virtual_sql_plan_statistics_agent_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("SVR_IP", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 3, //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("PLAN_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("PLAN_ID", //column_name + ++column_id, //column_id + 4, //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("OPERATION_ID", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("OPERATION_ID", //column_name + ++column_id, //column_id + 5, //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("EXECUTIONS", // 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 + ADD_COLUMN_SCHEMA("EXECUTIONS", //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("OUTPUT_ROWS", // 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 + ADD_COLUMN_SCHEMA("OUTPUT_ROWS", //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("INPUT_ROWS", // 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 + ADD_COLUMN_SCHEMA("INPUT_ROWS", //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("RESCAN_TIMES", // 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 + ADD_COLUMN_SCHEMA("RESCAN_TIMES", //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("BUFFER_GETS", // 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 + ADD_COLUMN_SCHEMA("BUFFER_GETS", //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("DISK_READS", // 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 + ADD_COLUMN_SCHEMA("DISK_READS", //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("DISK_WRITES", // 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 + ADD_COLUMN_SCHEMA("DISK_WRITES", //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("ELAPSED_TIME", // 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 + ADD_COLUMN_SCHEMA("ELAPSED_TIME", //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("EXTEND_INFO1", // 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 - OB_MAX_MONITOR_INFO_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXTEND_INFO1", //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 + OB_MAX_MONITOR_INFO_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXTEND_INFO2", // 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 - OB_MAX_MONITOR_INFO_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXTEND_INFO2", //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 + OB_MAX_MONITOR_INFO_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6560,17 +6552,16 @@ int ObInnerTableSchema::all_virtual_sql_plan_statistics_agent_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_plan_cache_plan_explain_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_plan_cache_plan_explain_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -6601,168 +6592,168 @@ int ObInnerTableSchema::all_virtual_plan_cache_plan_explain_ora_schema(ObTableSc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("SVR_IP", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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("PLAN_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("PLAN_ID", //column_name + ++column_id, //column_id + 4, //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("OPERATOR", // 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 - OB_MAX_OPERATOR_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OPERATOR", //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 + OB_MAX_OPERATOR_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NAME", // 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 - OB_MAX_PLAN_EXPLAIN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NAME", //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 + OB_MAX_PLAN_EXPLAIN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROWS", // 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 + ADD_COLUMN_SCHEMA("ROWS", //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("COST", // 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 + ADD_COLUMN_SCHEMA("COST", //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("PROPERTY", // 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 - OB_MAX_OPERATOR_PROPERTY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PROPERTY", //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 + OB_MAX_OPERATOR_PROPERTY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PLAN_DEPTH", // 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 + ADD_COLUMN_SCHEMA("PLAN_DEPTH", //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("PLAN_LINE_ID", // 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 + ADD_COLUMN_SCHEMA("PLAN_LINE_ID", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -6780,17 +6771,16 @@ int ObInnerTableSchema::all_virtual_plan_cache_plan_explain_ora_schema(ObTableSc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sequence_value_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sequence_value_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -6821,78 +6811,78 @@ int ObInnerTableSchema::all_virtual_sequence_value_agent_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("SEQUENCE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("SEQUENCE_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NEXT_VALUE", // 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 + ADD_COLUMN_SCHEMA("NEXT_VALUE", //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(FLAT_ROW_STORE); @@ -6902,17 +6892,16 @@ int ObInnerTableSchema::all_virtual_sequence_value_agent_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sequence_object_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sequence_object_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -6943,213 +6932,213 @@ int ObInnerTableSchema::all_virtual_sequence_object_agent_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("SEQUENCE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("SEQUENCE_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("SEQUENCE_NAME", // 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 - OB_MAX_SEQUENCE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SEQUENCE_NAME", //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 + OB_MAX_SEQUENCE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MIN_VALUE", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MIN_VALUE", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAX_VALUE", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MAX_VALUE", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INCREMENT_BY", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("INCREMENT_BY", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("START_WITH", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("START_WITH", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CACHE_SIZE", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CACHE_SIZE", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ORDER_FLAG", // 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 + ADD_COLUMN_SCHEMA("ORDER_FLAG", //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("CYCLE_FLAG", // 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 + ADD_COLUMN_SCHEMA("CYCLE_FLAG", //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(FLAT_ROW_STORE); @@ -7159,17 +7148,16 @@ int ObInnerTableSchema::all_virtual_sequence_object_agent_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_user_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_user_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -7200,558 +7188,558 @@ int ObInnerTableSchema::all_virtual_user_agent_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("USER_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("USER_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("USER_NAME", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USER_NAME", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("HOST", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HOST", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PASSWD", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PASSWD", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INFO", // 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 - OB_MAX_USER_INFO_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("INFO", //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 + OB_MAX_USER_INFO_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIV_ALTER", // 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 + ADD_COLUMN_SCHEMA("PRIV_ALTER", //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("PRIV_CREATE", // 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 + ADD_COLUMN_SCHEMA("PRIV_CREATE", //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("PRIV_DELETE", // 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 + ADD_COLUMN_SCHEMA("PRIV_DELETE", //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("PRIV_DROP", // 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 + ADD_COLUMN_SCHEMA("PRIV_DROP", //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("PRIV_GRANT_OPTION", // 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 + ADD_COLUMN_SCHEMA("PRIV_GRANT_OPTION", //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("PRIV_INSERT", // 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 + ADD_COLUMN_SCHEMA("PRIV_INSERT", //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("PRIV_UPDATE", // 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 + ADD_COLUMN_SCHEMA("PRIV_UPDATE", //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("PRIV_SELECT", // 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 + ADD_COLUMN_SCHEMA("PRIV_SELECT", //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("PRIV_INDEX", // 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 + ADD_COLUMN_SCHEMA("PRIV_INDEX", //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("PRIV_CREATE_VIEW", // 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 + ADD_COLUMN_SCHEMA("PRIV_CREATE_VIEW", //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("PRIV_SHOW_VIEW", // 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 + ADD_COLUMN_SCHEMA("PRIV_SHOW_VIEW", //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("PRIV_SHOW_DB", // 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 + ADD_COLUMN_SCHEMA("PRIV_SHOW_DB", //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("PRIV_CREATE_USER", // 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 + ADD_COLUMN_SCHEMA("PRIV_CREATE_USER", //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("PRIV_SUPER", // 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 + ADD_COLUMN_SCHEMA("PRIV_SUPER", //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("IS_LOCKED", // 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 + ADD_COLUMN_SCHEMA("IS_LOCKED", //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("PRIV_PROCESS", // 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 + ADD_COLUMN_SCHEMA("PRIV_PROCESS", //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("PRIV_CREATE_SYNONYM", // 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 + ADD_COLUMN_SCHEMA("PRIV_CREATE_SYNONYM", //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("SSL_TYPE", // 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 + ADD_COLUMN_SCHEMA("SSL_TYPE", //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("SSL_CIPHER", // 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 - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SSL_CIPHER", //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 + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("X509_ISSUER", // 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 - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("X509_ISSUER", //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 + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("X509_SUBJECT", // 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 - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("X509_SUBJECT", //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 + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TYPE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TYPE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROFILE_ID", // 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 + ADD_COLUMN_SCHEMA("PROFILE_ID", //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("PASSWORD_LAST_CHANGED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PASSWORD_LAST_CHANGED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIV_FILE", // 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 + ADD_COLUMN_SCHEMA("PRIV_FILE", //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("PRIV_ALTER_TENANT", // 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 + ADD_COLUMN_SCHEMA("PRIV_ALTER_TENANT", //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("PRIV_ALTER_SYSTEM", // 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 + ADD_COLUMN_SCHEMA("PRIV_ALTER_SYSTEM", //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("PRIV_CREATE_RESOURCE_POOL", // 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 + ADD_COLUMN_SCHEMA("PRIV_CREATE_RESOURCE_POOL", //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("PRIV_CREATE_RESOURCE_UNIT", // 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 + ADD_COLUMN_SCHEMA("PRIV_CREATE_RESOURCE_UNIT", //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(FLAT_ROW_STORE); @@ -7761,17 +7749,16 @@ int ObInnerTableSchema::all_virtual_user_agent_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_synonym_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_synonym_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -7802,138 +7789,138 @@ int ObInnerTableSchema::all_virtual_synonym_agent_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("SYNONYM_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("SYNONYM_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("SYNONYM_NAME", // 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 - OB_MAX_SYNONYM_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SYNONYM_NAME", //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 + OB_MAX_SYNONYM_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OBJECT_NAME", // 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 - OB_MAX_SYNONYM_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OBJECT_NAME", //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 + OB_MAX_SYNONYM_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OBJECT_DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("OBJECT_DATABASE_ID", //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(FLAT_ROW_STORE); @@ -7943,17 +7930,16 @@ int ObInnerTableSchema::all_virtual_synonym_agent_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_foreign_key_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_foreign_key_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -7984,213 +7970,213 @@ int ObInnerTableSchema::all_virtual_foreign_key_agent_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("FOREIGN_KEY_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("FOREIGN_KEY_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("FOREIGN_KEY_NAME", // 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 - OB_MAX_CONSTRAINT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("FOREIGN_KEY_NAME", //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 + OB_MAX_CONSTRAINT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHILD_TABLE_ID", // 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 + ADD_COLUMN_SCHEMA("CHILD_TABLE_ID", //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("PARENT_TABLE_ID", // 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 + ADD_COLUMN_SCHEMA("PARENT_TABLE_ID", //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("UPDATE_ACTION", // 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 + ADD_COLUMN_SCHEMA("UPDATE_ACTION", //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("DELETE_ACTION", // 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 + ADD_COLUMN_SCHEMA("DELETE_ACTION", //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("ENABLE_FLAG", // 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 + ADD_COLUMN_SCHEMA("ENABLE_FLAG", //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("REF_CST_TYPE", // 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 + ADD_COLUMN_SCHEMA("REF_CST_TYPE", //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("REF_CST_ID", // 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 + ADD_COLUMN_SCHEMA("REF_CST_ID", //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("VALIDATE_FLAG", // 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 + ADD_COLUMN_SCHEMA("VALIDATE_FLAG", //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("RELY_FLAG", // 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 + ADD_COLUMN_SCHEMA("RELY_FLAG", //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(FLAT_ROW_STORE); @@ -8200,17 +8186,16 @@ int ObInnerTableSchema::all_virtual_foreign_key_agent_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_column_stat_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_column_stat_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -8241,318 +8226,318 @@ int ObInnerTableSchema::all_virtual_column_stat_agent_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("PARTITION_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PARTITION_ID", //column_name + ++column_id, //column_id + 3, //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("COLUMN_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("COLUMN_ID", //column_name + ++column_id, //column_id + 4, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OBJECT_TYPE", // 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 + ADD_COLUMN_SCHEMA("OBJECT_TYPE", //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("LAST_ANALYZED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LAST_ANALYZED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DISTINCT_CNT", // 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 + ADD_COLUMN_SCHEMA("DISTINCT_CNT", //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("NULL_CNT", // 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 + ADD_COLUMN_SCHEMA("NULL_CNT", //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_VALUE", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MAX_VALUE", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("B_MAX_VALUE", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("B_MAX_VALUE", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MIN_VALUE", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MIN_VALUE", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("B_MIN_VALUE", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("B_MIN_VALUE", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("AVG_LEN", // 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 + ADD_COLUMN_SCHEMA("AVG_LEN", //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("DISTINCT_CNT_SYNOPSIS", // 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 - MAX_LLC_BITMAP_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DISTINCT_CNT_SYNOPSIS", //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 + MAX_LLC_BITMAP_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DISTINCT_CNT_SYNOPSIS_SIZE", // 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 + ADD_COLUMN_SCHEMA("DISTINCT_CNT_SYNOPSIS_SIZE", //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("SAMPLE_SIZE", // 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 + ADD_COLUMN_SCHEMA("SAMPLE_SIZE", //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("DENSITY", // 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 + ADD_COLUMN_SCHEMA("DENSITY", //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("BUCKET_CNT", // 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 + ADD_COLUMN_SCHEMA("BUCKET_CNT", //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("HISTOGRAM_TYPE", // 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 + ADD_COLUMN_SCHEMA("HISTOGRAM_TYPE", //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(FLAT_ROW_STORE); @@ -8562,17 +8547,16 @@ int ObInnerTableSchema::all_virtual_column_stat_agent_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_column_statistic_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_column_statistic_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -8603,213 +8587,213 @@ int ObInnerTableSchema::all_virtual_column_statistic_agent_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("PARTITION_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PARTITION_ID", //column_name + ++column_id, //column_id + 3, //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("COLUMN_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("COLUMN_ID", //column_name + ++column_id, //column_id + 4, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NUM_DISTINCT", // 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 + ADD_COLUMN_SCHEMA("NUM_DISTINCT", //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("NUM_NULL", // 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 + ADD_COLUMN_SCHEMA("NUM_NULL", //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("MIN_VALUE", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MIN_VALUE", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAX_VALUE", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MAX_VALUE", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LLC_BITMAP", // 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 - MAX_LLC_BITMAP_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LLC_BITMAP", //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 + MAX_LLC_BITMAP_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LLC_BITMAP_SIZE", // 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 + ADD_COLUMN_SCHEMA("LLC_BITMAP_SIZE", //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("VERSION", // 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 + ADD_COLUMN_SCHEMA("VERSION", //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("LAST_REBUILD_VERSION", // 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 + ADD_COLUMN_SCHEMA("LAST_REBUILD_VERSION", //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(FLAT_ROW_STORE); @@ -8819,17 +8803,16 @@ int ObInnerTableSchema::all_virtual_column_statistic_agent_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_partition_table_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_partition_table_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -8860,453 +8843,453 @@ int ObInnerTableSchema::all_virtual_partition_table_agent_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("PARTITION_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PARTITION_ID", //column_name + ++column_id, //column_id + 3, //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("SVR_IP", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 5, //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("SQL_PORT", // 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 + ADD_COLUMN_SCHEMA("SQL_PORT", //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("UNIT_ID", // 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 + ADD_COLUMN_SCHEMA("UNIT_ID", //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("PARTITION_CNT", // 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 + ADD_COLUMN_SCHEMA("PARTITION_CNT", //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("ZONE", // 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 - MAX_ZONE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ZONE", //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 + MAX_ZONE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROLE", // 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 + ADD_COLUMN_SCHEMA("ROLE", //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("MEMBER_LIST", // 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 - MAX_MEMBER_LIST_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MEMBER_LIST", //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 + MAX_MEMBER_LIST_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROW_COUNT", // 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 + ADD_COLUMN_SCHEMA("ROW_COUNT", //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("DATA_SIZE", // 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 + ADD_COLUMN_SCHEMA("DATA_SIZE", //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("DATA_VERSION", // 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 + ADD_COLUMN_SCHEMA("DATA_VERSION", //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("DATA_CHECKSUM", // 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 + ADD_COLUMN_SCHEMA("DATA_CHECKSUM", //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("ROW_CHECKSUM", // 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 + ADD_COLUMN_SCHEMA("ROW_CHECKSUM", //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("COLUMN_CHECKSUM", // 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 - COLUMN_CHECKSUM_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLUMN_CHECKSUM", //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 + COLUMN_CHECKSUM_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IS_ORIGINAL_LEADER", // 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 + ADD_COLUMN_SCHEMA("IS_ORIGINAL_LEADER", //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("TO_LEADER_TIME", // 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 + ADD_COLUMN_SCHEMA("TO_LEADER_TIME", //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("CREATE_TIME", // 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 + ADD_COLUMN_SCHEMA("CREATE_TIME", //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("REBUILD", // 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 + ADD_COLUMN_SCHEMA("REBUILD", //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("REPLICA_TYPE", // 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 + ADD_COLUMN_SCHEMA("REPLICA_TYPE", //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("STATUS", // 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 - MAX_REPLICA_STATUS_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("STATUS", //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 + MAX_REPLICA_STATUS_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARTITION_CHECKSUM", // 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 + ADD_COLUMN_SCHEMA("PARTITION_CHECKSUM", //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("REQUIRED_SIZE", // 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 + ADD_COLUMN_SCHEMA("REQUIRED_SIZE", //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("IS_RESTORE", // 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 + ADD_COLUMN_SCHEMA("IS_RESTORE", //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("QUORUM", // 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 + ADD_COLUMN_SCHEMA("QUORUM", //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("FAIL_LIST", // 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 - OB_MAX_FAILLIST_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("FAIL_LIST", //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 + OB_MAX_FAILLIST_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("RECOVERY_TIMESTAMP", // 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 + ADD_COLUMN_SCHEMA("RECOVERY_TIMESTAMP", //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("MEMSTORE_PERCENT", // 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 + ADD_COLUMN_SCHEMA("MEMSTORE_PERCENT", //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_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9316,17 +9299,16 @@ int ObInnerTableSchema::all_virtual_partition_table_agent_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_table_stat_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_table_stat_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -9357,198 +9339,198 @@ int ObInnerTableSchema::all_virtual_table_stat_agent_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("PARTITION_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PARTITION_ID", //column_name + ++column_id, //column_id + 3, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OBJECT_TYPE", // 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 + ADD_COLUMN_SCHEMA("OBJECT_TYPE", //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("LAST_ANALYZED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LAST_ANALYZED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SSTABLE_ROW_CNT", // 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 + ADD_COLUMN_SCHEMA("SSTABLE_ROW_CNT", //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("SSTABLE_AVG_ROW_LEN", // 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 + ADD_COLUMN_SCHEMA("SSTABLE_AVG_ROW_LEN", //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("MACRO_BLK_CNT", // 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 + ADD_COLUMN_SCHEMA("MACRO_BLK_CNT", //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("MICRO_BLK_CNT", // 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 + ADD_COLUMN_SCHEMA("MICRO_BLK_CNT", //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("MEMTABLE_ROW_CNT", // 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 + ADD_COLUMN_SCHEMA("MEMTABLE_ROW_CNT", //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("MEMTABLE_AVG_ROW_LEN", // 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 + ADD_COLUMN_SCHEMA("MEMTABLE_AVG_ROW_LEN", //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(FLAT_ROW_STORE); @@ -9558,17 +9540,16 @@ int ObInnerTableSchema::all_virtual_table_stat_agent_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_recyclebin_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_recyclebin_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -9599,123 +9580,123 @@ int ObInnerTableSchema::all_virtual_recyclebin_agent_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("OBJECT_NAME", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_OBJECT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OBJECT_NAME", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_OBJECT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TYPE", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("TYPE", //column_name + ++column_id, //column_id + 3, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("TABLE_ID", // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //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("TABLEGROUP_ID", // 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 + ADD_COLUMN_SCHEMA("TABLEGROUP_ID", //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("ORIGINAL_NAME", // 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 - OB_MAX_ORIGINAL_NANE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ORIGINAL_NAME", //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 + OB_MAX_ORIGINAL_NANE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9725,17 +9706,16 @@ int ObInnerTableSchema::all_virtual_recyclebin_agent_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_outline_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_outline_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -9766,138 +9746,138 @@ int ObInnerTableSchema::tenant_virtual_outline_agent_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("OUTLINE_ID", // 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 + ADD_COLUMN_SCHEMA("OUTLINE_ID", //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("DATABASE_NAME", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DATABASE_NAME", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OUTLINE_NAME", // 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 - OB_MAX_OUTLINE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OUTLINE_NAME", //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 + OB_MAX_OUTLINE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VISIBLE_SIGNATURE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VISIBLE_SIGNATURE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_TEXT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_TEXT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OUTLINE_TARGET", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OUTLINE_TARGET", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OUTLINE_SQL", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OUTLINE_SQL", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9907,17 +9887,16 @@ int ObInnerTableSchema::tenant_virtual_outline_agent_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_routine_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_routine_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -9948,288 +9927,288 @@ int ObInnerTableSchema::all_virtual_routine_agent_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("ROUTINE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("ROUTINE_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("PACKAGE_ID", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_ID", //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("ROUTINE_NAME", // 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 - OB_MAX_ROUTINE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROUTINE_NAME", //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 + OB_MAX_ROUTINE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OVERLOAD", // 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 + ADD_COLUMN_SCHEMA("OVERLOAD", //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("SUBPROGRAM_ID", // 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 + ADD_COLUMN_SCHEMA("SUBPROGRAM_ID", //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("ROUTINE_TYPE", // 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 + ADD_COLUMN_SCHEMA("ROUTINE_TYPE", //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("FLAG", // 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 + ADD_COLUMN_SCHEMA("FLAG", //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("OWNER_ID", // 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 + ADD_COLUMN_SCHEMA("OWNER_ID", //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("PRIV_USER", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PRIV_USER", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMP_FLAG", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMP_FLAG", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXEC_ENV", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXEC_ENV", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROUTINE_BODY", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROUTINE_BODY", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROUTE_SQL", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROUTE_SQL", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //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(FLAT_ROW_STORE); @@ -10239,17 +10218,16 @@ int ObInnerTableSchema::all_virtual_routine_agent_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tablegroup_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tablegroup_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -10280,348 +10258,348 @@ int ObInnerTableSchema::all_virtual_tablegroup_agent_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLEGROUP_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLEGROUP_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLEGROUP_NAME", // 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 - OB_MAX_TABLEGROUP_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TABLEGROUP_NAME", //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 + OB_MAX_TABLEGROUP_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - MAX_TABLEGROUP_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + MAX_TABLEGROUP_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIMARY_ZONE", // 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 - MAX_ZONE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PRIMARY_ZONE", //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 + MAX_ZONE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LOCALITY", // 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 - MAX_LOCALITY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LOCALITY", //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 + MAX_LOCALITY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PART_LEVEL", // 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 + ADD_COLUMN_SCHEMA("PART_LEVEL", //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("PART_FUNC_TYPE", // 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 + ADD_COLUMN_SCHEMA("PART_FUNC_TYPE", //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("PART_FUNC_EXPR_NUM", // 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 + ADD_COLUMN_SCHEMA("PART_FUNC_EXPR_NUM", //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("PART_NUM", // 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 + ADD_COLUMN_SCHEMA("PART_NUM", //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("SUB_PART_FUNC_TYPE", // 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 + ADD_COLUMN_SCHEMA("SUB_PART_FUNC_TYPE", //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("SUB_PART_FUNC_EXPR_NUM", // 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 + ADD_COLUMN_SCHEMA("SUB_PART_FUNC_EXPR_NUM", //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("SUB_PART_NUM", // 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 + ADD_COLUMN_SCHEMA("SUB_PART_NUM", //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_USED_PART_ID", // 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 + ADD_COLUMN_SCHEMA("MAX_USED_PART_ID", //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("PARTITION_STATUS", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARTITION_STATUS", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PREVIOUS_LOCALITY", // 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 - MAX_LOCALITY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PREVIOUS_LOCALITY", //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 + MAX_LOCALITY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARTITION_SCHEMA_VERSION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARTITION_SCHEMA_VERSION", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BINDING", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("BINDING", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DROP_SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("DROP_SCHEMA_VERSION", //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("IS_SUB_PART_TEMPLATE", // 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 + ADD_COLUMN_SCHEMA("IS_SUB_PART_TEMPLATE", //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(FLAT_ROW_STORE); @@ -10631,17 +10609,16 @@ int ObInnerTableSchema::all_virtual_tablegroup_agent_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_privilege_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_privilege_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -10672,48 +10649,48 @@ int ObInnerTableSchema::all_virtual_privilege_agent_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIVILEGE", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_COLUMN_PRIVILEGE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PRIVILEGE", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_COLUMN_PRIVILEGE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CONTEXT", // 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 - MAX_PRIVILEGE_CONTEXT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CONTEXT", //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 + MAX_PRIVILEGE_CONTEXT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - MAX_COLUMN_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + MAX_COLUMN_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10723,17 +10700,16 @@ int ObInnerTableSchema::all_virtual_privilege_agent_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sys_parameter_stat_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sys_parameter_stat_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -10764,228 +10740,228 @@ int ObInnerTableSchema::all_virtual_sys_parameter_stat_agent_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ZONE", // 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 - MAX_ZONE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ZONE", //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 + MAX_ZONE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_TYPE", // 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 - SERVER_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_TYPE", //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 + SERVER_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //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("NAME", // 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 - OB_MAX_CONFIG_NAME_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NAME", //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 + OB_MAX_CONFIG_NAME_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATA_TYPE", // 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 - OB_MAX_CONFIG_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DATA_TYPE", //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 + OB_MAX_CONFIG_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VALUE", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VALUE", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VALUE_STRICT", // 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 - OB_MAX_EXTRA_CONFIG_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VALUE_STRICT", //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 + OB_MAX_EXTRA_CONFIG_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INFO", // 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 - OB_MAX_CONFIG_INFO_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("INFO", //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 + OB_MAX_CONFIG_INFO_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NEED_REBOOT", // 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 + ADD_COLUMN_SCHEMA("NEED_REBOOT", //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("SECTION", // 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 - OB_MAX_CONFIG_SECTION_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SECTION", //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 + OB_MAX_CONFIG_SECTION_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VISIBLE_LEVEL", // 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 - OB_MAX_CONFIG_VISIBLE_LEVEL_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VISIBLE_LEVEL", //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 + OB_MAX_CONFIG_VISIBLE_LEVEL_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCOPE", // 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 - OB_MAX_CONFIG_SCOPE_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SCOPE", //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 + OB_MAX_CONFIG_SCOPE_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SOURCE", // 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 - OB_MAX_CONFIG_SOURCE_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SOURCE", //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 + OB_MAX_CONFIG_SOURCE_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EDIT_LEVEL", // 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 - OB_MAX_CONFIG_EDIT_LEVEL_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EDIT_LEVEL", //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 + OB_MAX_CONFIG_EDIT_LEVEL_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10995,17 +10971,16 @@ int ObInnerTableSchema::all_virtual_sys_parameter_stat_agent_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_table_index_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_table_index_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -11036,258 +11011,258 @@ int ObInnerTableSchema::tenant_virtual_table_index_agent_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLE_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 1, //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("KEY_NAME", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_COLUMN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("KEY_NAME", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_COLUMN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SEQ_IN_INDEX", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SEQ_IN_INDEX", //column_name + ++column_id, //column_id + 3, //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("TABLE_SCHEMA", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TABLE_SCHEMA", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLE", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TABLE", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NON_UNIQUE", // 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 + ADD_COLUMN_SCHEMA("NON_UNIQUE", //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("INDEX_SCHEMA", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("INDEX_SCHEMA", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COLUMN_NAME", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLUMN_NAME", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COLLATION", // 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 - MAX_COLLATION_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLLATION", //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 + MAX_COLLATION_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CARDINALITY", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CARDINALITY", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUB_PART", // 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 - INDEX_SUB_PART_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUB_PART", //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 + INDEX_SUB_PART_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PACKED", // 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 - INDEX_PACKED_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PACKED", //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 + INDEX_PACKED_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NULL", // 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 - INDEX_NULL_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NULL", //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 + INDEX_NULL_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INDEX_TYPE", // 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 - INDEX_NULL_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("INDEX_TYPE", //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 + INDEX_NULL_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INDEX_COMMENT", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("INDEX_COMMENT", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IS_VISIBLE", // 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 - MAX_COLUMN_YES_NO_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("IS_VISIBLE", //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 + MAX_COLUMN_YES_NO_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11297,17 +11272,16 @@ int ObInnerTableSchema::tenant_virtual_table_index_agent_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_charset_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_charset_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -11338,63 +11312,63 @@ int ObInnerTableSchema::tenant_virtual_charset_agent_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHARSET", // 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 - MAX_CHARSET_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CHARSET", //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 + MAX_CHARSET_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DESCRIPTION", // 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 - MAX_CHARSET_DESCRIPTION_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DESCRIPTION", //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 + MAX_CHARSET_DESCRIPTION_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DEFAULT_COLLATION", // 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 - MAX_COLLATION_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DEFAULT_COLLATION", //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 + MAX_COLLATION_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAX_LENGTH", // 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 + ADD_COLUMN_SCHEMA("MAX_LENGTH", //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_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11404,17 +11378,16 @@ int ObInnerTableSchema::tenant_virtual_charset_agent_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_all_table_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_all_table_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -11445,303 +11418,303 @@ int ObInnerTableSchema::tenant_virtual_all_table_agent_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATABASE_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_NAME", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_TABLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TABLE_NAME", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_TABLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLE_TYPE", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TABLE_TYPE", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ENGINE", // 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 - MAX_ENGINE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ENGINE", //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 + MAX_ENGINE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VERSION", // 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 + ADD_COLUMN_SCHEMA("VERSION", //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("ROW_FORMAT", // 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 - ROW_FORMAT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROW_FORMAT", //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 + ROW_FORMAT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROWS", // 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 + ADD_COLUMN_SCHEMA("ROWS", //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("AVG_ROW_LENGTH", // 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 + ADD_COLUMN_SCHEMA("AVG_ROW_LENGTH", //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("DATA_LENGTH", // 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 + ADD_COLUMN_SCHEMA("DATA_LENGTH", //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_DATA_LENGTH", // 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 + ADD_COLUMN_SCHEMA("MAX_DATA_LENGTH", //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("INDEX_LENGTH", // 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 + ADD_COLUMN_SCHEMA("INDEX_LENGTH", //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("DATA_FREE", // 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 + ADD_COLUMN_SCHEMA("DATA_FREE", //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("AUTO_INCREMENT", // 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 + ADD_COLUMN_SCHEMA("AUTO_INCREMENT", //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("CREATE_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CREATE_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("UPDATE_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("UPDATE_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHECK_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CHECK_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COLLATION", // 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 - MAX_COLLATION_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLLATION", //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 + MAX_COLLATION_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHECKSUM", // 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 + ADD_COLUMN_SCHEMA("CHECKSUM", //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("CREATE_OPTIONS", // 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 - MAX_TABLE_STATUS_CREATE_OPTION_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CREATE_OPTIONS", //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 + MAX_TABLE_STATUS_CREATE_OPTION_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11751,17 +11724,16 @@ int ObInnerTableSchema::tenant_virtual_all_table_agent_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_collation_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_collation_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -11792,93 +11764,93 @@ int ObInnerTableSchema::tenant_virtual_collation_agent_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COLLATION", // 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 - MAX_COLLATION_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLLATION", //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 + MAX_COLLATION_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHARSET", // 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 - MAX_CHARSET_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CHARSET", //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 + MAX_CHARSET_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ID", // 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 + ADD_COLUMN_SCHEMA("ID", //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("IS_DEFAULT", // 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 - MAX_BOOL_STR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("IS_DEFAULT", //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 + MAX_BOOL_STR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IS_COMPILED", // 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 - MAX_BOOL_STR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("IS_COMPILED", //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 + MAX_BOOL_STR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SORTLEN", // 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 + ADD_COLUMN_SCHEMA("SORTLEN", //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_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11888,17 +11860,16 @@ int ObInnerTableSchema::tenant_virtual_collation_agent_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_foreign_key_column_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_foreign_key_column_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -11929,108 +11900,108 @@ int ObInnerTableSchema::all_virtual_foreign_key_column_agent_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("FOREIGN_KEY_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("FOREIGN_KEY_ID", //column_name + ++column_id, //column_id + 2, //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("CHILD_COLUMN_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("CHILD_COLUMN_ID", //column_name + ++column_id, //column_id + 3, //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("PARENT_COLUMN_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("PARENT_COLUMN_ID", //column_name + ++column_id, //column_id + 4, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("POSITION", // 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 + ADD_COLUMN_SCHEMA("POSITION", //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(FLAT_ROW_STORE); @@ -12040,17 +12011,16 @@ int ObInnerTableSchema::all_virtual_foreign_key_column_agent_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_server_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_server_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -12081,243 +12051,243 @@ int ObInnerTableSchema::all_virtual_server_agent_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 2, //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("ID", // 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 + ADD_COLUMN_SCHEMA("ID", //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("ZONE", // 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 - MAX_ZONE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ZONE", //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 + MAX_ZONE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INNER_PORT", // 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 + ADD_COLUMN_SCHEMA("INNER_PORT", //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("WITH_ROOTSERVER", // 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 + ADD_COLUMN_SCHEMA("WITH_ROOTSERVER", //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("STATUS", // 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 - OB_SERVER_STATUS_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("STATUS", //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 + OB_SERVER_STATUS_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BLOCK_MIGRATE_IN_TIME", // 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 + ADD_COLUMN_SCHEMA("BLOCK_MIGRATE_IN_TIME", //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("BUILD_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 - OB_SERVER_VERSION_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("BUILD_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 + OB_SERVER_VERSION_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STOP_TIME", // 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 + ADD_COLUMN_SCHEMA("STOP_TIME", //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("START_SERVICE_TIME", // 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 + ADD_COLUMN_SCHEMA("START_SERVICE_TIME", //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("FIRST_SESSID", // 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 + ADD_COLUMN_SCHEMA("FIRST_SESSID", //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("WITH_PARTITION", // 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 + ADD_COLUMN_SCHEMA("WITH_PARTITION", //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("LAST_OFFLINE_TIME", // 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 + ADD_COLUMN_SCHEMA("LAST_OFFLINE_TIME", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -12327,17 +12297,16 @@ int ObInnerTableSchema::all_virtual_server_agent_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_plan_cache_stat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_plan_cache_stat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -12368,663 +12337,663 @@ int ObInnerTableSchema::all_virtual_plan_cache_stat_ora_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("SVR_IP", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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("SQL_NUM", // 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 + ADD_COLUMN_SCHEMA("SQL_NUM", //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("MEM_USED", // 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 + ADD_COLUMN_SCHEMA("MEM_USED", //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("MEM_HOLD", // 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 + ADD_COLUMN_SCHEMA("MEM_HOLD", //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("ACCESS_COUNT", // 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 + ADD_COLUMN_SCHEMA("ACCESS_COUNT", //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("HIT_COUNT", // 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 + ADD_COLUMN_SCHEMA("HIT_COUNT", //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("HIT_RATE", // 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 + ADD_COLUMN_SCHEMA("HIT_RATE", //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("PLAN_NUM", // 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 + ADD_COLUMN_SCHEMA("PLAN_NUM", //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("MEM_LIMIT", // 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 + ADD_COLUMN_SCHEMA("MEM_LIMIT", //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("HASH_BUCKET", // 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 + ADD_COLUMN_SCHEMA("HASH_BUCKET", //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("STMTKEY_NUM", // 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 + ADD_COLUMN_SCHEMA("STMTKEY_NUM", //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("PC_REF_PLAN_LOCAL", // 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 + ADD_COLUMN_SCHEMA("PC_REF_PLAN_LOCAL", //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("PC_REF_PLAN_REMOTE", // 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 + ADD_COLUMN_SCHEMA("PC_REF_PLAN_REMOTE", //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("PC_REF_PLAN_DIST", // 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 + ADD_COLUMN_SCHEMA("PC_REF_PLAN_DIST", //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("PC_REF_PLAN_ARR", // 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 + ADD_COLUMN_SCHEMA("PC_REF_PLAN_ARR", //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("PC_REF_PLAN_STAT", // 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 + ADD_COLUMN_SCHEMA("PC_REF_PLAN_STAT", //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("PC_REF_PL", // 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 + ADD_COLUMN_SCHEMA("PC_REF_PL", //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("PC_REF_PL_STAT", // 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 + ADD_COLUMN_SCHEMA("PC_REF_PL_STAT", //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("PLAN_GEN", // 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 + ADD_COLUMN_SCHEMA("PLAN_GEN", //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("CLI_QUERY", // 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 + ADD_COLUMN_SCHEMA("CLI_QUERY", //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("OUTLINE_EXEC", // 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 + ADD_COLUMN_SCHEMA("OUTLINE_EXEC", //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("PLAN_EXPLAIN", // 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 + ADD_COLUMN_SCHEMA("PLAN_EXPLAIN", //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("ASYN_BASELINE", // 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 + ADD_COLUMN_SCHEMA("ASYN_BASELINE", //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("LOAD_BASELINE", // 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 + ADD_COLUMN_SCHEMA("LOAD_BASELINE", //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("PS_EXEC", // 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 + ADD_COLUMN_SCHEMA("PS_EXEC", //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("GV_SQL", // 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 + ADD_COLUMN_SCHEMA("GV_SQL", //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("PL_ANON", // 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 + ADD_COLUMN_SCHEMA("PL_ANON", //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("PL_ROUTINE", // 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 + ADD_COLUMN_SCHEMA("PL_ROUTINE", //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("PACKAGE_VAR", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_VAR", //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("PACKAGE_TYPE", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_TYPE", //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("PACKAGE_SPEC", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_SPEC", //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("PACKAGE_BODY", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_BODY", //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("PACKAGE_RESV", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_RESV", //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("GET_PKG", // 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 + ADD_COLUMN_SCHEMA("GET_PKG", //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("INDEX_BUILDER", // 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 + ADD_COLUMN_SCHEMA("INDEX_BUILDER", //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("PCV_SET", // 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 + ADD_COLUMN_SCHEMA("PCV_SET", //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("PCV_RD", // 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 + ADD_COLUMN_SCHEMA("PCV_RD", //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("PCV_WR", // 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 + ADD_COLUMN_SCHEMA("PCV_WR", //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("PCV_GET_PLAN_KEY", // 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 + ADD_COLUMN_SCHEMA("PCV_GET_PLAN_KEY", //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("PCV_GET_PL_KEY", // 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 + ADD_COLUMN_SCHEMA("PCV_GET_PL_KEY", //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("PCV_EXPIRE_BY_USED", // 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 + ADD_COLUMN_SCHEMA("PCV_EXPIRE_BY_USED", //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("PCV_EXPIRE_BY_MEM", // 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 + ADD_COLUMN_SCHEMA("PCV_EXPIRE_BY_MEM", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -13042,23 +13011,20 @@ int ObInnerTableSchema::all_virtual_plan_cache_stat_ora_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_plan_cache_stat_ora_all_virtual_plan_cache_stat_i1_schema( - ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_plan_cache_stat_ora_all_virtual_plan_cache_stat_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); - table_schema.set_table_id( - combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TID)); + table_schema.set_table_id(combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TID)); table_schema.set_rowkey_split_pos(0); table_schema.set_is_use_bloomfilter(false); table_schema.set_progressive_merge_num(0); @@ -13098,48 +13064,48 @@ int ObInnerTableSchema::all_virtual_plan_cache_stat_ora_all_virtual_plan_cache_s table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - column_id + 1, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + column_id + 1, //column_id + 1, //rowkey_id + 1, //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("SVR_IP", // column_name - column_id + 2, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + column_id + 2, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - column_id + 3, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + column_id + 3, //column_id + 3, //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_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -13149,12 +13115,12 @@ int ObInnerTableSchema::all_virtual_plan_cache_stat_ora_all_virtual_plan_cache_s return ret; } -int ObInnerTableSchema::all_virtual_processlist_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_processlist_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -13185,303 +13151,303 @@ int ObInnerTableSchema::all_virtual_processlist_ora_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ID", // 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 + ADD_COLUMN_SCHEMA("ID", //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("USER", // 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 - OB_MAX_USERNAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USER", //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 + OB_MAX_USERNAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TENANT", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("HOST", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HOST", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DB", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DB", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMAND", // 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 - OB_MAX_COMMAND_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMAND", //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 + OB_MAX_COMMAND_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_ID", // 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 - OB_MAX_SQL_ID_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_ID", //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 + OB_MAX_SQL_ID_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TIME", // 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 + ADD_COLUMN_SCHEMA("TIME", //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("STATE", // 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 - OB_MAX_SESSION_STATE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("STATE", //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 + OB_MAX_SESSION_STATE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INFO", // 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 - MAX_COLUMN_VARCHAR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("INFO", //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 + MAX_COLUMN_VARCHAR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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("SQL_PORT", // 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 + ADD_COLUMN_SCHEMA("SQL_PORT", //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("PROXY_SESSID", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PROXY_SESSID", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MASTER_SESSID", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MASTER_SESSID", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("USER_CLIENT_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USER_CLIENT_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("USER_HOST", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USER_HOST", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TRANS_ID", // 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 + ADD_COLUMN_SCHEMA("TRANS_ID", //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("THREAD_ID", // 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 + ADD_COLUMN_SCHEMA("THREAD_ID", //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("SSL_CIPHER", // 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 - OB_MAX_COMMAND_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SSL_CIPHER", //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 + OB_MAX_COMMAND_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -13499,17 +13465,16 @@ int ObInnerTableSchema::all_virtual_processlist_ora_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_session_wait_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_session_wait_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -13540,288 +13505,288 @@ int ObInnerTableSchema::all_virtual_session_wait_ora_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SESSION_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("SESSION_ID", //column_name + ++column_id, //column_id + 1, //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("SVR_IP", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("EVENT", // 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 - OB_MAX_WAIT_EVENT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EVENT", //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 + OB_MAX_WAIT_EVENT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("P1TEXT", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("P1TEXT", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("P1", // 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 + ADD_COLUMN_SCHEMA("P1", //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("P2TEXT", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("P2TEXT", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("P2", // 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 + ADD_COLUMN_SCHEMA("P2", //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("P3TEXT", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("P3TEXT", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("P3", // 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 + ADD_COLUMN_SCHEMA("P3", //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("LEVEL", // 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 + ADD_COLUMN_SCHEMA("LEVEL", //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("WAIT_CLASS_ID", // 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 + ADD_COLUMN_SCHEMA("WAIT_CLASS_ID", //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("WAIT_CLASS#", // 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 + ADD_COLUMN_SCHEMA("WAIT_CLASS#", //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("WAIT_CLASS", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("WAIT_CLASS", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STATE", // 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 - 19, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("STATE", //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 + 19, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("WAIT_TIME_MICRO", // 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 + ADD_COLUMN_SCHEMA("WAIT_TIME_MICRO", //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("TIME_REMAINING_MICRO", // 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 + ADD_COLUMN_SCHEMA("TIME_REMAINING_MICRO", //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("TIME_SINCE_LAST_WAIT_MICRO", // 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 + ADD_COLUMN_SCHEMA("TIME_SINCE_LAST_WAIT_MICRO", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -13839,22 +13804,20 @@ int ObInnerTableSchema::all_virtual_session_wait_ora_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_session_wait_ora_all_virtual_session_wait_i1_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_session_wait_ora_all_virtual_session_wait_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); - table_schema.set_table_id( - combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_SESSION_WAIT_ORA_ALL_VIRTUAL_SESSION_WAIT_I1_TID)); + table_schema.set_table_id(combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_SESSION_WAIT_ORA_ALL_VIRTUAL_SESSION_WAIT_I1_TID)); table_schema.set_rowkey_split_pos(0); table_schema.set_is_use_bloomfilter(false); table_schema.set_progressive_merge_num(0); @@ -13894,48 +13857,48 @@ int ObInnerTableSchema::all_virtual_session_wait_ora_all_virtual_session_wait_i1 table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SESSION_ID", // column_name - column_id + 1, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("SESSION_ID", //column_name + column_id + 1, //column_id + 1, //rowkey_id + 1, //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("SVR_IP", // column_name - column_id + 2, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + column_id + 2, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - column_id + 3, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + column_id + 3, //column_id + 3, //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_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -13945,12 +13908,12 @@ int ObInnerTableSchema::all_virtual_session_wait_ora_all_virtual_session_wait_i1 return ret; } -int ObInnerTableSchema::all_virtual_session_wait_history_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_session_wait_history_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -13981,258 +13944,258 @@ int ObInnerTableSchema::all_virtual_session_wait_history_ora_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SESSION_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("SESSION_ID", //column_name + ++column_id, //column_id + 1, //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("SVR_IP", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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("SEQ#", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("SEQ#", //column_name + ++column_id, //column_id + 4, //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("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("EVENT#", // 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 + ADD_COLUMN_SCHEMA("EVENT#", //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("EVENT", // 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 - OB_MAX_WAIT_EVENT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EVENT", //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 + OB_MAX_WAIT_EVENT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("P1TEXT", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("P1TEXT", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("P1", // 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 + ADD_COLUMN_SCHEMA("P1", //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("P2TEXT", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("P2TEXT", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("P2", // 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 + ADD_COLUMN_SCHEMA("P2", //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("P3TEXT", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("P3TEXT", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("P3", // 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 + ADD_COLUMN_SCHEMA("P3", //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("LEVEL", // 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 + ADD_COLUMN_SCHEMA("LEVEL", //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("WAIT_TIME_MICRO", // 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 + ADD_COLUMN_SCHEMA("WAIT_TIME_MICRO", //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("TIME_SINCE_LAST_WAIT_MICRO", // 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 + ADD_COLUMN_SCHEMA("TIME_SINCE_LAST_WAIT_MICRO", //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("WAIT_TIME", // 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 + ADD_COLUMN_SCHEMA("WAIT_TIME", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -14250,23 +14213,20 @@ int ObInnerTableSchema::all_virtual_session_wait_history_ora_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_session_wait_history_ora_all_virtual_session_wait_history_i1_schema( - ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_session_wait_history_ora_all_virtual_session_wait_history_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); - table_schema.set_table_id( - combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TID)); + table_schema.set_table_id(combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TID)); table_schema.set_rowkey_split_pos(0); table_schema.set_is_use_bloomfilter(false); table_schema.set_progressive_merge_num(0); @@ -14277,8 +14237,7 @@ int ObInnerTableSchema::all_virtual_session_wait_history_ora_all_virtual_session table_schema.set_def_type(TABLE_DEF_TYPE_INTERNAL); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_table_name( - OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TNAME))) { + if (OB_FAIL(table_schema.set_table_name(OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TNAME))) { LOG_ERROR("fail to set table_name", K(ret)); } } @@ -14307,63 +14266,63 @@ int ObInnerTableSchema::all_virtual_session_wait_history_ora_all_virtual_session table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SESSION_ID", // column_name - column_id + 1, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("SESSION_ID", //column_name + column_id + 1, //column_id + 1, //rowkey_id + 1, //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("SVR_IP", // column_name - column_id + 2, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + column_id + 2, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - column_id + 3, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + column_id + 3, //column_id + 3, //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("SEQ#", // column_name - column_id + 4, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("SEQ#", //column_name + column_id + 4, //column_id + 4, //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_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -14373,12 +14332,12 @@ int ObInnerTableSchema::all_virtual_session_wait_history_ora_all_virtual_session return ret; } -int ObInnerTableSchema::all_virtual_memory_info_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_memory_info_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -14409,228 +14368,228 @@ int ObInnerTableSchema::all_virtual_memory_info_ora_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("SVR_IP", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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("CTX_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("CTX_ID", //column_name + ++column_id, //column_id + 4, //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("LABEL", // column_name - ++column_id, // column_id - 5, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_CHAR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LABEL", //column_name + ++column_id, //column_id + 5, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_CHAR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CTX_NAME", // 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 - OB_MAX_CHAR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CTX_NAME", //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 + OB_MAX_CHAR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MOD_TYPE", // 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 - OB_MAX_CHAR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MOD_TYPE", //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 + OB_MAX_CHAR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MOD_ID", // 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 + ADD_COLUMN_SCHEMA("MOD_ID", //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("MOD_NAME", // 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 - OB_MAX_CHAR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MOD_NAME", //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 + OB_MAX_CHAR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ZONE", // 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 - OB_MAX_CHAR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ZONE", //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 + OB_MAX_CHAR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("HOLD", // 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 + ADD_COLUMN_SCHEMA("HOLD", //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("USED", // 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 + ADD_COLUMN_SCHEMA("USED", //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("COUNT", // 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 + ADD_COLUMN_SCHEMA("COUNT", //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("ALLOC_COUNT", // 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 + ADD_COLUMN_SCHEMA("ALLOC_COUNT", //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("FREE_COUNT", // 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 + ADD_COLUMN_SCHEMA("FREE_COUNT", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -14648,17 +14607,16 @@ int ObInnerTableSchema::all_virtual_memory_info_ora_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_memstore_info_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_memstore_info_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -14689,123 +14647,123 @@ int ObInnerTableSchema::all_virtual_tenant_memstore_info_ora_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("SVR_IP", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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("ACTIVE_MEMSTORE_USED", // 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 + ADD_COLUMN_SCHEMA("ACTIVE_MEMSTORE_USED", //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("TOTAL_MEMSTORE_USED", // 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 + ADD_COLUMN_SCHEMA("TOTAL_MEMSTORE_USED", //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("MAJOR_FREEZE_TRIGGER", // 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 + ADD_COLUMN_SCHEMA("MAJOR_FREEZE_TRIGGER", //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("MEMSTORE_LIMIT", // 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 + ADD_COLUMN_SCHEMA("MEMSTORE_LIMIT", //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("FREEZE_CNT", // 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 + ADD_COLUMN_SCHEMA("FREEZE_CNT", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -14823,17 +14781,16 @@ int ObInnerTableSchema::all_virtual_tenant_memstore_info_ora_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_memstore_info_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_memstore_info_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -14864,318 +14821,318 @@ int ObInnerTableSchema::all_virtual_memstore_info_ora_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("SVR_IP", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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("TABLE_ID", // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //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("PARTITION_IDX", // 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 + ADD_COLUMN_SCHEMA("PARTITION_IDX", //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("PARTITION_CNT", // 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 + ADD_COLUMN_SCHEMA("PARTITION_CNT", //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("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 - MAX_VERSION_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("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 + MAX_VERSION_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BASE_VERSION", // 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 + ADD_COLUMN_SCHEMA("BASE_VERSION", //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("MULTI_VERSION_START", // 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 + ADD_COLUMN_SCHEMA("MULTI_VERSION_START", //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("SNAPSHOT_VERSION", // 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 + ADD_COLUMN_SCHEMA("SNAPSHOT_VERSION", //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("IS_ACTIVE", // 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 + ADD_COLUMN_SCHEMA("IS_ACTIVE", //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("MEM_USED", // 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 + ADD_COLUMN_SCHEMA("MEM_USED", //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("HASH_ITEM_COUNT", // 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 + ADD_COLUMN_SCHEMA("HASH_ITEM_COUNT", //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("HASH_MEM_USED", // 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 + ADD_COLUMN_SCHEMA("HASH_MEM_USED", //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("BTREE_ITEM_COUNT", // 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 + ADD_COLUMN_SCHEMA("BTREE_ITEM_COUNT", //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("BTREE_MEM_USED", // 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 + ADD_COLUMN_SCHEMA("BTREE_MEM_USED", //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("INSERT_ROW_COUNT", // 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 + ADD_COLUMN_SCHEMA("INSERT_ROW_COUNT", //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("UPDATE_ROW_COUNT", // 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 + ADD_COLUMN_SCHEMA("UPDATE_ROW_COUNT", //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("DELETE_ROW_COUNT", // 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 + ADD_COLUMN_SCHEMA("DELETE_ROW_COUNT", //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("PURGE_ROW_COUNT", // 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 + ADD_COLUMN_SCHEMA("PURGE_ROW_COUNT", //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("PURGE_QUEUE_COUNT", // 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 + ADD_COLUMN_SCHEMA("PURGE_QUEUE_COUNT", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -15193,17 +15150,16 @@ int ObInnerTableSchema::all_virtual_memstore_info_ora_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_server_memory_info_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_server_memory_info_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -15234,138 +15190,138 @@ int ObInnerTableSchema::all_virtual_server_memory_info_agent_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 2, //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("SERVER_MEMORY_HOLD", // 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 + ADD_COLUMN_SCHEMA("SERVER_MEMORY_HOLD", //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("SERVER_MEMORY_LIMIT", // 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 + ADD_COLUMN_SCHEMA("SERVER_MEMORY_LIMIT", //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("SYSTEM_RESERVED", // 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 + ADD_COLUMN_SCHEMA("SYSTEM_RESERVED", //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("ACTIVE_MEMSTORE_USED", // 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 + ADD_COLUMN_SCHEMA("ACTIVE_MEMSTORE_USED", //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("TOTAL_MEMSTORE_USED", // 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 + ADD_COLUMN_SCHEMA("TOTAL_MEMSTORE_USED", //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("MAJOR_FREEZE_TRIGGER", // 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 + ADD_COLUMN_SCHEMA("MAJOR_FREEZE_TRIGGER", //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("MEMSTORE_LIMIT", // 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 + ADD_COLUMN_SCHEMA("MEMSTORE_LIMIT", //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_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -15375,17 +15331,16 @@ int ObInnerTableSchema::all_virtual_server_memory_info_agent_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sesstat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sesstat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -15416,108 +15371,108 @@ int ObInnerTableSchema::all_virtual_sesstat_ora_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SESSION_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("SESSION_ID", //column_name + ++column_id, //column_id + 1, //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("SVR_IP", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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("STATISTIC#", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("STATISTIC#", //column_name + ++column_id, //column_id + 4, //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("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("VALUE", // 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 + ADD_COLUMN_SCHEMA("VALUE", //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("CAN_VISIBLE", // 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 + ADD_COLUMN_SCHEMA("CAN_VISIBLE", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -15535,17 +15490,16 @@ int ObInnerTableSchema::all_virtual_sesstat_ora_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sesstat_ora_all_virtual_sesstat_i1_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sesstat_ora_all_virtual_sesstat_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -15589,63 +15543,63 @@ int ObInnerTableSchema::all_virtual_sesstat_ora_all_virtual_sesstat_i1_schema(Ob table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SESSION_ID", // column_name - column_id + 1, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("SESSION_ID", //column_name + column_id + 1, //column_id + 1, //rowkey_id + 1, //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("SVR_IP", // column_name - column_id + 2, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + column_id + 2, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - column_id + 3, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + column_id + 3, //column_id + 3, //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("STATISTIC#", // column_name - column_id + 4, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("STATISTIC#", //column_name + column_id + 4, //column_id + 4, //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_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -15655,12 +15609,12 @@ int ObInnerTableSchema::all_virtual_sesstat_ora_all_virtual_sesstat_i1_schema(Ob return ret; } -int ObInnerTableSchema::all_virtual_sysstat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sysstat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -15691,138 +15645,138 @@ int ObInnerTableSchema::all_virtual_sysstat_ora_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("SVR_IP", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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("STATISTIC#", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("STATISTIC#", //column_name + ++column_id, //column_id + 4, //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("VALUE", // 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 + ADD_COLUMN_SCHEMA("VALUE", //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("STAT_ID", // 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 + ADD_COLUMN_SCHEMA("STAT_ID", //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("NAME", // 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 - 64, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NAME", //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 + 64, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CLASS", // 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 + ADD_COLUMN_SCHEMA("CLASS", //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("CAN_VISIBLE", // 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 + ADD_COLUMN_SCHEMA("CAN_VISIBLE", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -15840,17 +15794,16 @@ int ObInnerTableSchema::all_virtual_sysstat_ora_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sysstat_ora_all_virtual_sysstat_i1_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sysstat_ora_all_virtual_sysstat_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -15894,63 +15847,63 @@ int ObInnerTableSchema::all_virtual_sysstat_ora_all_virtual_sysstat_i1_schema(Ob table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - column_id + 1, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + column_id + 1, //column_id + 1, //rowkey_id + 1, //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("SVR_IP", // column_name - column_id + 2, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + column_id + 2, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - column_id + 3, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + column_id + 3, //column_id + 3, //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("STATISTIC#", // column_name - column_id + 4, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("STATISTIC#", //column_name + column_id + 4, //column_id + 4, //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_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -15960,12 +15913,12 @@ int ObInnerTableSchema::all_virtual_sysstat_ora_all_virtual_sysstat_i1_schema(Ob return ret; } -int ObInnerTableSchema::all_virtual_system_event_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_system_event_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -15996,213 +15949,213 @@ int ObInnerTableSchema::all_virtual_system_event_ora_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("SVR_IP", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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("EVENT_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("EVENT_ID", //column_name + ++column_id, //column_id + 4, //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("EVENT", // 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 - OB_MAX_WAIT_EVENT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EVENT", //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 + OB_MAX_WAIT_EVENT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("WAIT_CLASS_ID", // 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 + ADD_COLUMN_SCHEMA("WAIT_CLASS_ID", //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("WAIT_CLASS#", // 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 + ADD_COLUMN_SCHEMA("WAIT_CLASS#", //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("WAIT_CLASS", // 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 - OB_MAX_WAIT_EVENT_PARAM_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("WAIT_CLASS", //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 + OB_MAX_WAIT_EVENT_PARAM_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TOTAL_WAITS", // 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 + ADD_COLUMN_SCHEMA("TOTAL_WAITS", //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("TOTAL_TIMEOUTS", // 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 + ADD_COLUMN_SCHEMA("TOTAL_TIMEOUTS", //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("TIME_WAITED", // 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 + ADD_COLUMN_SCHEMA("TIME_WAITED", //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_WAIT", // 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 + ADD_COLUMN_SCHEMA("MAX_WAIT", //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("AVERAGE_WAIT", // 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 + ADD_COLUMN_SCHEMA("AVERAGE_WAIT", //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("TIME_WAITED_MICRO", // 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 + ADD_COLUMN_SCHEMA("TIME_WAITED_MICRO", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -16220,22 +16173,20 @@ int ObInnerTableSchema::all_virtual_system_event_ora_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_system_event_ora_all_virtual_system_event_i1_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_system_event_ora_all_virtual_system_event_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); - table_schema.set_table_id( - combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_ALL_VIRTUAL_SYSTEM_EVENT_I1_TID)); + table_schema.set_table_id(combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_ALL_VIRTUAL_SYSTEM_EVENT_I1_TID)); table_schema.set_rowkey_split_pos(0); table_schema.set_is_use_bloomfilter(false); table_schema.set_progressive_merge_num(0); @@ -16275,63 +16226,63 @@ int ObInnerTableSchema::all_virtual_system_event_ora_all_virtual_system_event_i1 table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - column_id + 1, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + column_id + 1, //column_id + 1, //rowkey_id + 1, //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("SVR_IP", // column_name - column_id + 2, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + column_id + 2, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - column_id + 3, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + column_id + 3, //column_id + 3, //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("EVENT_ID", // column_name - column_id + 4, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("EVENT_ID", //column_name + column_id + 4, //column_id + 4, //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_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -16341,12 +16292,12 @@ int ObInnerTableSchema::all_virtual_system_event_ora_all_virtual_system_event_i1 return ret; } -int ObInnerTableSchema::all_virtual_tenant_memstore_allocator_info_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_memstore_allocator_info_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -16377,153 +16328,153 @@ int ObInnerTableSchema::all_virtual_tenant_memstore_allocator_info_agent_schema( table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //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("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("TABLE_ID", // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //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("PARTITION_ID", // 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 + ADD_COLUMN_SCHEMA("PARTITION_ID", //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("MT_BASE_VERSION", // 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 + ADD_COLUMN_SCHEMA("MT_BASE_VERSION", //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("RETIRE_CLOCK", // 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 + ADD_COLUMN_SCHEMA("RETIRE_CLOCK", //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("MT_IS_FROZEN", // 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 + ADD_COLUMN_SCHEMA("MT_IS_FROZEN", //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("MT_PROTECTION_CLOCK", // 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 + ADD_COLUMN_SCHEMA("MT_PROTECTION_CLOCK", //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("MT_SNAPSHOT_VERSION", // 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 + ADD_COLUMN_SCHEMA("MT_SNAPSHOT_VERSION", //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_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -16533,17 +16484,16 @@ int ObInnerTableSchema::all_virtual_tenant_memstore_allocator_info_agent_schema( table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_session_variable_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_session_variable_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -16574,33 +16524,33 @@ int ObInnerTableSchema::tenant_virtual_session_variable_ora_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VARIABLE_NAME", // 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 - OB_MAX_CONFIG_NAME_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VARIABLE_NAME", //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 + OB_MAX_CONFIG_NAME_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VALUE", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VALUE", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -16610,17 +16560,16 @@ int ObInnerTableSchema::tenant_virtual_session_variable_ora_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_global_variable_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_global_variable_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -16651,33 +16600,33 @@ int ObInnerTableSchema::tenant_virtual_global_variable_ora_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VARIABLE_NAME", // 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 - OB_MAX_CONFIG_NAME_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VARIABLE_NAME", //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 + OB_MAX_CONFIG_NAME_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VALUE", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VALUE", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -16687,17 +16636,16 @@ int ObInnerTableSchema::tenant_virtual_global_variable_ora_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_show_create_table_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_show_create_table_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -16728,78 +16676,78 @@ int ObInnerTableSchema::tenant_virtual_show_create_table_ora_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLE_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_NAME", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TABLE_NAME", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CREATE_TABLE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CREATE_TABLE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHARACTER_SET_CLIENT", // 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 - MAX_CHARSET_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CHARACTER_SET_CLIENT", //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 + MAX_CHARSET_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COLLATION_CONNECTION", // 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 - MAX_CHARSET_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLLATION_CONNECTION", //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 + MAX_CHARSET_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -16809,17 +16757,16 @@ int ObInnerTableSchema::tenant_virtual_show_create_table_ora_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_show_create_procedure_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_show_create_procedure_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -16850,123 +16797,123 @@ int ObInnerTableSchema::tenant_virtual_show_create_procedure_ora_schema(ObTableS table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROUTINE_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("ROUTINE_ID", //column_name + ++column_id, //column_id + 1, //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("ROUTINE_NAME", // 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 - OB_MAX_ROUTINE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROUTINE_NAME", //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 + OB_MAX_ROUTINE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CREATE_ROUTINE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CREATE_ROUTINE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROC_TYPE", // 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 + ADD_COLUMN_SCHEMA("PROC_TYPE", //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("CHARACTER_SET_CLIENT", // 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 - MAX_CHARSET_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CHARACTER_SET_CLIENT", //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 + MAX_CHARSET_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COLLATION_CONNECTION", // 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 - MAX_CHARSET_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLLATION_CONNECTION", //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 + MAX_CHARSET_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COLLATION_DATABASE", // 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 - MAX_CHARSET_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLLATION_DATABASE", //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 + MAX_CHARSET_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_MODE", // 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 - MAX_CHARSET_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_MODE", //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 + MAX_CHARSET_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -16976,10 +16923,10 @@ int ObInnerTableSchema::tenant_virtual_show_create_procedure_ora_schema(ObTableS table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.15051_15100.cpp b/src/share/inner_table/ob_inner_table_schema.15051_15100.cpp index 2d85d2486..c7765eb87 100644 --- a/src/share/inner_table/ob_inner_table_schema.15051_15100.cpp +++ b/src/share/inner_table/ob_inner_table_schema.15051_15100.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::tenant_virtual_show_create_tablegroup_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_show_create_tablegroup_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -58,48 +60,48 @@ int ObInnerTableSchema::tenant_virtual_show_create_tablegroup_ora_schema(ObTable table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLEGROUP_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TABLEGROUP_ID", //column_name + ++column_id, //column_id + 1, //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("TABLEGROUP_NAME", // 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 - OB_MAX_TABLEGROUP_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TABLEGROUP_NAME", //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 + OB_MAX_TABLEGROUP_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CREATE_TABLEGROUP", // 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 - TABLEGROUP_DEFINE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CREATE_TABLEGROUP", //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 + TABLEGROUP_DEFINE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -109,17 +111,16 @@ int ObInnerTableSchema::tenant_virtual_show_create_tablegroup_ora_schema(ObTable table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_privilege_grant_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_privilege_grant_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -150,33 +151,33 @@ int ObInnerTableSchema::tenant_virtual_privilege_grant_ora_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("USER_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("USER_ID", //column_name + ++column_id, //column_id + 1, //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("GRANTS", // 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 - MAX_GRANT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GRANTS", //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 + MAX_GRANT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -186,17 +187,16 @@ int ObInnerTableSchema::tenant_virtual_privilege_grant_ora_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_table_column_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_table_column_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -227,153 +227,153 @@ int ObInnerTableSchema::tenant_virtual_table_column_ora_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLE_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 1, //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("FIELD", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_COLUMN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("FIELD", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_COLUMN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TYPE", // 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 - COLUMN_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TYPE", //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 + COLUMN_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COLLATION", // 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 - MAX_COLLATION_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLLATION", //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 + MAX_COLLATION_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NULL", // 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 - COLUMN_NULLABLE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NULL", //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 + COLUMN_NULLABLE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("KEY", // 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 - COLUMN_KEY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("KEY", //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 + COLUMN_KEY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DEFAULT", // 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 - COLUMN_DEFAULT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DEFAULT", //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 + COLUMN_DEFAULT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXTRA", // 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 - COLUMN_EXTRA_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXTRA", //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 + COLUMN_EXTRA_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIVILEGES", // 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 - MAX_COLUMN_PRIVILEGE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PRIVILEGES", //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 + MAX_COLUMN_PRIVILEGE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - MAX_COLUMN_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + MAX_COLUMN_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -383,17 +383,16 @@ int ObInnerTableSchema::tenant_virtual_table_column_ora_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_trace_log_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_trace_log_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -424,48 +423,48 @@ int ObInnerTableSchema::all_virtual_trace_log_ora_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TITLE", // 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 - 256, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TITLE", //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 + 256, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("KEY_VALUE", // 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 - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("KEY_VALUE", //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 + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TIME", // 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 - 10, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TIME", //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 + 10, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -475,17 +474,16 @@ int ObInnerTableSchema::all_virtual_trace_log_ora_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_concurrent_limit_sql_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_concurrent_limit_sql_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -516,153 +514,153 @@ int ObInnerTableSchema::tenant_virtual_concurrent_limit_sql_agent_schema(ObTable table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("OUTLINE_ID", // 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 + ADD_COLUMN_SCHEMA("OUTLINE_ID", //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("DATABASE_NAME", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DATABASE_NAME", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OUTLINE_NAME", // 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 - OB_MAX_OUTLINE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OUTLINE_NAME", //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 + OB_MAX_OUTLINE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OUTLINE_CONTENT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OUTLINE_CONTENT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VISIBLE_SIGNATURE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VISIBLE_SIGNATURE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_TEXT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_TEXT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CONCURRENT_NUM", // 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 + ADD_COLUMN_SCHEMA("CONCURRENT_NUM", //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("LIMIT_TARGET", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LIMIT_TARGET", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -672,17 +670,16 @@ int ObInnerTableSchema::tenant_virtual_concurrent_limit_sql_agent_schema(ObTable table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_constraint_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_constraint_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -713,183 +710,183 @@ int ObInnerTableSchema::all_virtual_constraint_agent_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("CONSTRAINT_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("CONSTRAINT_ID", //column_name + ++column_id, //column_id + 3, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CONSTRAINT_NAME", // 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 - OB_MAX_CONSTRAINT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CONSTRAINT_NAME", //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 + OB_MAX_CONSTRAINT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHECK_EXPR", // 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 - OB_MAX_CONSTRAINT_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CHECK_EXPR", //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 + OB_MAX_CONSTRAINT_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("CONSTRAINT_TYPE", // 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 + ADD_COLUMN_SCHEMA("CONSTRAINT_TYPE", //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("RELY_FLAG", // 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 + ADD_COLUMN_SCHEMA("RELY_FLAG", //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("ENABLE_FLAG", // 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 + ADD_COLUMN_SCHEMA("ENABLE_FLAG", //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("VALIDATE_FLAG", // 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 + ADD_COLUMN_SCHEMA("VALIDATE_FLAG", //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(FLAT_ROW_STORE); @@ -899,17 +896,16 @@ int ObInnerTableSchema::all_virtual_constraint_agent_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_type_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_type_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -940,318 +936,318 @@ int ObInnerTableSchema::all_virtual_type_agent_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TYPE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TYPE_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("TYPECODE", // 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 + ADD_COLUMN_SCHEMA("TYPECODE", //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("PROPERTIES", // 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 + ADD_COLUMN_SCHEMA("PROPERTIES", //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("ATTRIBUTES", // 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 + ADD_COLUMN_SCHEMA("ATTRIBUTES", //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("METHODS", // 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 + ADD_COLUMN_SCHEMA("METHODS", //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("HIDDENMETHODS", // 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 + ADD_COLUMN_SCHEMA("HIDDENMETHODS", //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("SUPERTYPES", // 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 + ADD_COLUMN_SCHEMA("SUPERTYPES", //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("SUBTYPES", // 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 + ADD_COLUMN_SCHEMA("SUBTYPES", //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("EXTERNTYPE", // 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 + ADD_COLUMN_SCHEMA("EXTERNTYPE", //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("EXTERNNAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXTERNNAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("HELPERCLASSNAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HELPERCLASSNAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LOCAL_ATTRS", // 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 + ADD_COLUMN_SCHEMA("LOCAL_ATTRS", //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("LOCAL_METHODS", // 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 + ADD_COLUMN_SCHEMA("LOCAL_METHODS", //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("SUPERTYPEID", // 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 + ADD_COLUMN_SCHEMA("SUPERTYPEID", //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("TYPE_NAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TYPE_NAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PACKAGE_ID", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_ID", //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(FLAT_ROW_STORE); @@ -1261,17 +1257,16 @@ int ObInnerTableSchema::all_virtual_type_agent_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_type_attr_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_type_attr_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1302,303 +1297,303 @@ int ObInnerTableSchema::all_virtual_type_attr_agent_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TYPE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TYPE_ID", //column_name + ++column_id, //column_id + 2, //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("ATTRIBUTE", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("ATTRIBUTE", //column_name + ++column_id, //column_id + 3, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("TYPE_ATTR_ID", // 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 + ADD_COLUMN_SCHEMA("TYPE_ATTR_ID", //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("NAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROPERTIES", // 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 + ADD_COLUMN_SCHEMA("PROPERTIES", //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("CHARSET_ID", // 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 + ADD_COLUMN_SCHEMA("CHARSET_ID", //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("CHARSET_FORM", // 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 + ADD_COLUMN_SCHEMA("CHARSET_FORM", //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("LENGTH", // 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 + ADD_COLUMN_SCHEMA("LENGTH", //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("NUMBER_PRECISION", // 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 + ADD_COLUMN_SCHEMA("NUMBER_PRECISION", //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("SCALE", // 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 + ADD_COLUMN_SCHEMA("SCALE", //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("ZERO_FILL", // 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 + ADD_COLUMN_SCHEMA("ZERO_FILL", //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("COLL_TYPE", // 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 + ADD_COLUMN_SCHEMA("COLL_TYPE", //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("EXTERNNAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXTERNNAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("XFLAGS", // 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 + ADD_COLUMN_SCHEMA("XFLAGS", //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("SETTER", // 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 + ADD_COLUMN_SCHEMA("SETTER", //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("GETTER", // 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 + ADD_COLUMN_SCHEMA("GETTER", //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(FLAT_ROW_STORE); @@ -1608,17 +1603,16 @@ int ObInnerTableSchema::all_virtual_type_attr_agent_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_coll_type_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_coll_type_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1649,273 +1643,273 @@ int ObInnerTableSchema::all_virtual_coll_type_agent_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("COLL_TYPE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("COLL_TYPE_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("ELEM_TYPE_ID", // 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 + ADD_COLUMN_SCHEMA("ELEM_TYPE_ID", //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("ELEM_SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("ELEM_SCHEMA_VERSION", //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("PROPERTIES", // 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 + ADD_COLUMN_SCHEMA("PROPERTIES", //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("CHARSET_ID", // 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 + ADD_COLUMN_SCHEMA("CHARSET_ID", //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("CHARSET_FORM", // 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 + ADD_COLUMN_SCHEMA("CHARSET_FORM", //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("LENGTH", // 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 + ADD_COLUMN_SCHEMA("LENGTH", //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("NUMBER_PRECISION", // 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 + ADD_COLUMN_SCHEMA("NUMBER_PRECISION", //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("SCALE", // 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 + ADD_COLUMN_SCHEMA("SCALE", //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("ZERO_FILL", // 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 + ADD_COLUMN_SCHEMA("ZERO_FILL", //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("COLL_TYPE", // 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 + ADD_COLUMN_SCHEMA("COLL_TYPE", //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("UPPER_BOUND", // 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 + ADD_COLUMN_SCHEMA("UPPER_BOUND", //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("PACKAGE_ID", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_ID", //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("COLL_NAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLL_NAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1925,17 +1919,16 @@ int ObInnerTableSchema::all_virtual_coll_type_agent_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_routine_param_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_routine_param_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1966,348 +1959,348 @@ int ObInnerTableSchema::all_virtual_routine_param_agent_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("ROUTINE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("ROUTINE_ID", //column_name + ++column_id, //column_id + 2, //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("SEQUENCE", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SEQUENCE", //column_name + ++column_id, //column_id + 3, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUBPROGRAM_ID", // 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 + ADD_COLUMN_SCHEMA("SUBPROGRAM_ID", //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("PARAM_POSITION", // 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 + ADD_COLUMN_SCHEMA("PARAM_POSITION", //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("PARAM_LEVEL", // 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 + ADD_COLUMN_SCHEMA("PARAM_LEVEL", //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("PARAM_NAME", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARAM_NAME", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("PARAM_TYPE", // 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 + ADD_COLUMN_SCHEMA("PARAM_TYPE", //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("PARAM_LENGTH", // 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 + ADD_COLUMN_SCHEMA("PARAM_LENGTH", //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("PARAM_PRECISION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARAM_PRECISION", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARAM_SCALE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARAM_SCALE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARAM_ZERO_FILL", // 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 + ADD_COLUMN_SCHEMA("PARAM_ZERO_FILL", //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("PARAM_CHARSET", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARAM_CHARSET", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARAM_COLL_TYPE", // 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 + ADD_COLUMN_SCHEMA("PARAM_COLL_TYPE", //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("FLAG", // 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 + ADD_COLUMN_SCHEMA("FLAG", //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("DEFAULT_VALUE", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DEFAULT_VALUE", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TYPE_OWNER", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TYPE_OWNER", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TYPE_NAME", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TYPE_NAME", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TYPE_SUBNAME", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TYPE_SUBNAME", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXTENDED_TYPE_INFO", // 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_VARBINARY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXTENDED_TYPE_INFO", //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_VARBINARY_LENGTH, //column_length + -1, //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(FLAT_ROW_STORE); @@ -2317,17 +2310,16 @@ int ObInnerTableSchema::all_virtual_routine_param_agent_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_data_type_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_data_type_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2358,48 +2350,48 @@ int ObInnerTableSchema::all_virtual_data_type_ora_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATA_TYPE", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("DATA_TYPE", //column_name + ++column_id, //column_id + 1, //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("DATA_TYPE_STR", // 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 - OB_MAX_SYS_PARAM_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DATA_TYPE_STR", //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 + OB_MAX_SYS_PARAM_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATA_TYPE_CLASS", // 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 + ADD_COLUMN_SCHEMA("DATA_TYPE_CLASS", //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_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2409,17 +2401,16 @@ int ObInnerTableSchema::all_virtual_data_type_ora_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_table_sys_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_table_sys_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2450,1098 +2441,1098 @@ int ObInnerTableSchema::all_virtual_table_sys_agent_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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("TABLE_NAME", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATABASE_ID", // 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("TABLE_TYPE", // 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("LOAD_TYPE", // 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("DEF_TYPE", // 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("ROWKEY_COLUMN_NUM", // 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("INDEX_COLUMN_NUM", // 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_USED_COLUMN_ID", // 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("REPLICA_NUM", // 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("AUTOINC_COLUMN_ID", // 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("AUTO_INCREMENT", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("READ_ONLY", // 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("ROWKEY_SPLIT_POS", // 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("COMPRESS_FUNC_NAME", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXPIRE_CONDITION", // 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 - OB_MAX_EXPIRE_INFO_STRING_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IS_USE_BLOOMFILTER", // 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("COMMENT", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BLOCK_SIZE", // 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("COLLATION_TYPE", // 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("DATA_TABLE_ID", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INDEX_STATUS", // 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("TABLEGROUP_ID", // 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("PROGRESSIVE_MERGE_NUM", // 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("INDEX_TYPE", // 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("PART_LEVEL", // 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("PART_FUNC_TYPE", // 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("PART_FUNC_EXPR", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PART_NUM", // 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("SUB_PART_FUNC_TYPE", // 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("SUB_PART_FUNC_EXPR", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUB_PART_NUM", // 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("CREATE_MEM_VERSION", // 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("SCHEMA_VERSION", // 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("VIEW_DEFINITION", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VIEW_CHECK_OPTION", // 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("VIEW_IS_UPDATABLE", // 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("ZONE_LIST", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIMARY_ZONE", // 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 - MAX_ZONE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INDEX_USING_TYPE", // 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("PARSER_NAME", // 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 - OB_MAX_PARSER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INDEX_ATTRIBUTES_SET", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LOCALITY", // 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 - MAX_LOCALITY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLET_SIZE", // 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("PCTFREE", // 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("PREVIOUS_LOCALITY", // 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 - MAX_LOCALITY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAX_USED_PART_ID", // 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("PARTITION_CNT_WITHIN_PARTITION_TABLE", // 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("PARTITION_STATUS", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARTITION_SCHEMA_VERSION", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAX_USED_CONSTRAINT_ID", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SESSION_ID", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PK_COMMENT", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SESS_ACTIVE_TIME", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROW_STORE_TYPE", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STORE_FORMAT", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DUPLICATE_SCOPE", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BINDING", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROGRESSIVE_MERGE_ROUND", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STORAGE_FORMAT_VERSION", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLE_MODE", // 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("ENCRYPTION", // 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 - OB_MAX_ENCRYPTION_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLESPACE_ID", // 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("DROP_SCHEMA_VERSION", // 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("IS_SUB_PART_TEMPLATE", // 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("DOP", // 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("CHARACTER_SET_CLIENT", // 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("COLLATION_CONNECTION", // 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("AUTO_PART_SIZE", // 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("AUTO_PART", // 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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("TABLE_NAME", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("TABLE_TYPE", //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("LOAD_TYPE", //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("DEF_TYPE", //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("ROWKEY_COLUMN_NUM", //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("INDEX_COLUMN_NUM", //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_USED_COLUMN_ID", //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("REPLICA_NUM", //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("AUTOINC_COLUMN_ID", //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("AUTO_INCREMENT", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("READ_ONLY", //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("ROWKEY_SPLIT_POS", //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("COMPRESS_FUNC_NAME", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("EXPIRE_CONDITION", //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 + OB_MAX_EXPIRE_INFO_STRING_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("IS_USE_BLOOMFILTER", //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("COMMENT", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("BLOCK_SIZE", //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("COLLATION_TYPE", //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("DATA_TABLE_ID", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("INDEX_STATUS", //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("TABLEGROUP_ID", //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("PROGRESSIVE_MERGE_NUM", //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("INDEX_TYPE", //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("PART_LEVEL", //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("PART_FUNC_TYPE", //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("PART_FUNC_EXPR", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PART_NUM", //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("SUB_PART_FUNC_TYPE", //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("SUB_PART_FUNC_EXPR", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("SUB_PART_NUM", //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("CREATE_MEM_VERSION", //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("SCHEMA_VERSION", //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("VIEW_DEFINITION", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("VIEW_CHECK_OPTION", //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("VIEW_IS_UPDATABLE", //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("ZONE_LIST", //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 + MAX_ZONE_LIST_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PRIMARY_ZONE", //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 + MAX_ZONE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("INDEX_USING_TYPE", //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("PARSER_NAME", //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 + OB_MAX_PARSER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("INDEX_ATTRIBUTES_SET", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("LOCALITY", //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 + MAX_LOCALITY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("TABLET_SIZE", //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("PCTFREE", //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("PREVIOUS_LOCALITY", //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 + MAX_LOCALITY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("MAX_USED_PART_ID", //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("PARTITION_CNT_WITHIN_PARTITION_TABLE", //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("PARTITION_STATUS", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PARTITION_SCHEMA_VERSION", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("MAX_USED_CONSTRAINT_ID", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("SESSION_ID", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PK_COMMENT", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("SESS_ACTIVE_TIME", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("ROW_STORE_TYPE", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("STORE_FORMAT", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("DUPLICATE_SCOPE", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("BINDING", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PROGRESSIVE_MERGE_ROUND", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("STORAGE_FORMAT_VERSION", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("TABLE_MODE", //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("ENCRYPTION", //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 + OB_MAX_ENCRYPTION_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("TABLESPACE_ID", //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("DROP_SCHEMA_VERSION", //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("IS_SUB_PART_TEMPLATE", //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("DOP", //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("CHARACTER_SET_CLIENT", //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("COLLATION_CONNECTION", //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("AUTO_PART_SIZE", //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("AUTO_PART", //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("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3551,17 +3542,16 @@ int ObInnerTableSchema::all_virtual_table_sys_agent_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sstable_checksum_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sstable_checksum_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -3592,213 +3582,213 @@ int ObInnerTableSchema::all_virtual_sstable_checksum_agent_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("DATA_TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("DATA_TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("SSTABLE_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SSTABLE_ID", //column_name + ++column_id, //column_id + 3, //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("PARTITION_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("PARTITION_ID", //column_name + ++column_id, //column_id + 4, //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("SSTABLE_TYPE", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("SSTABLE_TYPE", //column_name + ++column_id, //column_id + 5, //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("SVR_IP", // column_name - ++column_id, // column_id - 6, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 6, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 7, //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("ROW_CHECKSUM", // 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 + ADD_COLUMN_SCHEMA("ROW_CHECKSUM", //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("DATA_CHECKSUM", // 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 + ADD_COLUMN_SCHEMA("DATA_CHECKSUM", //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("ROW_COUNT", // 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 + ADD_COLUMN_SCHEMA("ROW_COUNT", //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("SNAPSHOT_VERSION", // 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 + ADD_COLUMN_SCHEMA("SNAPSHOT_VERSION", //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("REPLICA_TYPE", // 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 + ADD_COLUMN_SCHEMA("REPLICA_TYPE", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3808,17 +3798,16 @@ int ObInnerTableSchema::all_virtual_sstable_checksum_agent_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_partition_info_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_partition_info_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -3849,498 +3838,513 @@ int ObInnerTableSchema::all_virtual_partition_info_agent_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //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("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("TABLE_ID", // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //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("PARTITION_IDX", // 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 + ADD_COLUMN_SCHEMA("PARTITION_IDX", //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_DECIDED_TRANS_VERSION", // 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 + ADD_COLUMN_SCHEMA("MAX_DECIDED_TRANS_VERSION", //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_PASSED_TRANS_TS", // 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 + ADD_COLUMN_SCHEMA("MAX_PASSED_TRANS_TS", //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("FREEZE_TS", // 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 + ADD_COLUMN_SCHEMA("FREEZE_TS", //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("ALLOW_GC", // 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 + ADD_COLUMN_SCHEMA("ALLOW_GC", //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("PARTITION_STATE", // 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 - TABLE_MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARTITION_STATE", //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 + TABLE_MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SSTABLE_READ_RATE", // 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 + ADD_COLUMN_SCHEMA("SSTABLE_READ_RATE", //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("SSTABLE_READ_BYTES_RATE", // 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 + ADD_COLUMN_SCHEMA("SSTABLE_READ_BYTES_RATE", //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("SSTABLE_WRITE_RATE", // 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 + ADD_COLUMN_SCHEMA("SSTABLE_WRITE_RATE", //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("SSTABLE_WRITE_BYTES_RATE", // 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 + ADD_COLUMN_SCHEMA("SSTABLE_WRITE_BYTES_RATE", //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("LOG_WRITE_RATE", // 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 + ADD_COLUMN_SCHEMA("LOG_WRITE_RATE", //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("LOG_WRITE_BYTES_RATE", // 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 + ADD_COLUMN_SCHEMA("LOG_WRITE_BYTES_RATE", //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("MEMTABLE_BYTES", // 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 + ADD_COLUMN_SCHEMA("MEMTABLE_BYTES", //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("CPU_UTIME_RATE", // 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 + ADD_COLUMN_SCHEMA("CPU_UTIME_RATE", //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("CPU_STIME_RATE", // 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 + ADD_COLUMN_SCHEMA("CPU_STIME_RATE", //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("NET_IN_RATE", // 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 + ADD_COLUMN_SCHEMA("NET_IN_RATE", //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("NET_IN_BYTES_RATE", // 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 + ADD_COLUMN_SCHEMA("NET_IN_BYTES_RATE", //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("NET_OUT_RATE", // 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 + ADD_COLUMN_SCHEMA("NET_OUT_RATE", //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("NET_OUT_BYTES_RATE", // 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 + ADD_COLUMN_SCHEMA("NET_OUT_BYTES_RATE", //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("MIN_LOG_SERVICE_TS", // 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 + ADD_COLUMN_SCHEMA("MIN_LOG_SERVICE_TS", //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("MIN_TRANS_SERVICE_TS", // 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 + ADD_COLUMN_SCHEMA("MIN_TRANS_SERVICE_TS", //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("MIN_REPLAY_ENGINE_TS", // 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 + ADD_COLUMN_SCHEMA("MIN_REPLAY_ENGINE_TS", //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("IS_NEED_REBUILD", // 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 + ADD_COLUMN_SCHEMA("IS_NEED_REBUILD", //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("PG_PARTITION_COUNT", // 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 + ADD_COLUMN_SCHEMA("PG_PARTITION_COUNT", //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("IS_PG", // 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 + ADD_COLUMN_SCHEMA("IS_PG", //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("WEAK_READ_TIMESTAMP", // 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 + ADD_COLUMN_SCHEMA("WEAK_READ_TIMESTAMP", //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("REPLICA_TYPE", // 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 + ADD_COLUMN_SCHEMA("REPLICA_TYPE", //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("LAST_REPLAY_LOG_ID", // 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 + ADD_COLUMN_SCHEMA("LAST_REPLAY_LOG_ID", //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("LAST_REPLAY_LOG_TS", //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_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4350,17 +4354,16 @@ int ObInnerTableSchema::all_virtual_partition_info_agent_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_partition_meta_table_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_partition_meta_table_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -4391,228 +4394,228 @@ int ObInnerTableSchema::all_virtual_tenant_partition_meta_table_agent_schema(ObT table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("PARTITION_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PARTITION_ID", //column_name + ++column_id, //column_id + 3, //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("SVR_IP", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - 32, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + 32, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 5, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROLE", // 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 + ADD_COLUMN_SCHEMA("ROLE", //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("ROW_COUNT", // 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 + ADD_COLUMN_SCHEMA("ROW_COUNT", //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("DATA_SIZE", // 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 + ADD_COLUMN_SCHEMA("DATA_SIZE", //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("DATA_VERSION", // 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 + ADD_COLUMN_SCHEMA("DATA_VERSION", //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("REQUIRED_SIZE", // 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 + ADD_COLUMN_SCHEMA("REQUIRED_SIZE", //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("REPLICA_TYPE", // 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 + ADD_COLUMN_SCHEMA("REPLICA_TYPE", //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("STATUS", // 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 - MAX_REPLICA_STATUS_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("STATUS", //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 + MAX_REPLICA_STATUS_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATA_CHECKSUM", // 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 + ADD_COLUMN_SCHEMA("DATA_CHECKSUM", //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(FLAT_ROW_STORE); @@ -4622,17 +4625,16 @@ int ObInnerTableSchema::all_virtual_tenant_partition_meta_table_agent_schema(ObT table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_keystore_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_keystore_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -4663,138 +4665,138 @@ int ObInnerTableSchema::all_virtual_tenant_keystore_agent_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("KEYSTORE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("KEYSTORE_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("KEYSTORE_NAME", // 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 - OB_MAX_KEYSTORE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("KEYSTORE_NAME", //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 + OB_MAX_KEYSTORE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PASSWORD", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PASSWORD", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STATUS", // 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 + ADD_COLUMN_SCHEMA("STATUS", //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("MASTER_KEY_ID", // 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 + ADD_COLUMN_SCHEMA("MASTER_KEY_ID", //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("MASTER_KEY", // 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 - OB_MAX_MASTER_KEY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MASTER_KEY", //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 + OB_MAX_MASTER_KEY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4804,17 +4806,16 @@ int ObInnerTableSchema::all_virtual_tenant_keystore_agent_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_tablespace_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_tablespace_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -4845,123 +4846,123 @@ int ObInnerTableSchema::all_virtual_tenant_tablespace_agent_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLESPACE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLESPACE_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLESPACE_NAME", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TABLESPACE_NAME", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ENCRYPTION_NAME", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ENCRYPTION_NAME", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ENCRYPT_KEY", // 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_MASTER_KEY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ENCRYPT_KEY", //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_MASTER_KEY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MASTER_KEY_ID", // 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 + ADD_COLUMN_SCHEMA("MASTER_KEY_ID", //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(FLAT_ROW_STORE); @@ -4971,17 +4972,16 @@ int ObInnerTableSchema::all_virtual_tenant_tablespace_agent_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_profile_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_profile_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -5012,198 +5012,198 @@ int ObInnerTableSchema::all_virtual_tenant_profile_agent_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("PROFILE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("PROFILE_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROFILE_NAME", // 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 - OB_MAX_SQL_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PROFILE_NAME", //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 + OB_MAX_SQL_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("FAILED_LOGIN_ATTEMPTS", // 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 + ADD_COLUMN_SCHEMA("FAILED_LOGIN_ATTEMPTS", //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("PASSWORD_LOCK_TIME", // 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 + ADD_COLUMN_SCHEMA("PASSWORD_LOCK_TIME", //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("PASSWORD_VERIFY_FUNCTION", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PASSWORD_VERIFY_FUNCTION", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PASSWORD_LIFE_TIME", // 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 + ADD_COLUMN_SCHEMA("PASSWORD_LIFE_TIME", //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("PASSWORD_GRACE_TIME", // 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 + ADD_COLUMN_SCHEMA("PASSWORD_GRACE_TIME", //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("PASSWORD_REUSE_TIME", // 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 + ADD_COLUMN_SCHEMA("PASSWORD_REUSE_TIME", //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("PASSWORD_REUSE_MAX", // 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 + ADD_COLUMN_SCHEMA("PASSWORD_REUSE_MAX", //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("INACTIVE_ACCOUNT_TIME", // 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 + ADD_COLUMN_SCHEMA("INACTIVE_ACCOUNT_TIME", //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(FLAT_ROW_STORE); @@ -5213,17 +5213,16 @@ int ObInnerTableSchema::all_virtual_tenant_profile_agent_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_role_grantee_map_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_role_grantee_map_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -5254,108 +5253,108 @@ int ObInnerTableSchema::all_virtual_tenant_role_grantee_map_agent_schema(ObTable table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("GRANTEE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("GRANTEE_ID", //column_name + ++column_id, //column_id + 2, //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("ROLE_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("ROLE_ID", //column_name + ++column_id, //column_id + 3, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ADMIN_OPTION", // 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 + ADD_COLUMN_SCHEMA("ADMIN_OPTION", //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("DISABLE_FLAG", // 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 + ADD_COLUMN_SCHEMA("DISABLE_FLAG", //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(FLAT_ROW_STORE); @@ -5365,17 +5364,16 @@ int ObInnerTableSchema::all_virtual_tenant_role_grantee_map_agent_schema(ObTable table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_table_privilege_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_table_privilege_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -5406,258 +5404,258 @@ int ObInnerTableSchema::all_virtual_table_privilege_agent_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("USER_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("USER_ID", //column_name + ++column_id, //column_id + 2, //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("DATABASE_NAME", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DATABASE_NAME", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLE_NAME", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_CORE_TALBE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TABLE_NAME", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_CORE_TALBE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIV_ALTER", // 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 + ADD_COLUMN_SCHEMA("PRIV_ALTER", //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("PRIV_CREATE", // 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 + ADD_COLUMN_SCHEMA("PRIV_CREATE", //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("PRIV_DELETE", // 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 + ADD_COLUMN_SCHEMA("PRIV_DELETE", //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("PRIV_DROP", // 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 + ADD_COLUMN_SCHEMA("PRIV_DROP", //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("PRIV_GRANT_OPTION", // 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 + ADD_COLUMN_SCHEMA("PRIV_GRANT_OPTION", //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("PRIV_INSERT", // 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 + ADD_COLUMN_SCHEMA("PRIV_INSERT", //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("PRIV_UPDATE", // 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 + ADD_COLUMN_SCHEMA("PRIV_UPDATE", //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("PRIV_SELECT", // 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 + ADD_COLUMN_SCHEMA("PRIV_SELECT", //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("PRIV_INDEX", // 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 + ADD_COLUMN_SCHEMA("PRIV_INDEX", //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("PRIV_CREATE_VIEW", // 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 + ADD_COLUMN_SCHEMA("PRIV_CREATE_VIEW", //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("PRIV_SHOW_VIEW", // 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 + ADD_COLUMN_SCHEMA("PRIV_SHOW_VIEW", //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(FLAT_ROW_STORE); @@ -5667,17 +5665,16 @@ int ObInnerTableSchema::all_virtual_table_privilege_agent_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_security_audit_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_security_audit_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -5708,138 +5705,138 @@ int ObInnerTableSchema::all_virtual_security_audit_agent_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("AUDIT_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("AUDIT_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("AUDIT_TYPE", // 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 + ADD_COLUMN_SCHEMA("AUDIT_TYPE", //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("OWNER_ID", // 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 + ADD_COLUMN_SCHEMA("OWNER_ID", //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("OPERATION_TYPE", // 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 + ADD_COLUMN_SCHEMA("OPERATION_TYPE", //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("IN_SUCCESS", // 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 + ADD_COLUMN_SCHEMA("IN_SUCCESS", //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("IN_FAILURE", // 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 + ADD_COLUMN_SCHEMA("IN_FAILURE", //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(FLAT_ROW_STORE); @@ -5849,17 +5846,16 @@ int ObInnerTableSchema::all_virtual_security_audit_agent_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_security_audit_history_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_security_audit_history_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -5890,168 +5886,168 @@ int ObInnerTableSchema::all_virtual_security_audit_history_agent_schema(ObTableS table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("AUDIT_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("AUDIT_ID", //column_name + ++column_id, //column_id + 2, //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("SCHEMA_VERSION", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //column_name + ++column_id, //column_id + 3, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IS_DELETED", // 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 + ADD_COLUMN_SCHEMA("IS_DELETED", //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("AUDIT_TYPE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("AUDIT_TYPE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OWNER_ID", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OWNER_ID", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OPERATION_TYPE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OPERATION_TYPE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IN_SUCCESS", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("IN_SUCCESS", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IN_FAILURE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("IN_FAILURE", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6061,17 +6057,16 @@ int ObInnerTableSchema::all_virtual_security_audit_history_agent_schema(ObTableS table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_trigger_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_trigger_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -6102,393 +6097,393 @@ int ObInnerTableSchema::all_virtual_trigger_agent_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TRIGGER_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TRIGGER_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TRIGGER_NAME", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TRIGGER_NAME", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("OWNER_ID", // 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 + ADD_COLUMN_SCHEMA("OWNER_ID", //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("TRIGGER_TYPE", // 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 + ADD_COLUMN_SCHEMA("TRIGGER_TYPE", //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("TRIGGER_EVENTS", // 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 + ADD_COLUMN_SCHEMA("TRIGGER_EVENTS", //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("TIMING_POINTS", // 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 + ADD_COLUMN_SCHEMA("TIMING_POINTS", //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("BASE_OBJECT_TYPE", // 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 + ADD_COLUMN_SCHEMA("BASE_OBJECT_TYPE", //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("BASE_OBJECT_ID", // 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 + ADD_COLUMN_SCHEMA("BASE_OBJECT_ID", //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("TRIGGER_FLAGS", // 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 + ADD_COLUMN_SCHEMA("TRIGGER_FLAGS", //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("UPDATE_COLUMNS", // 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 - OB_MAX_UPDATE_COLUMNS_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("UPDATE_COLUMNS", //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 + OB_MAX_UPDATE_COLUMNS_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REF_OLD_NAME", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REF_OLD_NAME", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REF_NEW_NAME", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REF_NEW_NAME", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REF_PARENT_NAME", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REF_PARENT_NAME", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("WHEN_CONDITION", // 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 - OB_MAX_WHEN_CONDITION_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("WHEN_CONDITION", //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 + OB_MAX_WHEN_CONDITION_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TRIGGER_BODY", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TRIGGER_BODY", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PACKAGE_SPEC_SOURCE", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PACKAGE_SPEC_SOURCE", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PACKAGE_BODY_SOURCE", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PACKAGE_BODY_SOURCE", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PACKAGE_FLAG", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_FLAG", //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("PACKAGE_COMP_FLAG", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_COMP_FLAG", //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("PACKAGE_EXEC_ENV", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PACKAGE_EXEC_ENV", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_MODE", // 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 + ADD_COLUMN_SCHEMA("SQL_MODE", //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(FLAT_ROW_STORE); @@ -6498,17 +6493,16 @@ int ObInnerTableSchema::all_virtual_trigger_agent_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_px_worker_stat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_px_worker_stat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -6539,168 +6533,168 @@ int ObInnerTableSchema::all_virtual_px_worker_stat_ora_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SESSION_ID", // 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 + ADD_COLUMN_SCHEMA("SESSION_ID", //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("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("SVR_IP", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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("TRACE_ID", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TRACE_ID", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("QC_ID", // 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 + ADD_COLUMN_SCHEMA("QC_ID", //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("SQC_ID", // 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 + ADD_COLUMN_SCHEMA("SQC_ID", //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("WORKER_ID", // 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 + ADD_COLUMN_SCHEMA("WORKER_ID", //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("DFO_ID", // 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 + ADD_COLUMN_SCHEMA("DFO_ID", //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("START_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("START_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("THREAD_ID", // 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 + ADD_COLUMN_SCHEMA("THREAD_ID", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -6718,17 +6712,16 @@ int ObInnerTableSchema::all_virtual_px_worker_stat_ora_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_ps_stat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_ps_stat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -6759,108 +6752,108 @@ int ObInnerTableSchema::all_virtual_ps_stat_ora_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("SVR_IP", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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("STMT_COUNT", // 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 + ADD_COLUMN_SCHEMA("STMT_COUNT", //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("HIT_COUNT", // 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 + ADD_COLUMN_SCHEMA("HIT_COUNT", //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("ACCESS_COUNT", // 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 + ADD_COLUMN_SCHEMA("ACCESS_COUNT", //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("MEM_HOLD", // 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 + ADD_COLUMN_SCHEMA("MEM_HOLD", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -6878,17 +6871,16 @@ int ObInnerTableSchema::all_virtual_ps_stat_ora_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_ps_item_info_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_ps_item_info_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -6919,198 +6911,198 @@ int ObInnerTableSchema::all_virtual_ps_item_info_ora_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("SVR_IP", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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("STMT_ID", // 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 + ADD_COLUMN_SCHEMA("STMT_ID", //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("DB_ID", // 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 + ADD_COLUMN_SCHEMA("DB_ID", //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("PS_SQL", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PS_SQL", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARAM_COUNT", // 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 + ADD_COLUMN_SCHEMA("PARAM_COUNT", //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("STMT_ITEM_REF_COUNT", // 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 + ADD_COLUMN_SCHEMA("STMT_ITEM_REF_COUNT", //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("STMT_INFO_REF_COUNT", // 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 + ADD_COLUMN_SCHEMA("STMT_INFO_REF_COUNT", //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("MEM_HOLD", // 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 + ADD_COLUMN_SCHEMA("MEM_HOLD", //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("STMT_TYPE", // 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 + ADD_COLUMN_SCHEMA("STMT_TYPE", //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("CHECKSUM", // 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 + ADD_COLUMN_SCHEMA("CHECKSUM", //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("EXPIRED", // 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 + ADD_COLUMN_SCHEMA("EXPIRED", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -7128,17 +7120,16 @@ int ObInnerTableSchema::all_virtual_ps_item_info_ora_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_parameter_stat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_parameter_stat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -7169,183 +7160,183 @@ int ObInnerTableSchema::all_virtual_tenant_parameter_stat_ora_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ZONE", // 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 - MAX_ZONE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ZONE", //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 + MAX_ZONE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_TYPE", // 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 - SERVER_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_TYPE", //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 + SERVER_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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("NAME", // 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 - OB_MAX_CONFIG_NAME_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NAME", //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 + OB_MAX_CONFIG_NAME_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATA_TYPE", // 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 - OB_MAX_CONFIG_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DATA_TYPE", //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 + OB_MAX_CONFIG_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VALUE", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VALUE", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INFO", // 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 - OB_MAX_CONFIG_INFO_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("INFO", //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 + OB_MAX_CONFIG_INFO_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SECTION", // 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 - OB_MAX_CONFIG_SECTION_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SECTION", //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 + OB_MAX_CONFIG_SECTION_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCOPE", // 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 - OB_MAX_CONFIG_SCOPE_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SCOPE", //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 + OB_MAX_CONFIG_SCOPE_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SOURCE", // 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 - OB_MAX_CONFIG_SOURCE_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SOURCE", //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 + OB_MAX_CONFIG_SOURCE_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EDIT_LEVEL", // 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 - OB_MAX_CONFIG_EDIT_LEVEL_LEN, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EDIT_LEVEL", //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 + OB_MAX_CONFIG_EDIT_LEVEL_LEN, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -7363,17 +7354,16 @@ int ObInnerTableSchema::all_virtual_tenant_parameter_stat_ora_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_workarea_history_stat_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_workarea_history_stat_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -7404,303 +7394,303 @@ int ObInnerTableSchema::all_virtual_sql_workarea_history_stat_agent_schema(ObTab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //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("PLAN_ID", // 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 + ADD_COLUMN_SCHEMA("PLAN_ID", //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("SQL_ID", // 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 - OB_MAX_SQL_ID_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_ID", //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 + OB_MAX_SQL_ID_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OPERATION_TYPE", // 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 - 40, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OPERATION_TYPE", //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 + 40, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OPERATION_ID", // 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 + ADD_COLUMN_SCHEMA("OPERATION_ID", //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("ESTIMATED_OPTIMAL_SIZE", // 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 + ADD_COLUMN_SCHEMA("ESTIMATED_OPTIMAL_SIZE", //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("ESTIMATED_ONEPASS_SIZE", // 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 + ADD_COLUMN_SCHEMA("ESTIMATED_ONEPASS_SIZE", //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("LAST_MEMORY_USED", // 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 + ADD_COLUMN_SCHEMA("LAST_MEMORY_USED", //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("LAST_EXECUTION", // 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 - 10, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LAST_EXECUTION", //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 + 10, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LAST_DEGREE", // 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 + ADD_COLUMN_SCHEMA("LAST_DEGREE", //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("TOTAL_EXECUTIONS", // 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 + ADD_COLUMN_SCHEMA("TOTAL_EXECUTIONS", //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("OPTIMAL_EXECUTIONS", // 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 + ADD_COLUMN_SCHEMA("OPTIMAL_EXECUTIONS", //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("ONEPASS_EXECUTIONS", // 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 + ADD_COLUMN_SCHEMA("ONEPASS_EXECUTIONS", //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("MULTIPASSES_EXECUTIONS", // 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 + ADD_COLUMN_SCHEMA("MULTIPASSES_EXECUTIONS", //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("ACTIVE_TIME", // 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 + ADD_COLUMN_SCHEMA("ACTIVE_TIME", //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_TEMPSEG_SIZE", // 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 + ADD_COLUMN_SCHEMA("MAX_TEMPSEG_SIZE", //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("LAST_TEMPSEG_SIZE", // 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 + ADD_COLUMN_SCHEMA("LAST_TEMPSEG_SIZE", //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("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("POLICY", // 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 - 10, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("POLICY", //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 + 10, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -7710,17 +7700,16 @@ int ObInnerTableSchema::all_virtual_sql_workarea_history_stat_agent_schema(ObTab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_workarea_active_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_workarea_active_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -7751,258 +7740,258 @@ int ObInnerTableSchema::all_virtual_sql_workarea_active_agent_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //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("PLAN_ID", // 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 + ADD_COLUMN_SCHEMA("PLAN_ID", //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("SQL_ID", // 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 - OB_MAX_SQL_ID_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_ID", //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 + OB_MAX_SQL_ID_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_EXEC_ID", // 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 + ADD_COLUMN_SCHEMA("SQL_EXEC_ID", //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("OPERATION_TYPE", // 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 - 40, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OPERATION_TYPE", //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 + 40, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OPERATION_ID", // 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 + ADD_COLUMN_SCHEMA("OPERATION_ID", //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("SID", // 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 + ADD_COLUMN_SCHEMA("SID", //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("ACTIVE_TIME", // 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 + ADD_COLUMN_SCHEMA("ACTIVE_TIME", //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("WORK_AREA_SIZE", // 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 + ADD_COLUMN_SCHEMA("WORK_AREA_SIZE", //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("EXPECT_SIZE", // 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 + ADD_COLUMN_SCHEMA("EXPECT_SIZE", //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("ACTUAL_MEM_USED", // 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 + ADD_COLUMN_SCHEMA("ACTUAL_MEM_USED", //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_MEM_USED", // 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 + ADD_COLUMN_SCHEMA("MAX_MEM_USED", //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("NUMBER_PASSES", // 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 + ADD_COLUMN_SCHEMA("NUMBER_PASSES", //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("TEMPSEG_SIZE", // 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 + ADD_COLUMN_SCHEMA("TEMPSEG_SIZE", //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("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("POLICY", // 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 - 6, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("POLICY", //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 + 6, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8012,17 +8001,16 @@ int ObInnerTableSchema::all_virtual_sql_workarea_active_agent_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_workarea_histogram_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_workarea_histogram_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -8053,138 +8041,138 @@ int ObInnerTableSchema::all_virtual_sql_workarea_histogram_agent_schema(ObTableS table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //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("LOW_OPTIMAL_SIZE", // 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 + ADD_COLUMN_SCHEMA("LOW_OPTIMAL_SIZE", //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("HIGH_OPTIMAL_SIZE", // 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 + ADD_COLUMN_SCHEMA("HIGH_OPTIMAL_SIZE", //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("OPTIMAL_EXECUTIONS", // 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 + ADD_COLUMN_SCHEMA("OPTIMAL_EXECUTIONS", //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("ONEPASS_EXECUTIONS", // 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 + ADD_COLUMN_SCHEMA("ONEPASS_EXECUTIONS", //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("MULTIPASSES_EXECUTIONS", // 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 + ADD_COLUMN_SCHEMA("MULTIPASSES_EXECUTIONS", //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("TOTAL_EXECUTIONS", // 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 + ADD_COLUMN_SCHEMA("TOTAL_EXECUTIONS", //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("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8194,17 +8182,16 @@ int ObInnerTableSchema::all_virtual_sql_workarea_histogram_agent_schema(ObTableS table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_workarea_memory_info_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_workarea_memory_info_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -8235,183 +8222,183 @@ int ObInnerTableSchema::all_virtual_sql_workarea_memory_info_agent_schema(ObTabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //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_WORKAREA_SIZE", // 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 + ADD_COLUMN_SCHEMA("MAX_WORKAREA_SIZE", //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("WORKAREA_HOLD_SIZE", // 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 + ADD_COLUMN_SCHEMA("WORKAREA_HOLD_SIZE", //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_AUTO_WORKAREA_SIZE", // 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 + ADD_COLUMN_SCHEMA("MAX_AUTO_WORKAREA_SIZE", //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("MEM_TARGET", // 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 + ADD_COLUMN_SCHEMA("MEM_TARGET", //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("TOTAL_MEM_USED", // 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 + ADD_COLUMN_SCHEMA("TOTAL_MEM_USED", //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("GLOBAL_MEM_BOUND", // 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 + ADD_COLUMN_SCHEMA("GLOBAL_MEM_BOUND", //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("DRIFT_SIZE", // 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 + ADD_COLUMN_SCHEMA("DRIFT_SIZE", //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("WORKAREA_COUNT", // 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 + ADD_COLUMN_SCHEMA("WORKAREA_COUNT", //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("MANUAL_CALC_COUNT", // 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 + ADD_COLUMN_SCHEMA("MANUAL_CALC_COUNT", //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("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8421,17 +8408,16 @@ int ObInnerTableSchema::all_virtual_sql_workarea_memory_info_agent_schema(ObTabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_security_audit_record_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_security_audit_record_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -8462,663 +8448,663 @@ int ObInnerTableSchema::all_virtual_security_audit_record_agent_schema(ObTableSc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("SVR_IP", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 3, //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("RECORD_TIMESTAMP_US", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("RECORD_TIMESTAMP_US", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("USER_ID", // 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 + ADD_COLUMN_SCHEMA("USER_ID", //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("USER_NAME", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USER_NAME", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EFFECTIVE_USER_ID", // 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 + ADD_COLUMN_SCHEMA("EFFECTIVE_USER_ID", //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("EFFECTIVE_USER_NAME", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EFFECTIVE_USER_NAME", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CLIENT_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CLIENT_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("USER_CLIENT_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USER_CLIENT_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROXY_SESSION_ID", // 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 + ADD_COLUMN_SCHEMA("PROXY_SESSION_ID", //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("SESSION_ID", // 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 + ADD_COLUMN_SCHEMA("SESSION_ID", //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("ENTRY_ID", // 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 + ADD_COLUMN_SCHEMA("ENTRY_ID", //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("STATEMENT_ID", // 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 + ADD_COLUMN_SCHEMA("STATEMENT_ID", //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("TRANS_ID", // 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 - 512, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TRANS_ID", //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 + 512, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMIT_VERSION", // 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 + ADD_COLUMN_SCHEMA("COMMIT_VERSION", //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("TRACE_ID", // 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 - 64, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TRACE_ID", //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 + 64, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DB_ID", // 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 + ADD_COLUMN_SCHEMA("DB_ID", //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("CUR_DB_ID", // 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 + ADD_COLUMN_SCHEMA("CUR_DB_ID", //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("SQL_TIMESTAMP_US", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_TIMESTAMP_US", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("AUDIT_ID", // 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 + ADD_COLUMN_SCHEMA("AUDIT_ID", //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("AUDIT_TYPE", // 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 + ADD_COLUMN_SCHEMA("AUDIT_TYPE", //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("OPERATION_TYPE", // 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 + ADD_COLUMN_SCHEMA("OPERATION_TYPE", //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("ACTION_ID", // 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 + ADD_COLUMN_SCHEMA("ACTION_ID", //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("RETURN_CODE", // 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 + ADD_COLUMN_SCHEMA("RETURN_CODE", //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("OBJ_OWNER_NAME", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OBJ_OWNER_NAME", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OBJ_NAME", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OBJ_NAME", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NEW_OBJ_OWNER_NAME", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NEW_OBJ_OWNER_NAME", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NEW_OBJ_NAME", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NEW_OBJ_NAME", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("AUTH_PRIVILEGES", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("AUTH_PRIVILEGES", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("AUTH_GRANTEE", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("AUTH_GRANTEE", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LOGOFF_LOGICAL_READ", // 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 + ADD_COLUMN_SCHEMA("LOGOFF_LOGICAL_READ", //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("LOGOFF_PHYSICAL_READ", // 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 + ADD_COLUMN_SCHEMA("LOGOFF_PHYSICAL_READ", //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("LOGOFF_LOGICAL_WRITE", // 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 + ADD_COLUMN_SCHEMA("LOGOFF_LOGICAL_WRITE", //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("LOGOFF_LOCK_COUNT", // 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 + ADD_COLUMN_SCHEMA("LOGOFF_LOCK_COUNT", //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("LOGOFF_DEAD_LOCK", // 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 - 40, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LOGOFF_DEAD_LOCK", //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 + 40, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LOGOFF_CPU_TIME_US", // 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 + ADD_COLUMN_SCHEMA("LOGOFF_CPU_TIME_US", //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("LOGOFF_EXEC_TIME_US", // 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 + ADD_COLUMN_SCHEMA("LOGOFF_EXEC_TIME_US", //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("LOGOFF_ALIVE_TIME_US", // 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 + ADD_COLUMN_SCHEMA("LOGOFF_ALIVE_TIME_US", //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("COMMENT_TEXT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT_TEXT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_BIND", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_BIND", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_TEXT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_TEXT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //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(FLAT_ROW_STORE); @@ -9128,17 +9114,16 @@ int ObInnerTableSchema::all_virtual_security_audit_record_agent_schema(ObTableSc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sysauth_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sysauth_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -9169,93 +9154,93 @@ int ObInnerTableSchema::all_virtual_sysauth_agent_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("GRANTEE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("GRANTEE_ID", //column_name + ++column_id, //column_id + 2, //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("PRIV_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PRIV_ID", //column_name + ++column_id, //column_id + 3, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIV_OPTION", // 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 + ADD_COLUMN_SCHEMA("PRIV_OPTION", //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(FLAT_ROW_STORE); @@ -9265,17 +9250,16 @@ int ObInnerTableSchema::all_virtual_sysauth_agent_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sysauth_history_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sysauth_history_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -9306,123 +9290,123 @@ int ObInnerTableSchema::all_virtual_sysauth_history_agent_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("GRANTEE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("GRANTEE_ID", //column_name + ++column_id, //column_id + 2, //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("PRIV_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PRIV_ID", //column_name + ++column_id, //column_id + 3, //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("SCHEMA_VERSION", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //column_name + ++column_id, //column_id + 4, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IS_DELETED", // 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 + ADD_COLUMN_SCHEMA("IS_DELETED", //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("PRIV_OPTION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PRIV_OPTION", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9432,17 +9416,16 @@ int ObInnerTableSchema::all_virtual_sysauth_history_agent_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_objauth_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_objauth_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -9473,153 +9456,153 @@ int ObInnerTableSchema::all_virtual_objauth_agent_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("OBJ_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("OBJ_ID", //column_name + ++column_id, //column_id + 2, //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("OBJTYPE", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("OBJTYPE", //column_name + ++column_id, //column_id + 3, //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("COL_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("COL_ID", //column_name + ++column_id, //column_id + 4, //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("GRANTOR_ID", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("GRANTOR_ID", //column_name + ++column_id, //column_id + 5, //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("GRANTEE_ID", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("GRANTEE_ID", //column_name + ++column_id, //column_id + 6, //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("PRIV_ID", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("PRIV_ID", //column_name + ++column_id, //column_id + 7, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIV_OPTION", // 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 + ADD_COLUMN_SCHEMA("PRIV_OPTION", //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(FLAT_ROW_STORE); @@ -9629,17 +9612,16 @@ int ObInnerTableSchema::all_virtual_objauth_agent_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_objauth_history_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_objauth_history_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -9670,183 +9652,183 @@ int ObInnerTableSchema::all_virtual_objauth_history_agent_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("OBJ_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("OBJ_ID", //column_name + ++column_id, //column_id + 2, //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("OBJTYPE", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("OBJTYPE", //column_name + ++column_id, //column_id + 3, //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("COL_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("COL_ID", //column_name + ++column_id, //column_id + 4, //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("GRANTOR_ID", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("GRANTOR_ID", //column_name + ++column_id, //column_id + 5, //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("GRANTEE_ID", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("GRANTEE_ID", //column_name + ++column_id, //column_id + 6, //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("PRIV_ID", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("PRIV_ID", //column_name + ++column_id, //column_id + 7, //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("SCHEMA_VERSION", // column_name - ++column_id, // column_id - 8, // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //column_name + ++column_id, //column_id + 8, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IS_DELETED", // 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 + ADD_COLUMN_SCHEMA("IS_DELETED", //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("PRIV_OPTION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PRIV_OPTION", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9856,17 +9838,16 @@ int ObInnerTableSchema::all_virtual_objauth_history_agent_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_error_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_error_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -9897,198 +9878,198 @@ int ObInnerTableSchema::all_virtual_error_agent_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("OBJ_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("OBJ_ID", //column_name + ++column_id, //column_id + 2, //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("OBJ_SEQ", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("OBJ_SEQ", //column_name + ++column_id, //column_id + 3, //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("OBJ_TYPE", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("OBJ_TYPE", //column_name + ++column_id, //column_id + 4, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LINE", // 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 + ADD_COLUMN_SCHEMA("LINE", //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("POSITION", // 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 + ADD_COLUMN_SCHEMA("POSITION", //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("TEXT_LENGTH", // 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 + ADD_COLUMN_SCHEMA("TEXT_LENGTH", //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("TEXT", // 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 - MAX_ORACLE_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TEXT", //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 + MAX_ORACLE_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROPERTY", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PROPERTY", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ERROR_NUMBER", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ERROR_NUMBER", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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(FLAT_ROW_STORE); @@ -10098,17 +10079,16 @@ int ObInnerTableSchema::all_virtual_error_agent_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_table_mgr_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_table_mgr_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -10139,393 +10119,393 @@ int ObInnerTableSchema::all_virtual_table_mgr_agent_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //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("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("TABLE_TYPE", // 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 + ADD_COLUMN_SCHEMA("TABLE_TYPE", //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("TABLE_ID", // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //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("PARTITION_ID", // 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 + ADD_COLUMN_SCHEMA("PARTITION_ID", //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("INDEX_ID", // 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 + ADD_COLUMN_SCHEMA("INDEX_ID", //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("BASE_VERSION", // 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 + ADD_COLUMN_SCHEMA("BASE_VERSION", //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("MULTI_VERSION_START", // 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 + ADD_COLUMN_SCHEMA("MULTI_VERSION_START", //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("SNAPSHOT_VERSION", // 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 + ADD_COLUMN_SCHEMA("SNAPSHOT_VERSION", //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_MERGED_VERSION", // 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 + ADD_COLUMN_SCHEMA("MAX_MERGED_VERSION", //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("UPPER_TRANS_VERSION", // 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 + ADD_COLUMN_SCHEMA("UPPER_TRANS_VERSION", //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("START_LOG_TS", // 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 + ADD_COLUMN_SCHEMA("START_LOG_TS", //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("END_LOG_TS", // 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 + ADD_COLUMN_SCHEMA("END_LOG_TS", //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_LOG_TS", // 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 + ADD_COLUMN_SCHEMA("MAX_LOG_TS", //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("VERSION", // 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 + ADD_COLUMN_SCHEMA("VERSION", //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("LOGICAL_DATA_VERSION", // 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 + ADD_COLUMN_SCHEMA("LOGICAL_DATA_VERSION", //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("SIZE", // 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 + ADD_COLUMN_SCHEMA("SIZE", //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("COMPACT_ROW", // 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 + ADD_COLUMN_SCHEMA("COMPACT_ROW", //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("IS_ACTIVE", // 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 + ADD_COLUMN_SCHEMA("IS_ACTIVE", //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("TIMESTAMP", // 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 + ADD_COLUMN_SCHEMA("TIMESTAMP", //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("REF", // 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 + ADD_COLUMN_SCHEMA("REF", //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("WRITE_REF", // 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 + ADD_COLUMN_SCHEMA("WRITE_REF", //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("TRX_COUNT", // 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 + ADD_COLUMN_SCHEMA("TRX_COUNT", //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("PENDING_LOG_PERSISTING_ROW_CNT", // 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 + ADD_COLUMN_SCHEMA("PENDING_LOG_PERSISTING_ROW_CNT", //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("CONTAIN_UNCOMMITTED_ROW", // 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 + ADD_COLUMN_SCHEMA("CONTAIN_UNCOMMITTED_ROW", //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_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10535,17 +10515,16 @@ int ObInnerTableSchema::all_virtual_table_mgr_agent_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_def_sub_part_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_def_sub_part_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -10576,333 +10555,333 @@ int ObInnerTableSchema::all_virtual_def_sub_part_agent_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("SUB_PART_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SUB_PART_ID", //column_name + ++column_id, //column_id + 3, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUB_PART_NAME", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUB_PART_NAME", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("HIGH_BOUND_VAL", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HIGH_BOUND_VAL", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("B_HIGH_BOUND_VAL", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("B_HIGH_BOUND_VAL", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BLOCK_SIZE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("BLOCK_SIZE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REPLICA_NUM", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REPLICA_NUM", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMPRESS_FUNC_NAME", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMPRESS_FUNC_NAME", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LIST_VAL", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LIST_VAL", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("B_LIST_VAL", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("B_LIST_VAL", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUB_PART_IDX", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUB_PART_IDX", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SOURCE_PARTITION_ID", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SOURCE_PARTITION_ID", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAPPING_PG_SUB_PART_ID", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MAPPING_PG_SUB_PART_ID", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLESPACE_ID", // 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 + ADD_COLUMN_SCHEMA("TABLESPACE_ID", //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(FLAT_ROW_STORE); @@ -10912,17 +10891,16 @@ int ObInnerTableSchema::all_virtual_def_sub_part_agent_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_object_type_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_object_type_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -10953,348 +10931,348 @@ int ObInnerTableSchema::all_virtual_object_type_agent_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("OBJECT_TYPE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("OBJECT_TYPE_ID", //column_name + ++column_id, //column_id + 2, //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("TYPE", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("TYPE", //column_name + ++column_id, //column_id + 3, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("PROPERTIES", // 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 + ADD_COLUMN_SCHEMA("PROPERTIES", //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("CHARSET_ID", // 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 + ADD_COLUMN_SCHEMA("CHARSET_ID", //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("CHARSET_FORM", // 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 + ADD_COLUMN_SCHEMA("CHARSET_FORM", //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("LENGTH", // 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 + ADD_COLUMN_SCHEMA("LENGTH", //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("NUMBER_PRECISION", // 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 + ADD_COLUMN_SCHEMA("NUMBER_PRECISION", //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("SCALE", // 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 + ADD_COLUMN_SCHEMA("SCALE", //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("ZERO_FILL", // 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 + ADD_COLUMN_SCHEMA("ZERO_FILL", //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("COLL_TYPE", // 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 + ADD_COLUMN_SCHEMA("COLL_TYPE", //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("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("FLAG", // 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 + ADD_COLUMN_SCHEMA("FLAG", //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("OWNER_ID", // 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 + ADD_COLUMN_SCHEMA("OWNER_ID", //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("COMP_FLAG", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMP_FLAG", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OBJECT_NAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OBJECT_NAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXEC_ENV", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXEC_ENV", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SOURCE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SOURCE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROUTE_SQL", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROUTE_SQL", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //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(FLAT_ROW_STORE); @@ -11304,17 +11282,16 @@ int ObInnerTableSchema::all_virtual_object_type_agent_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_server_schema_info_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_server_schema_info_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -11345,123 +11322,123 @@ int ObInnerTableSchema::all_virtual_server_schema_info_agent_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //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("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("REFRESHED_SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("REFRESHED_SCHEMA_VERSION", //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("RECEIVED_SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("RECEIVED_SCHEMA_VERSION", //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("SCHEMA_COUNT", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_COUNT", //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("SCHEMA_SIZE", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_SIZE", //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("MIN_SSTABLE_SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("MIN_SSTABLE_SCHEMA_VERSION", //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_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11471,17 +11448,16 @@ int ObInnerTableSchema::all_virtual_server_schema_info_agent_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_dblink_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_dblink_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -11512,183 +11488,183 @@ int ObInnerTableSchema::all_virtual_dblink_agent_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("DBLINK_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("DBLINK_ID", //column_name + ++column_id, //column_id + 2, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DBLINK_NAME", // 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 - OB_MAX_DBLINK_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DBLINK_NAME", //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 + OB_MAX_DBLINK_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OWNER_ID", // 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 + ADD_COLUMN_SCHEMA("OWNER_ID", //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("HOST_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HOST_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("HOST_PORT", // 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 + ADD_COLUMN_SCHEMA("HOST_PORT", //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("CLUSTER_NAME", // 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 - OB_MAX_CLUSTER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CLUSTER_NAME", //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 + OB_MAX_CLUSTER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_NAME", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TENANT_NAME", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("USER_NAME", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USER_NAME", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PASSWORD", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PASSWORD", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11698,17 +11674,16 @@ int ObInnerTableSchema::all_virtual_dblink_agent_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_dblink_history_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_dblink_history_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -11739,213 +11714,213 @@ int ObInnerTableSchema::all_virtual_dblink_history_agent_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("DBLINK_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("DBLINK_ID", //column_name + ++column_id, //column_id + 2, //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("SCHEMA_VERSION", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //column_name + ++column_id, //column_id + 3, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IS_DELETED", // 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 + ADD_COLUMN_SCHEMA("IS_DELETED", //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("DBLINK_NAME", // 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 - OB_MAX_DBLINK_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DBLINK_NAME", //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 + OB_MAX_DBLINK_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OWNER_ID", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OWNER_ID", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("HOST_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HOST_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("HOST_PORT", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HOST_PORT", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CLUSTER_NAME", // 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 - OB_MAX_CLUSTER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CLUSTER_NAME", //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 + OB_MAX_CLUSTER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_NAME", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TENANT_NAME", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("USER_NAME", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USER_NAME", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PASSWORD", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PASSWORD", //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 + OB_MAX_PASSWORD_LENGTH, //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(FLAT_ROW_STORE); @@ -11955,10 +11930,10 @@ int ObInnerTableSchema::all_virtual_dblink_history_agent_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase 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 c3a819c34..03e7620db 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 @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::all_virtual_sql_plan_monitor_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_plan_monitor_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -58,528 +60,528 @@ int ObInnerTableSchema::all_virtual_sql_plan_monitor_ora_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 2, //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("TENANT_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 3, //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("REQUEST_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("REQUEST_ID", //column_name + ++column_id, //column_id + 4, //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("TRACE_ID", // 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 - OB_MAX_TRACE_ID_BUFFER_SIZE, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TRACE_ID", //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 + OB_MAX_TRACE_ID_BUFFER_SIZE, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("FIRST_REFRESH_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("FIRST_REFRESH_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LAST_REFRESH_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LAST_REFRESH_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("FIRST_CHANGE_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("FIRST_CHANGE_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LAST_CHANGE_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LAST_CHANGE_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OTHERSTAT_1_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_1_ID", //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("OTHERSTAT_1_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_1_VALUE", //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("OTHERSTAT_2_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_2_ID", //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("OTHERSTAT_2_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_2_VALUE", //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("OTHERSTAT_3_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_3_ID", //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("OTHERSTAT_3_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_3_VALUE", //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("OTHERSTAT_4_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_4_ID", //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("OTHERSTAT_4_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_4_VALUE", //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("OTHERSTAT_5_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_5_ID", //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("OTHERSTAT_5_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_5_VALUE", //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("OTHERSTAT_6_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_6_ID", //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("OTHERSTAT_6_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_6_VALUE", //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("OTHERSTAT_7_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_7_ID", //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("OTHERSTAT_7_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_7_VALUE", //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("OTHERSTAT_8_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_8_ID", //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("OTHERSTAT_8_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_8_VALUE", //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("OTHERSTAT_9_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_9_ID", //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("OTHERSTAT_9_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_9_VALUE", //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("OTHERSTAT_10_ID", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_10_ID", //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("OTHERSTAT_10_VALUE", // 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 + ADD_COLUMN_SCHEMA("OTHERSTAT_10_VALUE", //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("THREAD_ID", // 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 + ADD_COLUMN_SCHEMA("THREAD_ID", //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("PLAN_OPERATION", // 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 - OB_MAX_OPERATOR_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PLAN_OPERATION", //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 + OB_MAX_OPERATOR_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STARTS", // 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 + ADD_COLUMN_SCHEMA("STARTS", //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("OUTPUT_ROWS", // 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 + ADD_COLUMN_SCHEMA("OUTPUT_ROWS", //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("PLAN_LINE_ID", // 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 + ADD_COLUMN_SCHEMA("PLAN_LINE_ID", //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("PLAN_DEPTH", // 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 + ADD_COLUMN_SCHEMA("PLAN_DEPTH", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -597,23 +599,20 @@ int ObInnerTableSchema::all_virtual_sql_plan_monitor_ora_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sql_plan_monitor_ora_all_virtual_sql_plan_monitor_i1_schema( - ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_plan_monitor_ora_all_virtual_sql_plan_monitor_i1_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); - table_schema.set_table_id( - combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TID)); + table_schema.set_table_id(combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TID)); table_schema.set_rowkey_split_pos(0); table_schema.set_is_use_bloomfilter(false); table_schema.set_progressive_merge_num(0); @@ -653,63 +652,63 @@ int ObInnerTableSchema::all_virtual_sql_plan_monitor_ora_all_virtual_sql_plan_mo table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - column_id + 3, // column_id - 1, // rowkey_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + column_id + 3, //column_id + 1, //rowkey_id + 1, //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("REQUEST_ID", // column_name - column_id + 4, // column_id - 2, // rowkey_id - 2, // 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 + ADD_COLUMN_SCHEMA("REQUEST_ID", //column_name + column_id + 4, //column_id + 2, //rowkey_id + 2, //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("SVR_IP", // column_name - column_id + 1, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + column_id + 1, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - column_id + 2, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + column_id + 2, //column_id + 4, //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_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -719,12 +718,12 @@ int ObInnerTableSchema::all_virtual_sql_plan_monitor_ora_all_virtual_sql_plan_mo return ret; } -int ObInnerTableSchema::all_virtual_sql_monitor_statname_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sql_monitor_statname_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -755,63 +754,63 @@ int ObInnerTableSchema::all_virtual_sql_monitor_statname_ora_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ID", // 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 + ADD_COLUMN_SCHEMA("ID", //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("GROUP_ID", // 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 + ADD_COLUMN_SCHEMA("GROUP_ID", //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("NAME", // 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 - 40, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NAME", //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 + 40, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DESCRIPTION", // 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 - 200, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DESCRIPTION", //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 + 200, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -821,17 +820,16 @@ int ObInnerTableSchema::all_virtual_sql_monitor_statname_ora_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_lock_wait_stat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_lock_wait_stat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -862,243 +860,243 @@ int ObInnerTableSchema::all_virtual_lock_wait_stat_ora_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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("TABLE_ID", // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //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("ROWKEY", // 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 - 512, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROWKEY", //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 + 512, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ADDR", // 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 + ADD_COLUMN_SCHEMA("ADDR", //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("NEED_WAIT", // 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 + ADD_COLUMN_SCHEMA("NEED_WAIT", //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("RECV_TS", // 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 + ADD_COLUMN_SCHEMA("RECV_TS", //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("LOCK_TS", // 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 + ADD_COLUMN_SCHEMA("LOCK_TS", //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("ABS_TIMEOUT", // 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 + ADD_COLUMN_SCHEMA("ABS_TIMEOUT", //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("TRY_LOCK_TIMES", // 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 + ADD_COLUMN_SCHEMA("TRY_LOCK_TIMES", //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("TIME_AFTER_RECV", // 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 + ADD_COLUMN_SCHEMA("TIME_AFTER_RECV", //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("SESSION_ID", // 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 + ADD_COLUMN_SCHEMA("SESSION_ID", //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("BLOCK_SESSION_ID", // 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 + ADD_COLUMN_SCHEMA("BLOCK_SESSION_ID", //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("TYPE", // 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 + ADD_COLUMN_SCHEMA("TYPE", //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("LOCK_MODE", // 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 + ADD_COLUMN_SCHEMA("LOCK_MODE", //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("TOTAL_UPDATE_CNT", // 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 + ADD_COLUMN_SCHEMA("TOTAL_UPDATE_CNT", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -1116,17 +1114,16 @@ int ObInnerTableSchema::all_virtual_lock_wait_stat_ora_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_open_cursor_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_open_cursor_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1157,183 +1154,183 @@ int ObInnerTableSchema::all_virtual_open_cursor_ora_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("SVR_IP", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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("SADDR", // 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 - 8, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SADDR", //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 + 8, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SID", // 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 + ADD_COLUMN_SCHEMA("SID", //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("USER_NAME", // 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 - 30, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USER_NAME", //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 + 30, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ADDRESS", // 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 - 8, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ADDRESS", //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 + 8, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("HASH_VALUE", // 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 + ADD_COLUMN_SCHEMA("HASH_VALUE", //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("SQL_ID", // 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 - OB_MAX_SQL_ID_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_ID", //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 + OB_MAX_SQL_ID_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_TEXT", // 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 - 60, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_TEXT", //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 + 60, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LAST_SQL_ACTIVE_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LAST_SQL_ACTIVE_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_EXEC_ID", // 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 + ADD_COLUMN_SCHEMA("SQL_EXEC_ID", //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)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -1351,17 +1348,16 @@ int ObInnerTableSchema::all_virtual_open_cursor_ora_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_constraint_column_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_constraint_column_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1392,108 +1388,108 @@ int ObInnerTableSchema::all_virtual_constraint_column_agent_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("CONSTRAINT_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("CONSTRAINT_ID", //column_name + ++column_id, //column_id + 3, //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("COLUMN_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("COLUMN_ID", //column_name + ++column_id, //column_id + 4, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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(FLAT_ROW_STORE); @@ -1503,17 +1499,16 @@ int ObInnerTableSchema::all_virtual_constraint_column_agent_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_dependency_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_dependency_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1544,243 +1539,243 @@ int ObInnerTableSchema::all_virtual_dependency_agent_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("DEP_OBJ_TYPE", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("DEP_OBJ_TYPE", //column_name + ++column_id, //column_id + 2, //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("DEP_OBJ_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("DEP_OBJ_ID", //column_name + ++column_id, //column_id + 3, //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("DEP_ORDER", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("DEP_ORDER", //column_name + ++column_id, //column_id + 4, //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("DEP_TIMESTAMP", // 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 + ADD_COLUMN_SCHEMA("DEP_TIMESTAMP", //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("REF_OBJ_TYPE", // 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 + ADD_COLUMN_SCHEMA("REF_OBJ_TYPE", //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("REF_OBJ_ID", // 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 + ADD_COLUMN_SCHEMA("REF_OBJ_ID", //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("REF_TIMESTAMP", // 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 + ADD_COLUMN_SCHEMA("REF_TIMESTAMP", //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("DEP_OBJ_OWNER_ID", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DEP_OBJ_OWNER_ID", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROPERTY", // 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 + ADD_COLUMN_SCHEMA("PROPERTY", //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("DEP_ATTRS", // 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_ORACLE_RAW_SQL_COL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DEP_ATTRS", //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_ORACLE_RAW_SQL_COL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DEP_REASON", // 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_ORACLE_RAW_SQL_COL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DEP_REASON", //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_ORACLE_RAW_SQL_COL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REF_OBJ_NAME", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REF_OBJ_NAME", //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 + OB_MAX_TABLE_NAME_LENGTH, //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(FLAT_ROW_STORE); @@ -1790,17 +1785,16 @@ int ObInnerTableSchema::all_virtual_dependency_agent_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_time_zone_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_time_zone_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1831,63 +1825,63 @@ int ObInnerTableSchema::all_virtual_tenant_time_zone_agent_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TIME_ZONE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TIME_ZONE_ID", //column_name + ++column_id, //column_id + 2, //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("USE_LEAP_SECONDS", // 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 - 8, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USE_LEAP_SECONDS", //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 + 8, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VERSION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VERSION", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1897,17 +1891,16 @@ int ObInnerTableSchema::all_virtual_tenant_time_zone_agent_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_time_zone_name_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_time_zone_name_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1938,63 +1931,63 @@ int ObInnerTableSchema::all_virtual_tenant_time_zone_name_agent_schema(ObTableSc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("NAME", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - 64, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NAME", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + 64, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TIME_ZONE_ID", // 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 + ADD_COLUMN_SCHEMA("TIME_ZONE_ID", //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("VERSION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VERSION", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2004,17 +1997,16 @@ int ObInnerTableSchema::all_virtual_tenant_time_zone_name_agent_schema(ObTableSc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_time_zone_transition_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_time_zone_transition_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2045,78 +2037,78 @@ int ObInnerTableSchema::all_virtual_tenant_time_zone_transition_agent_schema(ObT table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TIME_ZONE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TIME_ZONE_ID", //column_name + ++column_id, //column_id + 2, //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("TRANSITION_TIME", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("TRANSITION_TIME", //column_name + ++column_id, //column_id + 3, //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("TRANSITION_TYPE_ID", // 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 + ADD_COLUMN_SCHEMA("TRANSITION_TYPE_ID", //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("VERSION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VERSION", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2126,17 +2118,16 @@ int ObInnerTableSchema::all_virtual_tenant_time_zone_transition_agent_schema(ObT table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_time_zone_transition_type_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_time_zone_transition_type_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2167,108 +2158,108 @@ int ObInnerTableSchema::all_virtual_tenant_time_zone_transition_type_agent_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TIME_ZONE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TIME_ZONE_ID", //column_name + ++column_id, //column_id + 2, //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("TRANSITION_TYPE_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("TRANSITION_TYPE_ID", //column_name + ++column_id, //column_id + 3, //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("OFFSET", // 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 + ADD_COLUMN_SCHEMA("OFFSET", //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("IS_DST", // 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 + ADD_COLUMN_SCHEMA("IS_DST", //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("ABBREVIATION", // 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 - 8, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ABBREVIATION", //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 + 8, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VERSION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VERSION", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2278,17 +2269,16 @@ int ObInnerTableSchema::all_virtual_tenant_time_zone_transition_type_agent_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tenant_virtual_object_definition_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tenant_virtual_object_definition_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2319,198 +2309,198 @@ int ObInnerTableSchema::tenant_virtual_object_definition_ora_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OBJECT_TYPE", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("OBJECT_TYPE", //column_name + ++column_id, //column_id + 1, //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("OBJECT_NAME", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_ORIGINAL_NANE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OBJECT_NAME", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_ORIGINAL_NANE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SCHEMA", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VERSION", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - 10, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VERSION", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + 10, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MODEL", // column_name - ++column_id, // column_id - 5, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MODEL", //column_name + ++column_id, //column_id + 5, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TRANSFORM", // column_name - ++column_id, // column_id - 6, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - 8, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TRANSFORM", //column_name + ++column_id, //column_id + 6, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + 8, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DEFINITION", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DEFINITION", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CREATE_DATABASE_WITH_IF_NOT_EXISTS", // 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 - DATABASE_DEFINE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CREATE_DATABASE_WITH_IF_NOT_EXISTS", //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 + DATABASE_DEFINE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHARACTER_SET_CLIENT", // 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 - MAX_CHARSET_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CHARACTER_SET_CLIENT", //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 + MAX_CHARSET_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COLLATION_CONNECTION", // 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 - MAX_CHARSET_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLLATION_CONNECTION", //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 + MAX_CHARSET_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROC_TYPE", // 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 + ADD_COLUMN_SCHEMA("PROC_TYPE", //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("COLLATION_DATABASE", // 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 - MAX_CHARSET_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLLATION_DATABASE", //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 + MAX_CHARSET_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_MODE", // 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 - MAX_CHARSET_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_MODE", //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 + MAX_CHARSET_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_HASH); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2520,17 +2510,16 @@ int ObInnerTableSchema::tenant_virtual_object_definition_ora_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_routine_param_sys_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_routine_param_sys_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2561,348 +2550,348 @@ int ObInnerTableSchema::all_virtual_routine_param_sys_agent_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("ROUTINE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("ROUTINE_ID", //column_name + ++column_id, //column_id + 2, //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("SEQUENCE", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SEQUENCE", //column_name + ++column_id, //column_id + 3, //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("SUBPROGRAM_ID", // 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 + ADD_COLUMN_SCHEMA("SUBPROGRAM_ID", //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("PARAM_POSITION", // 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 + ADD_COLUMN_SCHEMA("PARAM_POSITION", //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("PARAM_LEVEL", // 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 + ADD_COLUMN_SCHEMA("PARAM_LEVEL", //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("PARAM_NAME", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARAM_NAME", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("PARAM_TYPE", // 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 + ADD_COLUMN_SCHEMA("PARAM_TYPE", //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("PARAM_LENGTH", // 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 + ADD_COLUMN_SCHEMA("PARAM_LENGTH", //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("PARAM_PRECISION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARAM_PRECISION", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARAM_SCALE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARAM_SCALE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARAM_ZERO_FILL", // 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 + ADD_COLUMN_SCHEMA("PARAM_ZERO_FILL", //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("PARAM_CHARSET", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARAM_CHARSET", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARAM_COLL_TYPE", // 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 + ADD_COLUMN_SCHEMA("PARAM_COLL_TYPE", //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("FLAG", // 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 + ADD_COLUMN_SCHEMA("FLAG", //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("DEFAULT_VALUE", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DEFAULT_VALUE", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TYPE_OWNER", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TYPE_OWNER", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TYPE_NAME", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TYPE_NAME", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TYPE_SUBNAME", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TYPE_SUBNAME", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXTENDED_TYPE_INFO", // 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_VARBINARY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXTENDED_TYPE_INFO", //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_VARBINARY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2912,17 +2901,16 @@ int ObInnerTableSchema::all_virtual_routine_param_sys_agent_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_type_sys_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_type_sys_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2953,318 +2941,318 @@ int ObInnerTableSchema::all_virtual_type_sys_agent_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TYPE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TYPE_ID", //column_name + ++column_id, //column_id + 2, //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("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("TYPECODE", // 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 + ADD_COLUMN_SCHEMA("TYPECODE", //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("PROPERTIES", // 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 + ADD_COLUMN_SCHEMA("PROPERTIES", //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("ATTRIBUTES", // 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 + ADD_COLUMN_SCHEMA("ATTRIBUTES", //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("METHODS", // 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 + ADD_COLUMN_SCHEMA("METHODS", //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("HIDDENMETHODS", // 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 + ADD_COLUMN_SCHEMA("HIDDENMETHODS", //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("SUPERTYPES", // 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 + ADD_COLUMN_SCHEMA("SUPERTYPES", //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("SUBTYPES", // 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 + ADD_COLUMN_SCHEMA("SUBTYPES", //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("EXTERNTYPE", // 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 + ADD_COLUMN_SCHEMA("EXTERNTYPE", //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("EXTERNNAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXTERNNAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("HELPERCLASSNAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HELPERCLASSNAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LOCAL_ATTRS", // 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 + ADD_COLUMN_SCHEMA("LOCAL_ATTRS", //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("LOCAL_METHODS", // 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 + ADD_COLUMN_SCHEMA("LOCAL_METHODS", //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("SUPERTYPEID", // 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 + ADD_COLUMN_SCHEMA("SUPERTYPEID", //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("TYPE_NAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TYPE_NAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PACKAGE_ID", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_ID", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3274,17 +3262,16 @@ int ObInnerTableSchema::all_virtual_type_sys_agent_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_type_attr_sys_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_type_attr_sys_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -3315,303 +3302,303 @@ int ObInnerTableSchema::all_virtual_type_attr_sys_agent_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TYPE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TYPE_ID", //column_name + ++column_id, //column_id + 2, //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("ATTRIBUTE", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("ATTRIBUTE", //column_name + ++column_id, //column_id + 3, //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("TYPE_ATTR_ID", // 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 + ADD_COLUMN_SCHEMA("TYPE_ATTR_ID", //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("NAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROPERTIES", // 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 + ADD_COLUMN_SCHEMA("PROPERTIES", //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("CHARSET_ID", // 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 + ADD_COLUMN_SCHEMA("CHARSET_ID", //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("CHARSET_FORM", // 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 + ADD_COLUMN_SCHEMA("CHARSET_FORM", //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("LENGTH", // 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 + ADD_COLUMN_SCHEMA("LENGTH", //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("NUMBER_PRECISION", // 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 + ADD_COLUMN_SCHEMA("NUMBER_PRECISION", //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("SCALE", // 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 + ADD_COLUMN_SCHEMA("SCALE", //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("ZERO_FILL", // 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 + ADD_COLUMN_SCHEMA("ZERO_FILL", //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("COLL_TYPE", // 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 + ADD_COLUMN_SCHEMA("COLL_TYPE", //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("EXTERNNAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXTERNNAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("XFLAGS", // 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 + ADD_COLUMN_SCHEMA("XFLAGS", //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("SETTER", // 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 + ADD_COLUMN_SCHEMA("SETTER", //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("GETTER", // 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 + ADD_COLUMN_SCHEMA("GETTER", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3621,17 +3608,16 @@ int ObInnerTableSchema::all_virtual_type_attr_sys_agent_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_coll_type_sys_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_coll_type_sys_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -3662,273 +3648,273 @@ int ObInnerTableSchema::all_virtual_coll_type_sys_agent_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("COLL_TYPE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("COLL_TYPE_ID", //column_name + ++column_id, //column_id + 2, //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("ELEM_TYPE_ID", // 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 + ADD_COLUMN_SCHEMA("ELEM_TYPE_ID", //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("ELEM_SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("ELEM_SCHEMA_VERSION", //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("PROPERTIES", // 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 + ADD_COLUMN_SCHEMA("PROPERTIES", //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("CHARSET_ID", // 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 + ADD_COLUMN_SCHEMA("CHARSET_ID", //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("CHARSET_FORM", // 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 + ADD_COLUMN_SCHEMA("CHARSET_FORM", //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("LENGTH", // 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 + ADD_COLUMN_SCHEMA("LENGTH", //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("NUMBER_PRECISION", // 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 + ADD_COLUMN_SCHEMA("NUMBER_PRECISION", //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("SCALE", // 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 + ADD_COLUMN_SCHEMA("SCALE", //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("ZERO_FILL", // 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 + ADD_COLUMN_SCHEMA("ZERO_FILL", //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("COLL_TYPE", // 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 + ADD_COLUMN_SCHEMA("COLL_TYPE", //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("UPPER_BOUND", // 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 + ADD_COLUMN_SCHEMA("UPPER_BOUND", //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("PACKAGE_ID", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_ID", //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("COLL_NAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLL_NAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3938,17 +3924,16 @@ int ObInnerTableSchema::all_virtual_coll_type_sys_agent_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_package_sys_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_package_sys_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -3979,228 +3964,228 @@ int ObInnerTableSchema::all_virtual_package_sys_agent_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("PACKAGE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("PACKAGE_ID", //column_name + ++column_id, //column_id + 2, //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("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("PACKAGE_NAME", // 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 - OB_MAX_PACKAGE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PACKAGE_NAME", //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 + OB_MAX_PACKAGE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("TYPE", // 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 + ADD_COLUMN_SCHEMA("TYPE", //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("FLAG", // 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 + ADD_COLUMN_SCHEMA("FLAG", //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("OWNER_ID", // 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 + ADD_COLUMN_SCHEMA("OWNER_ID", //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("COMP_FLAG", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMP_FLAG", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXEC_ENV", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXEC_ENV", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SOURCE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SOURCE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROUTE_SQL", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROUTE_SQL", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4210,17 +4195,16 @@ int ObInnerTableSchema::all_virtual_package_sys_agent_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_trigger_sys_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_trigger_sys_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -4251,393 +4235,393 @@ int ObInnerTableSchema::all_virtual_tenant_trigger_sys_agent_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TRIGGER_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TRIGGER_ID", //column_name + ++column_id, //column_id + 2, //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("TRIGGER_NAME", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TRIGGER_NAME", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("OWNER_ID", // 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 + ADD_COLUMN_SCHEMA("OWNER_ID", //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("TRIGGER_TYPE", // 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 + ADD_COLUMN_SCHEMA("TRIGGER_TYPE", //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("TRIGGER_EVENTS", // 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 + ADD_COLUMN_SCHEMA("TRIGGER_EVENTS", //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("TIMING_POINTS", // 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 + ADD_COLUMN_SCHEMA("TIMING_POINTS", //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("BASE_OBJECT_TYPE", // 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 + ADD_COLUMN_SCHEMA("BASE_OBJECT_TYPE", //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("BASE_OBJECT_ID", // 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 + ADD_COLUMN_SCHEMA("BASE_OBJECT_ID", //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("TRIGGER_FLAGS", // 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 + ADD_COLUMN_SCHEMA("TRIGGER_FLAGS", //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("UPDATE_COLUMNS", // 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 - OB_MAX_UPDATE_COLUMNS_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("UPDATE_COLUMNS", //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 + OB_MAX_UPDATE_COLUMNS_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REF_OLD_NAME", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REF_OLD_NAME", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REF_NEW_NAME", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REF_NEW_NAME", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REF_PARENT_NAME", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REF_PARENT_NAME", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("WHEN_CONDITION", // 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 - OB_MAX_WHEN_CONDITION_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("WHEN_CONDITION", //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 + OB_MAX_WHEN_CONDITION_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TRIGGER_BODY", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TRIGGER_BODY", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PACKAGE_SPEC_SOURCE", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PACKAGE_SPEC_SOURCE", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PACKAGE_BODY_SOURCE", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PACKAGE_BODY_SOURCE", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PACKAGE_FLAG", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_FLAG", //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("PACKAGE_COMP_FLAG", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_COMP_FLAG", //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("PACKAGE_EXEC_ENV", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PACKAGE_EXEC_ENV", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_MODE", // 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 + ADD_COLUMN_SCHEMA("SQL_MODE", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4647,17 +4631,16 @@ int ObInnerTableSchema::all_virtual_tenant_trigger_sys_agent_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_routine_sys_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_routine_sys_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -4688,288 +4671,288 @@ int ObInnerTableSchema::all_virtual_routine_sys_agent_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("ROUTINE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("ROUTINE_ID", //column_name + ++column_id, //column_id + 2, //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("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("PACKAGE_ID", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_ID", //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("ROUTINE_NAME", // 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 - OB_MAX_ROUTINE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROUTINE_NAME", //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 + OB_MAX_ROUTINE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OVERLOAD", // 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 + ADD_COLUMN_SCHEMA("OVERLOAD", //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("SUBPROGRAM_ID", // 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 + ADD_COLUMN_SCHEMA("SUBPROGRAM_ID", //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("ROUTINE_TYPE", // 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 + ADD_COLUMN_SCHEMA("ROUTINE_TYPE", //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("FLAG", // 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 + ADD_COLUMN_SCHEMA("FLAG", //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("OWNER_ID", // 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 + ADD_COLUMN_SCHEMA("OWNER_ID", //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("PRIV_USER", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PRIV_USER", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMP_FLAG", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMP_FLAG", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXEC_ENV", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXEC_ENV", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROUTINE_BODY", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROUTINE_BODY", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROUTE_SQL", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROUTE_SQL", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4979,17 +4962,16 @@ int ObInnerTableSchema::all_virtual_routine_sys_agent_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_global_transaction_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_global_transaction_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -5020,183 +5002,183 @@ int ObInnerTableSchema::all_virtual_tenant_global_transaction_agent_schema(ObTab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GTRID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_BINARY, // column_collation_type - 128, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GTRID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_BINARY, //column_collation_type + 128, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BQUAL", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_BINARY, // column_collation_type - 128, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("BQUAL", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_BINARY, //column_collation_type + 128, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("FORMAT_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("FORMAT_ID", //column_name + ++column_id, //column_id + 3, //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("TRANS_ID", // 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 - 512, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TRANS_ID", //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 + 512, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COORDINATOR", // 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 + ADD_COLUMN_SCHEMA("COORDINATOR", //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("SCHEDULER_IP", // 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 - OB_MAX_SERVER_ADDR_SIZE, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SCHEDULER_IP", //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 + OB_MAX_SERVER_ADDR_SIZE, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEDULER_PORT", // 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 + ADD_COLUMN_SCHEMA("SCHEDULER_PORT", //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("IS_READONLY", // 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 + ADD_COLUMN_SCHEMA("IS_READONLY", //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("STATE", // 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 + ADD_COLUMN_SCHEMA("STATE", //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("END_FLAG", // 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 + ADD_COLUMN_SCHEMA("END_FLAG", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5206,17 +5188,16 @@ int ObInnerTableSchema::all_virtual_tenant_global_transaction_agent_schema(ObTab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_acquired_snapshot_agent_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_acquired_snapshot_agent_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -5247,108 +5228,108 @@ int ObInnerTableSchema::all_virtual_acquired_snapshot_agent_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SNAPSHOT_TYPE", // 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 + ADD_COLUMN_SCHEMA("SNAPSHOT_TYPE", //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("SNAPSHOT_TS", // 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 + ADD_COLUMN_SCHEMA("SNAPSHOT_TS", //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("SCHEMA_VERSION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TENANT_ID", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLE_ID", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TABLE_ID", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXTRA_INFO", // 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 - MAX_ROOTSERVICE_EVENT_EXTRA_INFO_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXTRA_INFO", //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 + MAX_ROOTSERVICE_EVENT_EXTRA_INFO_LENGTH, //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(FLAT_ROW_STORE); @@ -5358,17 +5339,16 @@ int ObInnerTableSchema::all_virtual_acquired_snapshot_agent_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_table_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_table_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -5399,1098 +5379,1098 @@ int ObInnerTableSchema::all_virtual_table_real_agent_ora_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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("TABLE_NAME", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATABASE_ID", // 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("TABLE_TYPE", // 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("LOAD_TYPE", // 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("DEF_TYPE", // 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("ROWKEY_COLUMN_NUM", // 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("INDEX_COLUMN_NUM", // 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_USED_COLUMN_ID", // 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("REPLICA_NUM", // 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("AUTOINC_COLUMN_ID", // 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("AUTO_INCREMENT", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("READ_ONLY", // 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("ROWKEY_SPLIT_POS", // 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("COMPRESS_FUNC_NAME", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXPIRE_CONDITION", // 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 - OB_MAX_EXPIRE_INFO_STRING_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IS_USE_BLOOMFILTER", // 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("COMMENT", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BLOCK_SIZE", // 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("COLLATION_TYPE", // 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("DATA_TABLE_ID", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INDEX_STATUS", // 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("TABLEGROUP_ID", // 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("PROGRESSIVE_MERGE_NUM", // 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("INDEX_TYPE", // 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("PART_LEVEL", // 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("PART_FUNC_TYPE", // 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("PART_FUNC_EXPR", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PART_NUM", // 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("SUB_PART_FUNC_TYPE", // 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("SUB_PART_FUNC_EXPR", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUB_PART_NUM", // 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("CREATE_MEM_VERSION", // 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("SCHEMA_VERSION", // 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("VIEW_DEFINITION", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VIEW_CHECK_OPTION", // 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("VIEW_IS_UPDATABLE", // 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("ZONE_LIST", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIMARY_ZONE", // 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 - MAX_ZONE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INDEX_USING_TYPE", // 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("PARSER_NAME", // 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 - OB_MAX_PARSER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INDEX_ATTRIBUTES_SET", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LOCALITY", // 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 - MAX_LOCALITY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLET_SIZE", // 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("PCTFREE", // 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("PREVIOUS_LOCALITY", // 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 - MAX_LOCALITY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAX_USED_PART_ID", // 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("PARTITION_CNT_WITHIN_PARTITION_TABLE", // 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("PARTITION_STATUS", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARTITION_SCHEMA_VERSION", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAX_USED_CONSTRAINT_ID", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SESSION_ID", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PK_COMMENT", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SESS_ACTIVE_TIME", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROW_STORE_TYPE", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STORE_FORMAT", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DUPLICATE_SCOPE", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BINDING", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROGRESSIVE_MERGE_ROUND", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STORAGE_FORMAT_VERSION", // 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 - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLE_MODE", // 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("ENCRYPTION", // 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 - OB_MAX_ENCRYPTION_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLESPACE_ID", // 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("DROP_SCHEMA_VERSION", // 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("IS_SUB_PART_TEMPLATE", // 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("DOP", // 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("CHARACTER_SET_CLIENT", // 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("COLLATION_CONNECTION", // 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("AUTO_PART_SIZE", // 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("AUTO_PART", // 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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement - } - - if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("TABLE_NAME", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("TABLE_TYPE", //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("LOAD_TYPE", //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("DEF_TYPE", //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("ROWKEY_COLUMN_NUM", //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("INDEX_COLUMN_NUM", //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_USED_COLUMN_ID", //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("REPLICA_NUM", //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("AUTOINC_COLUMN_ID", //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("AUTO_INCREMENT", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("READ_ONLY", //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("ROWKEY_SPLIT_POS", //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("COMPRESS_FUNC_NAME", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("EXPIRE_CONDITION", //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 + OB_MAX_EXPIRE_INFO_STRING_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("IS_USE_BLOOMFILTER", //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("COMMENT", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("BLOCK_SIZE", //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("COLLATION_TYPE", //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("DATA_TABLE_ID", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("INDEX_STATUS", //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("TABLEGROUP_ID", //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("PROGRESSIVE_MERGE_NUM", //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("INDEX_TYPE", //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("PART_LEVEL", //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("PART_FUNC_TYPE", //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("PART_FUNC_EXPR", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PART_NUM", //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("SUB_PART_FUNC_TYPE", //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("SUB_PART_FUNC_EXPR", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("SUB_PART_NUM", //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("CREATE_MEM_VERSION", //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("SCHEMA_VERSION", //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("VIEW_DEFINITION", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("VIEW_CHECK_OPTION", //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("VIEW_IS_UPDATABLE", //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("ZONE_LIST", //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 + MAX_ZONE_LIST_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PRIMARY_ZONE", //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 + MAX_ZONE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("INDEX_USING_TYPE", //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("PARSER_NAME", //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 + OB_MAX_PARSER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("INDEX_ATTRIBUTES_SET", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("LOCALITY", //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 + MAX_LOCALITY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("TABLET_SIZE", //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("PCTFREE", //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("PREVIOUS_LOCALITY", //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 + MAX_LOCALITY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("MAX_USED_PART_ID", //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("PARTITION_CNT_WITHIN_PARTITION_TABLE", //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("PARTITION_STATUS", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PARTITION_SCHEMA_VERSION", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("MAX_USED_CONSTRAINT_ID", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("SESSION_ID", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PK_COMMENT", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("SESS_ACTIVE_TIME", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("ROW_STORE_TYPE", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("STORE_FORMAT", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("DUPLICATE_SCOPE", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("BINDING", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("PROGRESSIVE_MERGE_ROUND", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("STORAGE_FORMAT_VERSION", //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 + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("TABLE_MODE", //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("ENCRYPTION", //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 + OB_MAX_ENCRYPTION_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("TABLESPACE_ID", //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("DROP_SCHEMA_VERSION", //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("IS_SUB_PART_TEMPLATE", //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("DOP", //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("CHARACTER_SET_CLIENT", //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("COLLATION_CONNECTION", //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("AUTO_PART_SIZE", //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("AUTO_PART", //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("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement + } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6500,17 +6480,16 @@ int ObInnerTableSchema::all_virtual_table_real_agent_ora_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_column_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_column_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -6541,438 +6520,438 @@ int ObInnerTableSchema::all_virtual_column_real_agent_ora_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("COLUMN_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("COLUMN_ID", //column_name + ++column_id, //column_id + 3, //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("COLUMN_NAME", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLUMN_NAME", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROWKEY_POSITION", // 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 + ADD_COLUMN_SCHEMA("ROWKEY_POSITION", //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("INDEX_POSITION", // 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 + ADD_COLUMN_SCHEMA("INDEX_POSITION", //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("ORDER_IN_ROWKEY", // 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 + ADD_COLUMN_SCHEMA("ORDER_IN_ROWKEY", //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("PARTITION_KEY_POSITION", // 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 + ADD_COLUMN_SCHEMA("PARTITION_KEY_POSITION", //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("DATA_TYPE", // 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 + ADD_COLUMN_SCHEMA("DATA_TYPE", //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("DATA_LENGTH", // 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 + ADD_COLUMN_SCHEMA("DATA_LENGTH", //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("DATA_PRECISION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DATA_PRECISION", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATA_SCALE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DATA_SCALE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ZERO_FILL", // 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 + ADD_COLUMN_SCHEMA("ZERO_FILL", //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("NULLABLE", // 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 + ADD_COLUMN_SCHEMA("NULLABLE", //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("ON_UPDATE_CURRENT_TIMESTAMP", // 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 + ADD_COLUMN_SCHEMA("ON_UPDATE_CURRENT_TIMESTAMP", //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("AUTOINCREMENT", // 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 + ADD_COLUMN_SCHEMA("AUTOINCREMENT", //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("IS_HIDDEN", // 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 + ADD_COLUMN_SCHEMA("IS_HIDDEN", //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("COLLATION_TYPE", // 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 + ADD_COLUMN_SCHEMA("COLLATION_TYPE", //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("ORIG_DEFAULT_VALUE", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ORIG_DEFAULT_VALUE", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CUR_DEFAULT_VALUE", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CUR_DEFAULT_VALUE", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("COLUMN_FLAGS", // 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 + ADD_COLUMN_SCHEMA("COLUMN_FLAGS", //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("PREV_COLUMN_ID", // 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 + ADD_COLUMN_SCHEMA("PREV_COLUMN_ID", //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("EXTENDED_TYPE_INFO", // 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_VARBINARY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXTENDED_TYPE_INFO", //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_VARBINARY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ORIG_DEFAULT_VALUE_V2", // 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_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ORIG_DEFAULT_VALUE_V2", //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_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CUR_DEFAULT_VALUE_V2", // 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_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CUR_DEFAULT_VALUE_V2", //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_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6982,17 +6961,16 @@ int ObInnerTableSchema::all_virtual_column_real_agent_ora_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_database_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_database_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -7023,213 +7001,213 @@ int ObInnerTableSchema::all_virtual_database_real_agent_ora_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("DATABASE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //column_name + ++column_id, //column_id + 2, //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("DATABASE_NAME", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DATABASE_NAME", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REPLICA_NUM", // 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 + ADD_COLUMN_SCHEMA("REPLICA_NUM", //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("ZONE_LIST", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ZONE_LIST", //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 + MAX_ZONE_LIST_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIMARY_ZONE", // 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 - MAX_ZONE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PRIMARY_ZONE", //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 + MAX_ZONE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COLLATION_TYPE", // 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 + ADD_COLUMN_SCHEMA("COLLATION_TYPE", //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("COMMENT", // 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 - MAX_DATABASE_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + MAX_DATABASE_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("READ_ONLY", // 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 + ADD_COLUMN_SCHEMA("READ_ONLY", //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("DEFAULT_TABLEGROUP_ID", // 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 + ADD_COLUMN_SCHEMA("DEFAULT_TABLEGROUP_ID", //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("IN_RECYCLEBIN", // 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 + ADD_COLUMN_SCHEMA("IN_RECYCLEBIN", //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("DROP_SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("DROP_SCHEMA_VERSION", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -7239,17 +7217,16 @@ int ObInnerTableSchema::all_virtual_database_real_agent_ora_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sequence_v2_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sequence_v2_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -7280,123 +7257,123 @@ int ObInnerTableSchema::all_virtual_sequence_v2_real_agent_ora_schema(ObTableSch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SEQUENCE_KEY", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("SEQUENCE_KEY", //column_name + ++column_id, //column_id + 1, //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("COLUMN_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("COLUMN_ID", //column_name + ++column_id, //column_id + 2, //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("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("SEQUENCE_NAME", // 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 - OB_MAX_SEQUENCE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SEQUENCE_NAME", //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 + OB_MAX_SEQUENCE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SEQUENCE_VALUE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SEQUENCE_VALUE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SYNC_VALUE", // 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 + ADD_COLUMN_SCHEMA("SYNC_VALUE", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -7406,17 +7383,16 @@ int ObInnerTableSchema::all_virtual_sequence_v2_real_agent_ora_schema(ObTableSch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_part_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_part_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -7447,498 +7423,498 @@ int ObInnerTableSchema::all_virtual_part_real_agent_ora_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("PART_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PART_ID", //column_name + ++column_id, //column_id + 3, //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("PART_NAME", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PART_NAME", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("HIGH_BOUND_VAL", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HIGH_BOUND_VAL", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("B_HIGH_BOUND_VAL", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("B_HIGH_BOUND_VAL", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUB_PART_NUM", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUB_PART_NUM", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUB_PART_SPACE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUB_PART_SPACE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NEW_SUB_PART_NUM", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NEW_SUB_PART_NUM", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NEW_SUB_PART_SPACE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NEW_SUB_PART_SPACE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUB_PART_INTERVAL", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUB_PART_INTERVAL", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUB_INTERVAL_START", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUB_INTERVAL_START", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NEW_SUB_PART_INTERVAL", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NEW_SUB_PART_INTERVAL", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NEW_SUB_INTERVAL_START", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NEW_SUB_INTERVAL_START", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BLOCK_SIZE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("BLOCK_SIZE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REPLICA_NUM", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REPLICA_NUM", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMPRESS_FUNC_NAME", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMPRESS_FUNC_NAME", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STATUS", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("STATUS", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LIST_VAL", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LIST_VAL", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("B_LIST_VAL", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("B_LIST_VAL", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PART_IDX", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PART_IDX", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SOURCE_PARTITION_ID", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SOURCE_PARTITION_ID", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAPPING_PG_PART_ID", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MAPPING_PG_PART_ID", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLESPACE_ID", // 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 + ADD_COLUMN_SCHEMA("TABLESPACE_ID", //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("DROP_SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("DROP_SCHEMA_VERSION", //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_USED_SUB_PART_ID", // 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 + ADD_COLUMN_SCHEMA("MAX_USED_SUB_PART_ID", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -7948,17 +7924,16 @@ int ObInnerTableSchema::all_virtual_part_real_agent_ora_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sub_part_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sub_part_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -7989,378 +7964,378 @@ int ObInnerTableSchema::all_virtual_sub_part_real_agent_ora_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("PART_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PART_ID", //column_name + ++column_id, //column_id + 3, //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("SUB_PART_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("SUB_PART_ID", //column_name + ++column_id, //column_id + 4, //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("SUB_PART_NAME", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUB_PART_NAME", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("HIGH_BOUND_VAL", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HIGH_BOUND_VAL", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("B_HIGH_BOUND_VAL", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("B_HIGH_BOUND_VAL", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BLOCK_SIZE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("BLOCK_SIZE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REPLICA_NUM", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REPLICA_NUM", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMPRESS_FUNC_NAME", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMPRESS_FUNC_NAME", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STATUS", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("STATUS", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LIST_VAL", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LIST_VAL", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("B_LIST_VAL", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("B_LIST_VAL", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLESPACE_ID", // 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 + ADD_COLUMN_SCHEMA("TABLESPACE_ID", //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("SUB_PART_IDX", // 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 + ADD_COLUMN_SCHEMA("SUB_PART_IDX", //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("SOURCE_PARTITION_ID", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SOURCE_PARTITION_ID", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAPPING_PG_SUB_PART_ID", // 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 + ADD_COLUMN_SCHEMA("MAPPING_PG_SUB_PART_ID", //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("DROP_SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("DROP_SCHEMA_VERSION", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8370,17 +8345,16 @@ int ObInnerTableSchema::all_virtual_sub_part_real_agent_ora_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_package_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_package_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -8411,228 +8385,228 @@ int ObInnerTableSchema::all_virtual_package_real_agent_ora_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("PACKAGE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("PACKAGE_ID", //column_name + ++column_id, //column_id + 2, //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("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("PACKAGE_NAME", // 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 - OB_MAX_PACKAGE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PACKAGE_NAME", //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 + OB_MAX_PACKAGE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("TYPE", // 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 + ADD_COLUMN_SCHEMA("TYPE", //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("FLAG", // 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 + ADD_COLUMN_SCHEMA("FLAG", //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("OWNER_ID", // 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 + ADD_COLUMN_SCHEMA("OWNER_ID", //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("COMP_FLAG", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMP_FLAG", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXEC_ENV", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXEC_ENV", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SOURCE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SOURCE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROUTE_SQL", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROUTE_SQL", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8642,17 +8616,16 @@ int ObInnerTableSchema::all_virtual_package_real_agent_ora_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sequence_value_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sequence_value_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -8683,63 +8656,63 @@ int ObInnerTableSchema::all_virtual_sequence_value_real_agent_ora_schema(ObTable table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SEQUENCE_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("SEQUENCE_ID", //column_name + ++column_id, //column_id + 1, //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("NEXT_VALUE", // 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 + ADD_COLUMN_SCHEMA("NEXT_VALUE", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8749,17 +8722,16 @@ int ObInnerTableSchema::all_virtual_sequence_value_real_agent_ora_schema(ObTable table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_sequence_object_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_sequence_object_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -8790,213 +8762,213 @@ int ObInnerTableSchema::all_virtual_sequence_object_real_agent_ora_schema(ObTabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("SEQUENCE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("SEQUENCE_ID", //column_name + ++column_id, //column_id + 2, //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("SEQUENCE_NAME", // 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 - OB_MAX_SEQUENCE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SEQUENCE_NAME", //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 + OB_MAX_SEQUENCE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MIN_VALUE", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MIN_VALUE", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAX_VALUE", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MAX_VALUE", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INCREMENT_BY", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("INCREMENT_BY", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("START_WITH", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("START_WITH", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CACHE_SIZE", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CACHE_SIZE", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ORDER_FLAG", // 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 + ADD_COLUMN_SCHEMA("ORDER_FLAG", //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("CYCLE_FLAG", // 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 + ADD_COLUMN_SCHEMA("CYCLE_FLAG", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9006,17 +8978,16 @@ int ObInnerTableSchema::all_virtual_sequence_object_real_agent_ora_schema(ObTabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_user_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_user_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -9047,558 +9018,558 @@ int ObInnerTableSchema::all_virtual_user_real_agent_ora_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("USER_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("USER_ID", //column_name + ++column_id, //column_id + 2, //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("USER_NAME", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USER_NAME", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("HOST", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HOST", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PASSWD", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PASSWD", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("INFO", // 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 - OB_MAX_USER_INFO_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("INFO", //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 + OB_MAX_USER_INFO_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIV_ALTER", // 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 + ADD_COLUMN_SCHEMA("PRIV_ALTER", //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("PRIV_CREATE", // 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 + ADD_COLUMN_SCHEMA("PRIV_CREATE", //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("PRIV_DELETE", // 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 + ADD_COLUMN_SCHEMA("PRIV_DELETE", //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("PRIV_DROP", // 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 + ADD_COLUMN_SCHEMA("PRIV_DROP", //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("PRIV_GRANT_OPTION", // 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 + ADD_COLUMN_SCHEMA("PRIV_GRANT_OPTION", //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("PRIV_INSERT", // 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 + ADD_COLUMN_SCHEMA("PRIV_INSERT", //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("PRIV_UPDATE", // 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 + ADD_COLUMN_SCHEMA("PRIV_UPDATE", //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("PRIV_SELECT", // 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 + ADD_COLUMN_SCHEMA("PRIV_SELECT", //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("PRIV_INDEX", // 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 + ADD_COLUMN_SCHEMA("PRIV_INDEX", //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("PRIV_CREATE_VIEW", // 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 + ADD_COLUMN_SCHEMA("PRIV_CREATE_VIEW", //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("PRIV_SHOW_VIEW", // 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 + ADD_COLUMN_SCHEMA("PRIV_SHOW_VIEW", //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("PRIV_SHOW_DB", // 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 + ADD_COLUMN_SCHEMA("PRIV_SHOW_DB", //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("PRIV_CREATE_USER", // 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 + ADD_COLUMN_SCHEMA("PRIV_CREATE_USER", //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("PRIV_SUPER", // 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 + ADD_COLUMN_SCHEMA("PRIV_SUPER", //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("IS_LOCKED", // 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 + ADD_COLUMN_SCHEMA("IS_LOCKED", //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("PRIV_PROCESS", // 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 + ADD_COLUMN_SCHEMA("PRIV_PROCESS", //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("PRIV_CREATE_SYNONYM", // 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 + ADD_COLUMN_SCHEMA("PRIV_CREATE_SYNONYM", //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("SSL_TYPE", // 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 + ADD_COLUMN_SCHEMA("SSL_TYPE", //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("SSL_CIPHER", // 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 - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SSL_CIPHER", //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 + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("X509_ISSUER", // 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 - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("X509_ISSUER", //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 + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("X509_SUBJECT", // 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 - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("X509_SUBJECT", //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 + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TYPE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TYPE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROFILE_ID", // 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 + ADD_COLUMN_SCHEMA("PROFILE_ID", //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("PASSWORD_LAST_CHANGED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PASSWORD_LAST_CHANGED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIV_FILE", // 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 + ADD_COLUMN_SCHEMA("PRIV_FILE", //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("PRIV_ALTER_TENANT", // 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 + ADD_COLUMN_SCHEMA("PRIV_ALTER_TENANT", //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("PRIV_ALTER_SYSTEM", // 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 + ADD_COLUMN_SCHEMA("PRIV_ALTER_SYSTEM", //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("PRIV_CREATE_RESOURCE_POOL", // 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 + ADD_COLUMN_SCHEMA("PRIV_CREATE_RESOURCE_POOL", //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("PRIV_CREATE_RESOURCE_UNIT", // 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 + ADD_COLUMN_SCHEMA("PRIV_CREATE_RESOURCE_UNIT", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9608,17 +9579,16 @@ int ObInnerTableSchema::all_virtual_user_real_agent_ora_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_synonym_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_synonym_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -9649,138 +9619,138 @@ int ObInnerTableSchema::all_virtual_synonym_real_agent_ora_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("SYNONYM_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("SYNONYM_ID", //column_name + ++column_id, //column_id + 2, //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("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("SYNONYM_NAME", // 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 - OB_MAX_SYNONYM_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SYNONYM_NAME", //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 + OB_MAX_SYNONYM_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OBJECT_NAME", // 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 - OB_MAX_SYNONYM_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OBJECT_NAME", //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 + OB_MAX_SYNONYM_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OBJECT_DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("OBJECT_DATABASE_ID", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9790,17 +9760,16 @@ int ObInnerTableSchema::all_virtual_synonym_real_agent_ora_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_foreign_key_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_foreign_key_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -9831,213 +9800,213 @@ int ObInnerTableSchema::all_virtual_foreign_key_real_agent_ora_schema(ObTableSch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("FOREIGN_KEY_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("FOREIGN_KEY_ID", //column_name + ++column_id, //column_id + 2, //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("FOREIGN_KEY_NAME", // 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 - OB_MAX_CONSTRAINT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("FOREIGN_KEY_NAME", //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 + OB_MAX_CONSTRAINT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHILD_TABLE_ID", // 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 + ADD_COLUMN_SCHEMA("CHILD_TABLE_ID", //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("PARENT_TABLE_ID", // 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 + ADD_COLUMN_SCHEMA("PARENT_TABLE_ID", //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("UPDATE_ACTION", // 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 + ADD_COLUMN_SCHEMA("UPDATE_ACTION", //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("DELETE_ACTION", // 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 + ADD_COLUMN_SCHEMA("DELETE_ACTION", //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("ENABLE_FLAG", // 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 + ADD_COLUMN_SCHEMA("ENABLE_FLAG", //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("REF_CST_TYPE", // 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 + ADD_COLUMN_SCHEMA("REF_CST_TYPE", //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("REF_CST_ID", // 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 + ADD_COLUMN_SCHEMA("REF_CST_ID", //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("VALIDATE_FLAG", // 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 + ADD_COLUMN_SCHEMA("VALIDATE_FLAG", //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("RELY_FLAG", // 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 + ADD_COLUMN_SCHEMA("RELY_FLAG", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10047,17 +10016,16 @@ int ObInnerTableSchema::all_virtual_foreign_key_real_agent_ora_schema(ObTableSch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_column_stat_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_column_stat_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -10088,318 +10056,318 @@ int ObInnerTableSchema::all_virtual_column_stat_real_agent_ora_schema(ObTableSch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //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("PARTITION_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PARTITION_ID", //column_name + ++column_id, //column_id + 3, //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("COLUMN_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("COLUMN_ID", //column_name + ++column_id, //column_id + 4, //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("OBJECT_TYPE", // 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 + ADD_COLUMN_SCHEMA("OBJECT_TYPE", //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("LAST_ANALYZED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LAST_ANALYZED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DISTINCT_CNT", // 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 + ADD_COLUMN_SCHEMA("DISTINCT_CNT", //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("NULL_CNT", // 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 + ADD_COLUMN_SCHEMA("NULL_CNT", //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_VALUE", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MAX_VALUE", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("B_MAX_VALUE", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("B_MAX_VALUE", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MIN_VALUE", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MIN_VALUE", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("B_MIN_VALUE", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("B_MIN_VALUE", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("AVG_LEN", // 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 + ADD_COLUMN_SCHEMA("AVG_LEN", //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("DISTINCT_CNT_SYNOPSIS", // 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 - MAX_LLC_BITMAP_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DISTINCT_CNT_SYNOPSIS", //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 + MAX_LLC_BITMAP_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DISTINCT_CNT_SYNOPSIS_SIZE", // 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 + ADD_COLUMN_SCHEMA("DISTINCT_CNT_SYNOPSIS_SIZE", //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("SAMPLE_SIZE", // 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 + ADD_COLUMN_SCHEMA("SAMPLE_SIZE", //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("DENSITY", // 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 + ADD_COLUMN_SCHEMA("DENSITY", //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("BUCKET_CNT", // 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 + ADD_COLUMN_SCHEMA("BUCKET_CNT", //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("HISTOGRAM_TYPE", // 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 + ADD_COLUMN_SCHEMA("HISTOGRAM_TYPE", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10409,17 +10377,16 @@ int ObInnerTableSchema::all_virtual_column_stat_real_agent_ora_schema(ObTableSch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_column_statistic_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_column_statistic_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -10450,213 +10417,213 @@ int ObInnerTableSchema::all_virtual_column_statistic_real_agent_ora_schema(ObTab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //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("PARTITION_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PARTITION_ID", //column_name + ++column_id, //column_id + 3, //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("COLUMN_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("COLUMN_ID", //column_name + ++column_id, //column_id + 4, //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("NUM_DISTINCT", // 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 + ADD_COLUMN_SCHEMA("NUM_DISTINCT", //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("NUM_NULL", // 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 + ADD_COLUMN_SCHEMA("NUM_NULL", //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("MIN_VALUE", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MIN_VALUE", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAX_VALUE", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MAX_VALUE", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LLC_BITMAP", // 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 - MAX_LLC_BITMAP_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LLC_BITMAP", //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 + MAX_LLC_BITMAP_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LLC_BITMAP_SIZE", // 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 + ADD_COLUMN_SCHEMA("LLC_BITMAP_SIZE", //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("VERSION", // 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 + ADD_COLUMN_SCHEMA("VERSION", //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("LAST_REBUILD_VERSION", // 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 + ADD_COLUMN_SCHEMA("LAST_REBUILD_VERSION", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10666,17 +10633,16 @@ int ObInnerTableSchema::all_virtual_column_statistic_real_agent_ora_schema(ObTab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_table_stat_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_table_stat_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -10707,198 +10673,198 @@ int ObInnerTableSchema::all_virtual_table_stat_real_agent_ora_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //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("PARTITION_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PARTITION_ID", //column_name + ++column_id, //column_id + 3, //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("OBJECT_TYPE", // 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 + ADD_COLUMN_SCHEMA("OBJECT_TYPE", //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("LAST_ANALYZED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LAST_ANALYZED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SSTABLE_ROW_CNT", // 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 + ADD_COLUMN_SCHEMA("SSTABLE_ROW_CNT", //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("SSTABLE_AVG_ROW_LEN", // 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 + ADD_COLUMN_SCHEMA("SSTABLE_AVG_ROW_LEN", //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("MACRO_BLK_CNT", // 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 + ADD_COLUMN_SCHEMA("MACRO_BLK_CNT", //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("MICRO_BLK_CNT", // 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 + ADD_COLUMN_SCHEMA("MICRO_BLK_CNT", //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("MEMTABLE_ROW_CNT", // 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 + ADD_COLUMN_SCHEMA("MEMTABLE_ROW_CNT", //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("MEMTABLE_AVG_ROW_LEN", // 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 + ADD_COLUMN_SCHEMA("MEMTABLE_AVG_ROW_LEN", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10908,17 +10874,16 @@ int ObInnerTableSchema::all_virtual_table_stat_real_agent_ora_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_recyclebin_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_recyclebin_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -10949,123 +10914,123 @@ int ObInnerTableSchema::all_virtual_recyclebin_real_agent_ora_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("OBJECT_NAME", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_OBJECT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OBJECT_NAME", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_OBJECT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TYPE", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("TYPE", //column_name + ++column_id, //column_id + 3, //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("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("TABLE_ID", // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //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("TABLEGROUP_ID", // 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 + ADD_COLUMN_SCHEMA("TABLEGROUP_ID", //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("ORIGINAL_NAME", // 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 - OB_MAX_ORIGINAL_NANE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ORIGINAL_NAME", //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 + OB_MAX_ORIGINAL_NANE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11075,17 +11040,16 @@ int ObInnerTableSchema::all_virtual_recyclebin_real_agent_ora_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_routine_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_routine_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -11116,288 +11080,288 @@ int ObInnerTableSchema::all_virtual_routine_real_agent_ora_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("ROUTINE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("ROUTINE_ID", //column_name + ++column_id, //column_id + 2, //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("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("PACKAGE_ID", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_ID", //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("ROUTINE_NAME", // 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 - OB_MAX_ROUTINE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROUTINE_NAME", //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 + OB_MAX_ROUTINE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OVERLOAD", // 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 + ADD_COLUMN_SCHEMA("OVERLOAD", //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("SUBPROGRAM_ID", // 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 + ADD_COLUMN_SCHEMA("SUBPROGRAM_ID", //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("ROUTINE_TYPE", // 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 + ADD_COLUMN_SCHEMA("ROUTINE_TYPE", //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("FLAG", // 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 + ADD_COLUMN_SCHEMA("FLAG", //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("OWNER_ID", // 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 + ADD_COLUMN_SCHEMA("OWNER_ID", //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("PRIV_USER", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PRIV_USER", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMP_FLAG", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMP_FLAG", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXEC_ENV", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXEC_ENV", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROUTINE_BODY", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROUTINE_BODY", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROUTE_SQL", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROUTE_SQL", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11407,17 +11371,16 @@ int ObInnerTableSchema::all_virtual_routine_real_agent_ora_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tablegroup_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tablegroup_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -11448,348 +11411,348 @@ int ObInnerTableSchema::all_virtual_tablegroup_real_agent_ora_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("TABLEGROUP_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLEGROUP_ID", //column_name + ++column_id, //column_id + 2, //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("TABLEGROUP_NAME", // 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 - OB_MAX_TABLEGROUP_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TABLEGROUP_NAME", //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 + OB_MAX_TABLEGROUP_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - MAX_TABLEGROUP_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + MAX_TABLEGROUP_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIMARY_ZONE", // 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 - MAX_ZONE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PRIMARY_ZONE", //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 + MAX_ZONE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LOCALITY", // 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 - MAX_LOCALITY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LOCALITY", //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 + MAX_LOCALITY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PART_LEVEL", // 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 + ADD_COLUMN_SCHEMA("PART_LEVEL", //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("PART_FUNC_TYPE", // 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 + ADD_COLUMN_SCHEMA("PART_FUNC_TYPE", //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("PART_FUNC_EXPR_NUM", // 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 + ADD_COLUMN_SCHEMA("PART_FUNC_EXPR_NUM", //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("PART_NUM", // 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 + ADD_COLUMN_SCHEMA("PART_NUM", //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("SUB_PART_FUNC_TYPE", // 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 + ADD_COLUMN_SCHEMA("SUB_PART_FUNC_TYPE", //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("SUB_PART_FUNC_EXPR_NUM", // 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 + ADD_COLUMN_SCHEMA("SUB_PART_FUNC_EXPR_NUM", //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("SUB_PART_NUM", // 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 + ADD_COLUMN_SCHEMA("SUB_PART_NUM", //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_USED_PART_ID", // 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 + ADD_COLUMN_SCHEMA("MAX_USED_PART_ID", //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("PARTITION_STATUS", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARTITION_STATUS", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PREVIOUS_LOCALITY", // 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 - MAX_LOCALITY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PREVIOUS_LOCALITY", //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 + MAX_LOCALITY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARTITION_SCHEMA_VERSION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARTITION_SCHEMA_VERSION", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BINDING", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("BINDING", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DROP_SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("DROP_SCHEMA_VERSION", //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("IS_SUB_PART_TEMPLATE", // 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 + ADD_COLUMN_SCHEMA("IS_SUB_PART_TEMPLATE", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11799,17 +11762,16 @@ int ObInnerTableSchema::all_virtual_tablegroup_real_agent_ora_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_foreign_key_column_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_foreign_key_column_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -11840,108 +11802,108 @@ int ObInnerTableSchema::all_virtual_foreign_key_column_real_agent_ora_schema(ObT table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("FOREIGN_KEY_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("FOREIGN_KEY_ID", //column_name + ++column_id, //column_id + 2, //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("CHILD_COLUMN_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("CHILD_COLUMN_ID", //column_name + ++column_id, //column_id + 3, //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("PARENT_COLUMN_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("PARENT_COLUMN_ID", //column_name + ++column_id, //column_id + 4, //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("POSITION", // 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 + ADD_COLUMN_SCHEMA("POSITION", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11951,17 +11913,16 @@ int ObInnerTableSchema::all_virtual_foreign_key_column_real_agent_ora_schema(ObT table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_constraint_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_constraint_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -11992,183 +11953,183 @@ int ObInnerTableSchema::all_virtual_constraint_real_agent_ora_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("CONSTRAINT_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("CONSTRAINT_ID", //column_name + ++column_id, //column_id + 3, //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("CONSTRAINT_NAME", // 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 - OB_MAX_CONSTRAINT_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CONSTRAINT_NAME", //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 + OB_MAX_CONSTRAINT_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CHECK_EXPR", // 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 - OB_MAX_CONSTRAINT_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CHECK_EXPR", //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 + OB_MAX_CONSTRAINT_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("CONSTRAINT_TYPE", // 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 + ADD_COLUMN_SCHEMA("CONSTRAINT_TYPE", //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("RELY_FLAG", // 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 + ADD_COLUMN_SCHEMA("RELY_FLAG", //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("ENABLE_FLAG", // 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 + ADD_COLUMN_SCHEMA("ENABLE_FLAG", //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("VALIDATE_FLAG", // 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 + ADD_COLUMN_SCHEMA("VALIDATE_FLAG", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -12178,17 +12139,16 @@ int ObInnerTableSchema::all_virtual_constraint_real_agent_ora_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_type_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_type_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -12219,318 +12179,318 @@ int ObInnerTableSchema::all_virtual_type_real_agent_ora_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TYPE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TYPE_ID", //column_name + ++column_id, //column_id + 2, //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("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("TYPECODE", // 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 + ADD_COLUMN_SCHEMA("TYPECODE", //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("PROPERTIES", // 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 + ADD_COLUMN_SCHEMA("PROPERTIES", //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("ATTRIBUTES", // 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 + ADD_COLUMN_SCHEMA("ATTRIBUTES", //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("METHODS", // 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 + ADD_COLUMN_SCHEMA("METHODS", //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("HIDDENMETHODS", // 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 + ADD_COLUMN_SCHEMA("HIDDENMETHODS", //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("SUPERTYPES", // 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 + ADD_COLUMN_SCHEMA("SUPERTYPES", //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("SUBTYPES", // 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 + ADD_COLUMN_SCHEMA("SUBTYPES", //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("EXTERNTYPE", // 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 + ADD_COLUMN_SCHEMA("EXTERNTYPE", //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("EXTERNNAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXTERNNAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("HELPERCLASSNAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HELPERCLASSNAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LOCAL_ATTRS", // 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 + ADD_COLUMN_SCHEMA("LOCAL_ATTRS", //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("LOCAL_METHODS", // 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 + ADD_COLUMN_SCHEMA("LOCAL_METHODS", //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("SUPERTYPEID", // 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 + ADD_COLUMN_SCHEMA("SUPERTYPEID", //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("TYPE_NAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TYPE_NAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PACKAGE_ID", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_ID", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -12540,17 +12500,16 @@ int ObInnerTableSchema::all_virtual_type_real_agent_ora_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_type_attr_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_type_attr_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -12581,303 +12540,303 @@ int ObInnerTableSchema::all_virtual_type_attr_real_agent_ora_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TYPE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TYPE_ID", //column_name + ++column_id, //column_id + 2, //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("ATTRIBUTE", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("ATTRIBUTE", //column_name + ++column_id, //column_id + 3, //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("TYPE_ATTR_ID", // 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 + ADD_COLUMN_SCHEMA("TYPE_ATTR_ID", //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("NAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROPERTIES", // 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 + ADD_COLUMN_SCHEMA("PROPERTIES", //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("CHARSET_ID", // 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 + ADD_COLUMN_SCHEMA("CHARSET_ID", //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("CHARSET_FORM", // 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 + ADD_COLUMN_SCHEMA("CHARSET_FORM", //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("LENGTH", // 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 + ADD_COLUMN_SCHEMA("LENGTH", //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("NUMBER_PRECISION", // 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 + ADD_COLUMN_SCHEMA("NUMBER_PRECISION", //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("SCALE", // 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 + ADD_COLUMN_SCHEMA("SCALE", //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("ZERO_FILL", // 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 + ADD_COLUMN_SCHEMA("ZERO_FILL", //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("COLL_TYPE", // 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 + ADD_COLUMN_SCHEMA("COLL_TYPE", //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("EXTERNNAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXTERNNAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("XFLAGS", // 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 + ADD_COLUMN_SCHEMA("XFLAGS", //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("SETTER", // 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 + ADD_COLUMN_SCHEMA("SETTER", //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("GETTER", // 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 + ADD_COLUMN_SCHEMA("GETTER", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -12887,17 +12846,16 @@ int ObInnerTableSchema::all_virtual_type_attr_real_agent_ora_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_coll_type_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_coll_type_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -12928,273 +12886,273 @@ int ObInnerTableSchema::all_virtual_coll_type_real_agent_ora_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("COLL_TYPE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("COLL_TYPE_ID", //column_name + ++column_id, //column_id + 2, //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("ELEM_TYPE_ID", // 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 + ADD_COLUMN_SCHEMA("ELEM_TYPE_ID", //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("ELEM_SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("ELEM_SCHEMA_VERSION", //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("PROPERTIES", // 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 + ADD_COLUMN_SCHEMA("PROPERTIES", //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("CHARSET_ID", // 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 + ADD_COLUMN_SCHEMA("CHARSET_ID", //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("CHARSET_FORM", // 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 + ADD_COLUMN_SCHEMA("CHARSET_FORM", //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("LENGTH", // 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 + ADD_COLUMN_SCHEMA("LENGTH", //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("NUMBER_PRECISION", // 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 + ADD_COLUMN_SCHEMA("NUMBER_PRECISION", //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("SCALE", // 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 + ADD_COLUMN_SCHEMA("SCALE", //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("ZERO_FILL", // 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 + ADD_COLUMN_SCHEMA("ZERO_FILL", //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("COLL_TYPE", // 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 + ADD_COLUMN_SCHEMA("COLL_TYPE", //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("UPPER_BOUND", // 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 + ADD_COLUMN_SCHEMA("UPPER_BOUND", //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("PACKAGE_ID", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_ID", //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("COLL_NAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLL_NAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -13204,17 +13162,16 @@ int ObInnerTableSchema::all_virtual_coll_type_real_agent_ora_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_routine_param_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_routine_param_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -13245,348 +13202,348 @@ int ObInnerTableSchema::all_virtual_routine_param_real_agent_ora_schema(ObTableS table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("ROUTINE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("ROUTINE_ID", //column_name + ++column_id, //column_id + 2, //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("SEQUENCE", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SEQUENCE", //column_name + ++column_id, //column_id + 3, //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("SUBPROGRAM_ID", // 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 + ADD_COLUMN_SCHEMA("SUBPROGRAM_ID", //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("PARAM_POSITION", // 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 + ADD_COLUMN_SCHEMA("PARAM_POSITION", //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("PARAM_LEVEL", // 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 + ADD_COLUMN_SCHEMA("PARAM_LEVEL", //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("PARAM_NAME", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARAM_NAME", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("PARAM_TYPE", // 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 + ADD_COLUMN_SCHEMA("PARAM_TYPE", //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("PARAM_LENGTH", // 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 + ADD_COLUMN_SCHEMA("PARAM_LENGTH", //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("PARAM_PRECISION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARAM_PRECISION", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARAM_SCALE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARAM_SCALE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARAM_ZERO_FILL", // 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 + ADD_COLUMN_SCHEMA("PARAM_ZERO_FILL", //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("PARAM_CHARSET", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARAM_CHARSET", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PARAM_COLL_TYPE", // 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 + ADD_COLUMN_SCHEMA("PARAM_COLL_TYPE", //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("FLAG", // 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 + ADD_COLUMN_SCHEMA("FLAG", //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("DEFAULT_VALUE", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DEFAULT_VALUE", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TYPE_OWNER", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TYPE_OWNER", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TYPE_NAME", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TYPE_NAME", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TYPE_SUBNAME", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TYPE_SUBNAME", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXTENDED_TYPE_INFO", // 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_VARBINARY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXTENDED_TYPE_INFO", //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_VARBINARY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -13596,22 +13553,20 @@ int ObInnerTableSchema::all_virtual_routine_param_real_agent_ora_schema(ObTableS table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_partition_meta_table_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_partition_meta_table_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); - table_schema.set_table_id( - combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT_ORA_TID)); + table_schema.set_table_id(combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT_ORA_TID)); table_schema.set_rowkey_split_pos(0); table_schema.set_is_use_bloomfilter(false); table_schema.set_progressive_merge_num(0); @@ -13638,228 +13593,228 @@ int ObInnerTableSchema::all_virtual_tenant_partition_meta_table_real_agent_ora_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("PARTITION_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PARTITION_ID", //column_name + ++column_id, //column_id + 3, //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("SVR_IP", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - 32, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + 32, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 5, //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("ROLE", // 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 + ADD_COLUMN_SCHEMA("ROLE", //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("ROW_COUNT", // 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 + ADD_COLUMN_SCHEMA("ROW_COUNT", //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("DATA_SIZE", // 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 + ADD_COLUMN_SCHEMA("DATA_SIZE", //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("DATA_VERSION", // 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 + ADD_COLUMN_SCHEMA("DATA_VERSION", //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("REQUIRED_SIZE", // 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 + ADD_COLUMN_SCHEMA("REQUIRED_SIZE", //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("REPLICA_TYPE", // 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 + ADD_COLUMN_SCHEMA("REPLICA_TYPE", //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("STATUS", // 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 - MAX_REPLICA_STATUS_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("STATUS", //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 + MAX_REPLICA_STATUS_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATA_CHECKSUM", // 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 + ADD_COLUMN_SCHEMA("DATA_CHECKSUM", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -13869,17 +13824,16 @@ int ObInnerTableSchema::all_virtual_tenant_partition_meta_table_real_agent_ora_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_keystore_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_keystore_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -13910,138 +13864,138 @@ int ObInnerTableSchema::all_virtual_tenant_keystore_real_agent_ora_schema(ObTabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("KEYSTORE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("KEYSTORE_ID", //column_name + ++column_id, //column_id + 2, //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("KEYSTORE_NAME", // 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 - OB_MAX_KEYSTORE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("KEYSTORE_NAME", //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 + OB_MAX_KEYSTORE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PASSWORD", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PASSWORD", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STATUS", // 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 + ADD_COLUMN_SCHEMA("STATUS", //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("MASTER_KEY_ID", // 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 + ADD_COLUMN_SCHEMA("MASTER_KEY_ID", //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("MASTER_KEY", // 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 - OB_MAX_MASTER_KEY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MASTER_KEY", //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 + OB_MAX_MASTER_KEY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -14051,10 +14005,10 @@ int ObInnerTableSchema::all_virtual_tenant_keystore_real_agent_ora_schema(ObTabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.15151_15200.cpp b/src/share/inner_table/ob_inner_table_schema.15151_15200.cpp index 2e594dfd0..e7c538e16 100644 --- a/src/share/inner_table/ob_inner_table_schema.15151_15200.cpp +++ b/src/share/inner_table/ob_inner_table_schema.15151_15200.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::all_virtual_tenant_tablespace_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_tablespace_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -58,123 +60,123 @@ int ObInnerTableSchema::all_virtual_tenant_tablespace_real_agent_ora_schema(ObTa table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLESPACE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLESPACE_ID", //column_name + ++column_id, //column_id + 2, //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("TABLESPACE_NAME", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TABLESPACE_NAME", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ENCRYPTION_NAME", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ENCRYPTION_NAME", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ENCRYPT_KEY", // 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_MASTER_KEY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ENCRYPT_KEY", //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_MASTER_KEY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MASTER_KEY_ID", // 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 + ADD_COLUMN_SCHEMA("MASTER_KEY_ID", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -184,17 +186,16 @@ int ObInnerTableSchema::all_virtual_tenant_tablespace_real_agent_ora_schema(ObTa table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_profile_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_profile_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -225,198 +226,198 @@ int ObInnerTableSchema::all_virtual_tenant_profile_real_agent_ora_schema(ObTable table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("PROFILE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("PROFILE_ID", //column_name + ++column_id, //column_id + 2, //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("PROFILE_NAME", // 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 - OB_MAX_SQL_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PROFILE_NAME", //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 + OB_MAX_SQL_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("FAILED_LOGIN_ATTEMPTS", // 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 + ADD_COLUMN_SCHEMA("FAILED_LOGIN_ATTEMPTS", //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("PASSWORD_LOCK_TIME", // 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 + ADD_COLUMN_SCHEMA("PASSWORD_LOCK_TIME", //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("PASSWORD_VERIFY_FUNCTION", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PASSWORD_VERIFY_FUNCTION", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PASSWORD_LIFE_TIME", // 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 + ADD_COLUMN_SCHEMA("PASSWORD_LIFE_TIME", //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("PASSWORD_GRACE_TIME", // 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 + ADD_COLUMN_SCHEMA("PASSWORD_GRACE_TIME", //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("PASSWORD_REUSE_TIME", // 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 + ADD_COLUMN_SCHEMA("PASSWORD_REUSE_TIME", //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("PASSWORD_REUSE_MAX", // 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 + ADD_COLUMN_SCHEMA("PASSWORD_REUSE_MAX", //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("INACTIVE_ACCOUNT_TIME", // 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 + ADD_COLUMN_SCHEMA("INACTIVE_ACCOUNT_TIME", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -426,17 +427,16 @@ int ObInnerTableSchema::all_virtual_tenant_profile_real_agent_ora_schema(ObTable table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_role_grantee_map_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_role_grantee_map_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -467,108 +467,108 @@ int ObInnerTableSchema::all_virtual_tenant_role_grantee_map_real_agent_ora_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("GRANTEE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("GRANTEE_ID", //column_name + ++column_id, //column_id + 2, //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("ROLE_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("ROLE_ID", //column_name + ++column_id, //column_id + 3, //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("ADMIN_OPTION", // 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 + ADD_COLUMN_SCHEMA("ADMIN_OPTION", //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("DISABLE_FLAG", // 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 + ADD_COLUMN_SCHEMA("DISABLE_FLAG", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -578,17 +578,16 @@ int ObInnerTableSchema::all_virtual_tenant_role_grantee_map_real_agent_ora_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_table_privilege_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_table_privilege_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -619,258 +618,258 @@ int ObInnerTableSchema::all_virtual_table_privilege_real_agent_ora_schema(ObTabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("USER_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("USER_ID", //column_name + ++column_id, //column_id + 2, //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("DATABASE_NAME", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_DATABASE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DATABASE_NAME", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_DATABASE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLE_NAME", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_CORE_TALBE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TABLE_NAME", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_CORE_TALBE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PRIV_ALTER", // 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 + ADD_COLUMN_SCHEMA("PRIV_ALTER", //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("PRIV_CREATE", // 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 + ADD_COLUMN_SCHEMA("PRIV_CREATE", //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("PRIV_DELETE", // 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 + ADD_COLUMN_SCHEMA("PRIV_DELETE", //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("PRIV_DROP", // 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 + ADD_COLUMN_SCHEMA("PRIV_DROP", //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("PRIV_GRANT_OPTION", // 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 + ADD_COLUMN_SCHEMA("PRIV_GRANT_OPTION", //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("PRIV_INSERT", // 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 + ADD_COLUMN_SCHEMA("PRIV_INSERT", //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("PRIV_UPDATE", // 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 + ADD_COLUMN_SCHEMA("PRIV_UPDATE", //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("PRIV_SELECT", // 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 + ADD_COLUMN_SCHEMA("PRIV_SELECT", //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("PRIV_INDEX", // 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 + ADD_COLUMN_SCHEMA("PRIV_INDEX", //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("PRIV_CREATE_VIEW", // 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 + ADD_COLUMN_SCHEMA("PRIV_CREATE_VIEW", //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("PRIV_SHOW_VIEW", // 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 + ADD_COLUMN_SCHEMA("PRIV_SHOW_VIEW", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -880,17 +879,16 @@ int ObInnerTableSchema::all_virtual_table_privilege_real_agent_ora_schema(ObTabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_security_audit_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_security_audit_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -921,138 +919,138 @@ int ObInnerTableSchema::all_virtual_tenant_security_audit_real_agent_ora_schema( table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("AUDIT_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("AUDIT_ID", //column_name + ++column_id, //column_id + 2, //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("AUDIT_TYPE", // 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 + ADD_COLUMN_SCHEMA("AUDIT_TYPE", //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("OWNER_ID", // 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 + ADD_COLUMN_SCHEMA("OWNER_ID", //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("OPERATION_TYPE", // 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 + ADD_COLUMN_SCHEMA("OPERATION_TYPE", //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("IN_SUCCESS", // 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 + ADD_COLUMN_SCHEMA("IN_SUCCESS", //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("IN_FAILURE", // 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 + ADD_COLUMN_SCHEMA("IN_FAILURE", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1062,22 +1060,20 @@ int ObInnerTableSchema::all_virtual_tenant_security_audit_real_agent_ora_schema( table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_security_audit_history_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_security_audit_history_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); - table_schema.set_table_id( - combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_HISTORY_REAL_AGENT_ORA_TID)); + table_schema.set_table_id(combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_HISTORY_REAL_AGENT_ORA_TID)); table_schema.set_rowkey_split_pos(0); table_schema.set_is_use_bloomfilter(false); table_schema.set_progressive_merge_num(0); @@ -1104,168 +1100,168 @@ int ObInnerTableSchema::all_virtual_tenant_security_audit_history_real_agent_ora table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("AUDIT_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("AUDIT_ID", //column_name + ++column_id, //column_id + 2, //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("SCHEMA_VERSION", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //column_name + ++column_id, //column_id + 3, //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("IS_DELETED", // 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 + ADD_COLUMN_SCHEMA("IS_DELETED", //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("AUDIT_TYPE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("AUDIT_TYPE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OWNER_ID", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OWNER_ID", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OPERATION_TYPE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OPERATION_TYPE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IN_SUCCESS", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("IN_SUCCESS", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IN_FAILURE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("IN_FAILURE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1275,17 +1271,16 @@ int ObInnerTableSchema::all_virtual_tenant_security_audit_history_real_agent_ora table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_trigger_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_trigger_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1316,393 +1311,393 @@ int ObInnerTableSchema::all_virtual_tenant_trigger_real_agent_ora_schema(ObTable table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TRIGGER_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TRIGGER_ID", //column_name + ++column_id, //column_id + 2, //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("TRIGGER_NAME", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TRIGGER_NAME", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("OWNER_ID", // 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 + ADD_COLUMN_SCHEMA("OWNER_ID", //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("TRIGGER_TYPE", // 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 + ADD_COLUMN_SCHEMA("TRIGGER_TYPE", //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("TRIGGER_EVENTS", // 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 + ADD_COLUMN_SCHEMA("TRIGGER_EVENTS", //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("TIMING_POINTS", // 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 + ADD_COLUMN_SCHEMA("TIMING_POINTS", //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("BASE_OBJECT_TYPE", // 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 + ADD_COLUMN_SCHEMA("BASE_OBJECT_TYPE", //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("BASE_OBJECT_ID", // 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 + ADD_COLUMN_SCHEMA("BASE_OBJECT_ID", //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("TRIGGER_FLAGS", // 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 + ADD_COLUMN_SCHEMA("TRIGGER_FLAGS", //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("UPDATE_COLUMNS", // 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 - OB_MAX_UPDATE_COLUMNS_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("UPDATE_COLUMNS", //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 + OB_MAX_UPDATE_COLUMNS_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REF_OLD_NAME", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REF_OLD_NAME", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REF_NEW_NAME", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REF_NEW_NAME", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REF_PARENT_NAME", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REF_PARENT_NAME", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("WHEN_CONDITION", // 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 - OB_MAX_WHEN_CONDITION_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("WHEN_CONDITION", //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 + OB_MAX_WHEN_CONDITION_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TRIGGER_BODY", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TRIGGER_BODY", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PACKAGE_SPEC_SOURCE", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PACKAGE_SPEC_SOURCE", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PACKAGE_BODY_SOURCE", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PACKAGE_BODY_SOURCE", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PACKAGE_FLAG", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_FLAG", //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("PACKAGE_COMP_FLAG", // 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 + ADD_COLUMN_SCHEMA("PACKAGE_COMP_FLAG", //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("PACKAGE_EXEC_ENV", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PACKAGE_EXEC_ENV", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_MODE", // 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 + ADD_COLUMN_SCHEMA("SQL_MODE", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1712,22 +1707,20 @@ int ObInnerTableSchema::all_virtual_tenant_trigger_real_agent_ora_schema(ObTable table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_security_audit_record_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_security_audit_record_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); - table_schema.set_table_id( - combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_RECORD_REAL_AGENT_ORA_TID)); + table_schema.set_table_id(combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_RECORD_REAL_AGENT_ORA_TID)); table_schema.set_rowkey_split_pos(0); table_schema.set_is_use_bloomfilter(false); table_schema.set_progressive_merge_num(0); @@ -1754,663 +1747,663 @@ int ObInnerTableSchema::all_virtual_tenant_security_audit_record_real_agent_ora_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("SVR_IP", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 3, //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("RECORD_TIMESTAMP_US", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("RECORD_TIMESTAMP_US", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("USER_ID", // 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 + ADD_COLUMN_SCHEMA("USER_ID", //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("USER_NAME", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USER_NAME", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EFFECTIVE_USER_ID", // 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 + ADD_COLUMN_SCHEMA("EFFECTIVE_USER_ID", //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("EFFECTIVE_USER_NAME", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EFFECTIVE_USER_NAME", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CLIENT_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CLIENT_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("USER_CLIENT_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USER_CLIENT_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROXY_SESSION_ID", // 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 + ADD_COLUMN_SCHEMA("PROXY_SESSION_ID", //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("SESSION_ID", // 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 + ADD_COLUMN_SCHEMA("SESSION_ID", //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("ENTRY_ID", // 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 + ADD_COLUMN_SCHEMA("ENTRY_ID", //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("STATEMENT_ID", // 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 + ADD_COLUMN_SCHEMA("STATEMENT_ID", //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("TRANS_ID", // 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 - 512, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TRANS_ID", //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 + 512, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMIT_VERSION", // 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 + ADD_COLUMN_SCHEMA("COMMIT_VERSION", //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("TRACE_ID", // 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 - 64, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TRACE_ID", //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 + 64, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DB_ID", // 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 + ADD_COLUMN_SCHEMA("DB_ID", //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("CUR_DB_ID", // 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 + ADD_COLUMN_SCHEMA("CUR_DB_ID", //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("SQL_TIMESTAMP_US", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_TIMESTAMP_US", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("AUDIT_ID", // 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 + ADD_COLUMN_SCHEMA("AUDIT_ID", //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("AUDIT_TYPE", // 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 + ADD_COLUMN_SCHEMA("AUDIT_TYPE", //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("OPERATION_TYPE", // 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 + ADD_COLUMN_SCHEMA("OPERATION_TYPE", //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("ACTION_ID", // 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 + ADD_COLUMN_SCHEMA("ACTION_ID", //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("RETURN_CODE", // 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 + ADD_COLUMN_SCHEMA("RETURN_CODE", //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("OBJ_OWNER_NAME", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OBJ_OWNER_NAME", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OBJ_NAME", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OBJ_NAME", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NEW_OBJ_OWNER_NAME", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NEW_OBJ_OWNER_NAME", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("NEW_OBJ_NAME", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NEW_OBJ_NAME", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("AUTH_PRIVILEGES", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("AUTH_PRIVILEGES", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("AUTH_GRANTEE", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("AUTH_GRANTEE", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LOGOFF_LOGICAL_READ", // 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 + ADD_COLUMN_SCHEMA("LOGOFF_LOGICAL_READ", //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("LOGOFF_PHYSICAL_READ", // 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 + ADD_COLUMN_SCHEMA("LOGOFF_PHYSICAL_READ", //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("LOGOFF_LOGICAL_WRITE", // 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 + ADD_COLUMN_SCHEMA("LOGOFF_LOGICAL_WRITE", //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("LOGOFF_LOCK_COUNT", // 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 + ADD_COLUMN_SCHEMA("LOGOFF_LOCK_COUNT", //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("LOGOFF_DEAD_LOCK", // 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 - 40, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LOGOFF_DEAD_LOCK", //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 + 40, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LOGOFF_CPU_TIME_US", // 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 + ADD_COLUMN_SCHEMA("LOGOFF_CPU_TIME_US", //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("LOGOFF_EXEC_TIME_US", // 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 + ADD_COLUMN_SCHEMA("LOGOFF_EXEC_TIME_US", //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("LOGOFF_ALIVE_TIME_US", // 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 + ADD_COLUMN_SCHEMA("LOGOFF_ALIVE_TIME_US", //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("COMMENT_TEXT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT_TEXT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_BIND", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_BIND", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SQL_TEXT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SQL_TEXT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2420,17 +2413,16 @@ int ObInnerTableSchema::all_virtual_tenant_security_audit_record_real_agent_ora_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_sysauth_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_sysauth_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2461,93 +2453,93 @@ int ObInnerTableSchema::all_virtual_tenant_sysauth_real_agent_ora_schema(ObTable table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("GRANTEE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("GRANTEE_ID", //column_name + ++column_id, //column_id + 2, //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("PRIV_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PRIV_ID", //column_name + ++column_id, //column_id + 3, //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("PRIV_OPTION", // 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 + ADD_COLUMN_SCHEMA("PRIV_OPTION", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2557,17 +2549,16 @@ int ObInnerTableSchema::all_virtual_tenant_sysauth_real_agent_ora_schema(ObTable table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_sysauth_history_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_sysauth_history_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2598,123 +2589,123 @@ int ObInnerTableSchema::all_virtual_tenant_sysauth_history_real_agent_ora_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("GRANTEE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("GRANTEE_ID", //column_name + ++column_id, //column_id + 2, //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("PRIV_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PRIV_ID", //column_name + ++column_id, //column_id + 3, //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("SCHEMA_VERSION", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //column_name + ++column_id, //column_id + 4, //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("IS_DELETED", // 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 + ADD_COLUMN_SCHEMA("IS_DELETED", //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("PRIV_OPTION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PRIV_OPTION", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2724,17 +2715,16 @@ int ObInnerTableSchema::all_virtual_tenant_sysauth_history_real_agent_ora_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_objauth_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_objauth_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2765,153 +2755,153 @@ int ObInnerTableSchema::all_virtual_tenant_objauth_real_agent_ora_schema(ObTable table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("OBJ_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("OBJ_ID", //column_name + ++column_id, //column_id + 2, //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("OBJTYPE", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("OBJTYPE", //column_name + ++column_id, //column_id + 3, //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("COL_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("COL_ID", //column_name + ++column_id, //column_id + 4, //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("GRANTOR_ID", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("GRANTOR_ID", //column_name + ++column_id, //column_id + 5, //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("GRANTEE_ID", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("GRANTEE_ID", //column_name + ++column_id, //column_id + 6, //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("PRIV_ID", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("PRIV_ID", //column_name + ++column_id, //column_id + 7, //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("PRIV_OPTION", // 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 + ADD_COLUMN_SCHEMA("PRIV_OPTION", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2921,17 +2911,16 @@ int ObInnerTableSchema::all_virtual_tenant_objauth_real_agent_ora_schema(ObTable table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_objauth_history_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_objauth_history_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2962,183 +2951,183 @@ int ObInnerTableSchema::all_virtual_tenant_objauth_history_real_agent_ora_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("OBJ_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("OBJ_ID", //column_name + ++column_id, //column_id + 2, //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("OBJTYPE", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("OBJTYPE", //column_name + ++column_id, //column_id + 3, //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("COL_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("COL_ID", //column_name + ++column_id, //column_id + 4, //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("GRANTOR_ID", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("GRANTOR_ID", //column_name + ++column_id, //column_id + 5, //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("GRANTEE_ID", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("GRANTEE_ID", //column_name + ++column_id, //column_id + 6, //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("PRIV_ID", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("PRIV_ID", //column_name + ++column_id, //column_id + 7, //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("SCHEMA_VERSION", // column_name - ++column_id, // column_id - 8, // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //column_name + ++column_id, //column_id + 8, //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("IS_DELETED", // 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 + ADD_COLUMN_SCHEMA("IS_DELETED", //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("PRIV_OPTION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PRIV_OPTION", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3148,17 +3137,16 @@ int ObInnerTableSchema::all_virtual_tenant_objauth_history_real_agent_ora_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_error_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_error_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -3189,198 +3177,198 @@ int ObInnerTableSchema::all_virtual_tenant_error_real_agent_ora_schema(ObTableSc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("OBJ_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("OBJ_ID", //column_name + ++column_id, //column_id + 2, //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("OBJ_SEQ", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("OBJ_SEQ", //column_name + ++column_id, //column_id + 3, //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("OBJ_TYPE", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("OBJ_TYPE", //column_name + ++column_id, //column_id + 4, //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("LINE", // 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 + ADD_COLUMN_SCHEMA("LINE", //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("POSITION", // 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 + ADD_COLUMN_SCHEMA("POSITION", //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("TEXT_LENGTH", // 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 + ADD_COLUMN_SCHEMA("TEXT_LENGTH", //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("TEXT", // 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 - MAX_ORACLE_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TEXT", //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 + MAX_ORACLE_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROPERTY", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PROPERTY", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ERROR_NUMBER", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ERROR_NUMBER", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3390,17 +3378,16 @@ int ObInnerTableSchema::all_virtual_tenant_error_real_agent_ora_schema(ObTableSc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_def_sub_part_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_def_sub_part_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -3431,333 +3418,333 @@ int ObInnerTableSchema::all_virtual_def_sub_part_real_agent_ora_schema(ObTableSc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("SUB_PART_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SUB_PART_ID", //column_name + ++column_id, //column_id + 3, //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("SUB_PART_NAME", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUB_PART_NAME", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("HIGH_BOUND_VAL", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HIGH_BOUND_VAL", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("B_HIGH_BOUND_VAL", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("B_HIGH_BOUND_VAL", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("BLOCK_SIZE", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("BLOCK_SIZE", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REPLICA_NUM", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REPLICA_NUM", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMPRESS_FUNC_NAME", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMPRESS_FUNC_NAME", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SPARE3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SPARE3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("LIST_VAL", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("LIST_VAL", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("B_LIST_VAL", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("B_LIST_VAL", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SUB_PART_IDX", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SUB_PART_IDX", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SOURCE_PARTITION_ID", // 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 - MAX_VALUE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SOURCE_PARTITION_ID", //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 + MAX_VALUE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MAPPING_PG_SUB_PART_ID", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MAPPING_PG_SUB_PART_ID", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLESPACE_ID", // 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 + ADD_COLUMN_SCHEMA("TABLESPACE_ID", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3767,17 +3754,16 @@ int ObInnerTableSchema::all_virtual_def_sub_part_real_agent_ora_schema(ObTableSc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_object_type_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_object_type_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -3808,348 +3794,348 @@ int ObInnerTableSchema::all_virtual_tenant_object_type_real_agent_ora_schema(ObT table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("OBJECT_TYPE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("OBJECT_TYPE_ID", //column_name + ++column_id, //column_id + 2, //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("TYPE", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("TYPE", //column_name + ++column_id, //column_id + 3, //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("PROPERTIES", // 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 + ADD_COLUMN_SCHEMA("PROPERTIES", //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("CHARSET_ID", // 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 + ADD_COLUMN_SCHEMA("CHARSET_ID", //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("CHARSET_FORM", // 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 + ADD_COLUMN_SCHEMA("CHARSET_FORM", //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("LENGTH", // 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 + ADD_COLUMN_SCHEMA("LENGTH", //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("NUMBER_PRECISION", // 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 + ADD_COLUMN_SCHEMA("NUMBER_PRECISION", //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("SCALE", // 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 + ADD_COLUMN_SCHEMA("SCALE", //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("ZERO_FILL", // 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 + ADD_COLUMN_SCHEMA("ZERO_FILL", //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("COLL_TYPE", // 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 + ADD_COLUMN_SCHEMA("COLL_TYPE", //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("DATABASE_ID", // 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 + ADD_COLUMN_SCHEMA("DATABASE_ID", //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("FLAG", // 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 + ADD_COLUMN_SCHEMA("FLAG", //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("OWNER_ID", // 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 + ADD_COLUMN_SCHEMA("OWNER_ID", //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("COMP_FLAG", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMP_FLAG", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OBJECT_NAME", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OBJECT_NAME", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXEC_ENV", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXEC_ENV", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SOURCE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SOURCE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENT", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENT", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROUTE_SQL", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROUTE_SQL", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4159,17 +4145,16 @@ int ObInnerTableSchema::all_virtual_tenant_object_type_real_agent_ora_schema(ObT table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_dblink_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_dblink_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -4200,183 +4185,183 @@ int ObInnerTableSchema::all_virtual_dblink_real_agent_ora_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("DBLINK_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("DBLINK_ID", //column_name + ++column_id, //column_id + 2, //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("DBLINK_NAME", // 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 - OB_MAX_DBLINK_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DBLINK_NAME", //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 + OB_MAX_DBLINK_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OWNER_ID", // 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 + ADD_COLUMN_SCHEMA("OWNER_ID", //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("HOST_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HOST_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("HOST_PORT", // 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 + ADD_COLUMN_SCHEMA("HOST_PORT", //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("CLUSTER_NAME", // 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 - OB_MAX_CLUSTER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CLUSTER_NAME", //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 + OB_MAX_CLUSTER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_NAME", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TENANT_NAME", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("USER_NAME", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USER_NAME", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PASSWORD", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PASSWORD", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4386,17 +4371,16 @@ int ObInnerTableSchema::all_virtual_dblink_real_agent_ora_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_dblink_history_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_dblink_history_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -4427,213 +4411,213 @@ int ObInnerTableSchema::all_virtual_dblink_history_real_agent_ora_schema(ObTable table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("DBLINK_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("DBLINK_ID", //column_name + ++column_id, //column_id + 2, //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("SCHEMA_VERSION", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //column_name + ++column_id, //column_id + 3, //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("IS_DELETED", // 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 + ADD_COLUMN_SCHEMA("IS_DELETED", //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("DBLINK_NAME", // 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 - OB_MAX_DBLINK_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DBLINK_NAME", //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 + OB_MAX_DBLINK_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("OWNER_ID", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("OWNER_ID", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("HOST_IP", // 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 - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HOST_IP", //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 + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("HOST_PORT", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("HOST_PORT", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CLUSTER_NAME", // 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 - OB_MAX_CLUSTER_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CLUSTER_NAME", //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 + OB_MAX_CLUSTER_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_NAME", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TENANT_NAME", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("USER_NAME", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USER_NAME", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PASSWORD", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PASSWORD", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4643,17 +4627,16 @@ int ObInnerTableSchema::all_virtual_dblink_history_real_agent_ora_schema(ObTable table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_constraint_column_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_constraint_column_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -4684,108 +4667,108 @@ int ObInnerTableSchema::all_virtual_tenant_constraint_column_real_agent_ora_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("CONSTRAINT_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("CONSTRAINT_ID", //column_name + ++column_id, //column_id + 3, //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("COLUMN_ID", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("COLUMN_ID", //column_name + ++column_id, //column_id + 4, //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4795,17 +4778,16 @@ int ObInnerTableSchema::all_virtual_tenant_constraint_column_real_agent_ora_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_dependency_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_dependency_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -4836,243 +4818,243 @@ int ObInnerTableSchema::all_virtual_tenant_dependency_real_agent_ora_schema(ObTa table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("DEP_OBJ_TYPE", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("DEP_OBJ_TYPE", //column_name + ++column_id, //column_id + 2, //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("DEP_OBJ_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("DEP_OBJ_ID", //column_name + ++column_id, //column_id + 3, //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("DEP_ORDER", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("DEP_ORDER", //column_name + ++column_id, //column_id + 4, //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("SCHEMA_VERSION", // 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 + ADD_COLUMN_SCHEMA("SCHEMA_VERSION", //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("DEP_TIMESTAMP", // 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 + ADD_COLUMN_SCHEMA("DEP_TIMESTAMP", //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("REF_OBJ_TYPE", // 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 + ADD_COLUMN_SCHEMA("REF_OBJ_TYPE", //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("REF_OBJ_ID", // 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 + ADD_COLUMN_SCHEMA("REF_OBJ_ID", //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("REF_TIMESTAMP", // 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 + ADD_COLUMN_SCHEMA("REF_TIMESTAMP", //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("DEP_OBJ_OWNER_ID", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DEP_OBJ_OWNER_ID", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("PROPERTY", // 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 + ADD_COLUMN_SCHEMA("PROPERTY", //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("DEP_ATTRS", // 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_ORACLE_RAW_SQL_COL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DEP_ATTRS", //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_ORACLE_RAW_SQL_COL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("DEP_REASON", // 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_ORACLE_RAW_SQL_COL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("DEP_REASON", //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_ORACLE_RAW_SQL_COL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("REF_OBJ_NAME", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("REF_OBJ_NAME", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5082,17 +5064,16 @@ int ObInnerTableSchema::all_virtual_tenant_dependency_real_agent_ora_schema(ObTa table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_meta_table_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_meta_table_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -5123,498 +5104,498 @@ int ObInnerTableSchema::all_virtual_tenant_meta_table_real_agent_ora_schema(ObTa table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TABLE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //column_name + ++column_id, //column_id + 2, //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("PARTITION_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("PARTITION_ID", //column_name + ++column_id, //column_id + 3, //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("SVR_IP", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 5, //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("SQL_PORT", // 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 + ADD_COLUMN_SCHEMA("SQL_PORT", //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("UNIT_ID", // 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 + ADD_COLUMN_SCHEMA("UNIT_ID", //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("PARTITION_CNT", // 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 + ADD_COLUMN_SCHEMA("PARTITION_CNT", //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("ZONE", // 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 - MAX_ZONE_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ZONE", //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 + MAX_ZONE_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROLE", // 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 + ADD_COLUMN_SCHEMA("ROLE", //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("MEMBER_LIST", // 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 - MAX_MEMBER_LIST_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("MEMBER_LIST", //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 + MAX_MEMBER_LIST_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROW_COUNT", // 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 + ADD_COLUMN_SCHEMA("ROW_COUNT", //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("DATA_SIZE", // 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 + ADD_COLUMN_SCHEMA("DATA_SIZE", //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("DATA_VERSION", // 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 + ADD_COLUMN_SCHEMA("DATA_VERSION", //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("DATA_CHECKSUM", // 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 + ADD_COLUMN_SCHEMA("DATA_CHECKSUM", //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("ROW_CHECKSUM", // 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 + ADD_COLUMN_SCHEMA("ROW_CHECKSUM", //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("COLUMN_CHECKSUM", // 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 - COLUMN_CHECKSUM_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COLUMN_CHECKSUM", //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 + COLUMN_CHECKSUM_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IS_ORIGINAL_LEADER", // 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 + ADD_COLUMN_SCHEMA("IS_ORIGINAL_LEADER", //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("IS_PREVIOUS_LEADER", // 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 + ADD_COLUMN_SCHEMA("IS_PREVIOUS_LEADER", //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("CREATE_TIME", // 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 + ADD_COLUMN_SCHEMA("CREATE_TIME", //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("REBUILD", // 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 + ADD_COLUMN_SCHEMA("REBUILD", //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("REPLICA_TYPE", // 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 + ADD_COLUMN_SCHEMA("REPLICA_TYPE", //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("REQUIRED_SIZE", // 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 + ADD_COLUMN_SCHEMA("REQUIRED_SIZE", //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("STATUS", // 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 - MAX_REPLICA_STATUS_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("STATUS", //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 + MAX_REPLICA_STATUS_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("IS_RESTORE", // 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 + ADD_COLUMN_SCHEMA("IS_RESTORE", //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("PARTITION_CHECKSUM", // 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 + ADD_COLUMN_SCHEMA("PARTITION_CHECKSUM", //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("QUORUM", // 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 + ADD_COLUMN_SCHEMA("QUORUM", //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("FAIL_LIST", // 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 - OB_MAX_FAILLIST_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("FAIL_LIST", //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 + OB_MAX_FAILLIST_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("RECOVERY_TIMESTAMP", // 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 + ADD_COLUMN_SCHEMA("RECOVERY_TIMESTAMP", //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("MEMSTORE_PERCENT", // 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 + ADD_COLUMN_SCHEMA("MEMSTORE_PERCENT", //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("DATA_FILE_ID", // 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 + ADD_COLUMN_SCHEMA("DATA_FILE_ID", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5624,17 +5605,16 @@ int ObInnerTableSchema::all_virtual_tenant_meta_table_real_agent_ora_schema(ObTa table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_time_zone_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_time_zone_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -5665,63 +5645,63 @@ int ObInnerTableSchema::all_virtual_tenant_time_zone_real_agent_ora_schema(ObTab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TIME_ZONE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TIME_ZONE_ID", //column_name + ++column_id, //column_id + 2, //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("USE_LEAP_SECONDS", // 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 - 8, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("USE_LEAP_SECONDS", //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 + 8, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VERSION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VERSION", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5731,17 +5711,16 @@ int ObInnerTableSchema::all_virtual_tenant_time_zone_real_agent_ora_schema(ObTab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_time_zone_name_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_time_zone_name_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -5772,63 +5751,63 @@ int ObInnerTableSchema::all_virtual_tenant_time_zone_name_real_agent_ora_schema( table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("NAME", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - 64, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("NAME", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + 64, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TIME_ZONE_ID", // 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 + ADD_COLUMN_SCHEMA("TIME_ZONE_ID", //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("VERSION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VERSION", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5838,22 +5817,20 @@ int ObInnerTableSchema::all_virtual_tenant_time_zone_name_real_agent_ora_schema( table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_time_zone_transition_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_time_zone_transition_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); - table_schema.set_table_id( - combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_REAL_AGENT_ORA_TID)); + table_schema.set_table_id(combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_REAL_AGENT_ORA_TID)); table_schema.set_rowkey_split_pos(0); table_schema.set_is_use_bloomfilter(false); table_schema.set_progressive_merge_num(0); @@ -5880,78 +5857,78 @@ int ObInnerTableSchema::all_virtual_tenant_time_zone_transition_real_agent_ora_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TIME_ZONE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TIME_ZONE_ID", //column_name + ++column_id, //column_id + 2, //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("TRANSITION_TIME", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("TRANSITION_TIME", //column_name + ++column_id, //column_id + 3, //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("TRANSITION_TYPE_ID", // 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 + ADD_COLUMN_SCHEMA("TRANSITION_TYPE_ID", //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("VERSION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VERSION", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5961,22 +5938,20 @@ int ObInnerTableSchema::all_virtual_tenant_time_zone_transition_real_agent_ora_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_tenant_time_zone_transition_type_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_tenant_time_zone_transition_type_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); - table_schema.set_table_id( - combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT_ORA_TID)); + table_schema.set_table_id(combine_id(OB_SYS_TENANT_ID, OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT_ORA_TID)); table_schema.set_rowkey_split_pos(0); table_schema.set_is_use_bloomfilter(false); table_schema.set_progressive_merge_num(0); @@ -6003,108 +5978,108 @@ int ObInnerTableSchema::all_virtual_tenant_time_zone_transition_type_real_agent_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("TIME_ZONE_ID", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("TIME_ZONE_ID", //column_name + ++column_id, //column_id + 2, //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("TRANSITION_TYPE_ID", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("TRANSITION_TYPE_ID", //column_name + ++column_id, //column_id + 3, //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("OFFSET", // 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 + ADD_COLUMN_SCHEMA("OFFSET", //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("IS_DST", // 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 + ADD_COLUMN_SCHEMA("IS_DST", //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("ABBREVIATION", // 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 - 8, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ABBREVIATION", //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 + 8, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VERSION", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VERSION", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6114,17 +6089,16 @@ int ObInnerTableSchema::all_virtual_tenant_time_zone_transition_type_real_agent_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_res_mgr_plan_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_res_mgr_plan_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -6155,78 +6129,78 @@ int ObInnerTableSchema::all_virtual_res_mgr_plan_real_agent_ora_schema(ObTableSc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("PLAN", // column_name - ++column_id, // column_id - 2, // 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 - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PLAN", //column_name + ++column_id, //column_id + 2, //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 + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENTS", // 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 - 2000, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENTS", //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 + 2000, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6236,17 +6210,16 @@ int ObInnerTableSchema::all_virtual_res_mgr_plan_real_agent_ora_schema(ObTableSc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_res_mgr_directive_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_res_mgr_directive_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -6277,123 +6250,123 @@ int ObInnerTableSchema::all_virtual_res_mgr_directive_real_agent_ora_schema(ObTa table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("PLAN", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_RESOURCE_PLAN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PLAN", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_RESOURCE_PLAN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GROUP_OR_SUBPLAN", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_RESOURCE_PLAN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GROUP_OR_SUBPLAN", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_RESOURCE_PLAN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("COMMENTS", // 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 - 2000, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENTS", //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 + 2000, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("MGMT_P1", // 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 + ADD_COLUMN_SCHEMA("MGMT_P1", //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("UTILIZATION_LIMIT", // 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 + ADD_COLUMN_SCHEMA("UTILIZATION_LIMIT", //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("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6403,17 +6376,16 @@ int ObInnerTableSchema::all_virtual_res_mgr_directive_real_agent_ora_schema(ObTa table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_trans_lock_stat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_trans_lock_stat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -6444,183 +6416,183 @@ int ObInnerTableSchema::all_virtual_trans_lock_stat_ora_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //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("TRANS_ID", // 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 - 512, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("TRANS_ID", //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 + 512, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_IP", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("SVR_IP", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SVR_PORT", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("SVR_PORT", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 2, //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("PARTITION", // 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 - 64, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PARTITION", //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 + 64, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TABLE_ID", // 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 + ADD_COLUMN_SCHEMA("TABLE_ID", //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("ROWKEY", // 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 - 512, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROWKEY", //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 + 512, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("SESSION_ID", // 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 + ADD_COLUMN_SCHEMA("SESSION_ID", //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("PROXY_ID", // 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 - 512, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("PROXY_ID", //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 + 512, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CTX_CREATE_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CTX_CREATE_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("EXPIRED_TIME", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("EXPIRED_TIME", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ROW_LOCK_ADDR", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ROW_LOCK_ADDR", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_HASH); @@ -6638,17 +6610,16 @@ int ObInnerTableSchema::all_virtual_trans_lock_stat_ora_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_res_mgr_mapping_rule_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_res_mgr_mapping_rule_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -6679,108 +6650,108 @@ int ObInnerTableSchema::all_virtual_res_mgr_mapping_rule_real_agent_ora_schema(O table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("ATTRIBUTE", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_RESOURCE_PLAN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ATTRIBUTE", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_RESOURCE_PLAN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("VALUE", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_BINARY, // column_collation_type - OB_MAX_RESOURCE_PLAN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("VALUE", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_BINARY, //column_collation_type + OB_MAX_RESOURCE_PLAN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CONSUMER_GROUP", // 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 - OB_MAX_RESOURCE_PLAN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CONSUMER_GROUP", //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 + OB_MAX_RESOURCE_PLAN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("STATUS", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("STATUS", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6790,17 +6761,16 @@ int ObInnerTableSchema::all_virtual_res_mgr_mapping_rule_real_agent_ora_schema(O table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_virtual_res_mgr_consumer_group_real_agent_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_virtual_res_mgr_consumer_group_real_agent_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -6831,93 +6801,93 @@ int ObInnerTableSchema::all_virtual_res_mgr_consumer_group_real_agent_ora_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("TENANT_ID", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("TENANT_ID", //column_name + ++column_id, //column_id + 1, //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("CONSUMER_GROUP", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_UTF8MB4_BIN, // column_collation_type - OB_MAX_RESOURCE_PLAN_NAME_LENGTH, // column_length - 2, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("CONSUMER_GROUP", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_MAX_RESOURCE_PLAN_NAME_LENGTH, //column_length + 2, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("CONSUMER_GROUP_ID", // 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 + ADD_COLUMN_SCHEMA("CONSUMER_GROUP_ID", //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("COMMENTS", // 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 - 2000, // column_length - 2, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("COMMENTS", //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 + 2000, //column_length + 2, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_CREATE", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_CREATE", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("GMT_MODIFIED", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampLTZType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("GMT_MODIFIED", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampLTZType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6927,10 +6897,10 @@ int ObInnerTableSchema::all_virtual_res_mgr_consumer_group_real_agent_ora_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.151_200.cpp b/src/share/inner_table/ob_inner_table_schema.151_200.cpp index 4719ba417..09807f362 100644 --- a/src/share/inner_table/ob_inner_table_schema.151_200.cpp +++ b/src/share/inner_table/ob_inner_table_schema.151_200.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::all_part_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_part_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -63,21 +65,21 @@ int ObInnerTableSchema::all_part_info_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -86,411 +88,411 @@ int ObInnerTableSchema::all_part_info_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_type", // 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 + ADD_COLUMN_SCHEMA("part_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_num", // 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 + ADD_COLUMN_SCHEMA("part_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_space", // 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 + ADD_COLUMN_SCHEMA("part_space", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_part_space", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_part_space", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_sub_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_sub_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_expr", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_expr", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_expr", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_expr", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_def_sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_def_sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_def_sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_def_sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -508,17 +510,16 @@ int ObInnerTableSchema::all_part_info_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_part_info_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_part_info_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -554,21 +555,21 @@ int ObInnerTableSchema::all_part_info_history_schema(ObTableSchema& table_schema gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -577,426 +578,426 @@ int ObInnerTableSchema::all_part_info_history_schema(ObTableSchema& table_schema gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_space", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_space", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_part_space", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_part_space", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_sub_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_sub_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_expr", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_expr", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_expr", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_expr", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_def_sub_part_interval", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_def_sub_part_interval", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_def_sub_interval_start", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_def_sub_interval_start", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -1014,17 +1015,16 @@ int ObInnerTableSchema::all_part_info_history_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_def_sub_part_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_def_sub_part_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1060,21 +1060,21 @@ int ObInnerTableSchema::all_def_sub_part_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -1083,337 +1083,337 @@ int ObInnerTableSchema::all_def_sub_part_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("sub_part_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { ObObj sub_part_name_default; sub_part_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sub_part_name", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - sub_part_name_default, - sub_part_name_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_name", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + sub_part_name_default, + sub_part_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_bound_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("high_bound_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_high_bound_val", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_high_bound_val", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("list_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("list_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_list_val", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_list_val", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_idx", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_idx", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj source_partition_id_default; source_partition_id_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("source_partition_id", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - source_partition_id_default, - source_partition_id_default); // default_value + ADD_COLUMN_SCHEMA_T("source_partition_id", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + source_partition_id_default, + source_partition_id_default); //default_value } if (OB_SUCC(ret)) { ObObj mapping_pg_sub_part_id_default; mapping_pg_sub_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("mapping_pg_sub_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - mapping_pg_sub_part_id_default, - mapping_pg_sub_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("mapping_pg_sub_part_id", //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 + true, //is_nullable + false, //is_autoincrement + mapping_pg_sub_part_id_default, + mapping_pg_sub_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -1431,17 +1431,16 @@ int ObInnerTableSchema::all_def_sub_part_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_def_sub_part_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_def_sub_part_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1477,21 +1476,21 @@ int ObInnerTableSchema::all_def_sub_part_history_schema(ObTableSchema& table_sch gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -1500,352 +1499,352 @@ int ObInnerTableSchema::all_def_sub_part_history_schema(ObTableSchema& table_sch gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("sub_part_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj sub_part_name_default; sub_part_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sub_part_name", // 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 - OB_MAX_PARTITION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - sub_part_name_default, - sub_part_name_default); // default_value + ADD_COLUMN_SCHEMA_T("sub_part_name", //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 + OB_MAX_PARTITION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + sub_part_name_default, + sub_part_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("high_bound_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("high_bound_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_high_bound_val", // 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 - OB_MAX_B_HIGH_BOUND_VAL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_high_bound_val", //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 + OB_MAX_B_HIGH_BOUND_VAL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare1", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare1", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare2", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare2", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("spare3", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("spare3", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - OB_MAX_PARTITION_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + OB_MAX_PARTITION_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("list_val", // 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 - OB_MAX_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("list_val", //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 + OB_MAX_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_list_val", // 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 - OB_MAX_B_PARTITION_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_list_val", //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 + OB_MAX_B_PARTITION_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_idx", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_idx", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj source_partition_id_default; source_partition_id_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("source_partition_id", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - source_partition_id_default, - source_partition_id_default); // default_value + ADD_COLUMN_SCHEMA_T("source_partition_id", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + source_partition_id_default, + source_partition_id_default); //default_value } if (OB_SUCC(ret)) { ObObj mapping_pg_sub_part_id_default; mapping_pg_sub_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("mapping_pg_sub_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - mapping_pg_sub_part_id_default, - mapping_pg_sub_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("mapping_pg_sub_part_id", //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 + true, //is_nullable + false, //is_autoincrement + mapping_pg_sub_part_id_default, + mapping_pg_sub_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - true, // is_nullable - false, // is_autoincrement - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + true, //is_nullable + false, //is_autoincrement + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -1863,17 +1862,16 @@ int ObInnerTableSchema::all_def_sub_part_history_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_server_event_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_server_event_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1909,324 +1907,324 @@ int ObInnerTableSchema::all_server_event_history_schema(ObTableSchema& table_sch gmt_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - 6, // column_scale - false, // is_nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_default_null, - gmt_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + 6, //column_scale + false, //is_nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_default_null, + gmt_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("module", // 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 - MAX_ROOTSERVICE_EVENT_DESC_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("module", //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 + MAX_ROOTSERVICE_EVENT_DESC_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("event", // 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 - MAX_ROOTSERVICE_EVENT_DESC_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("event", //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 + MAX_ROOTSERVICE_EVENT_DESC_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj name1_default; name1_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name1", // 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 - MAX_ROOTSERVICE_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - name1_default, - name1_default); // default_value + ADD_COLUMN_SCHEMA_T("name1", //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 + MAX_ROOTSERVICE_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + name1_default, + name1_default); //default_value } if (OB_SUCC(ret)) { ObObj value1_default; value1_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("value1", // 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 - MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - value1_default, - value1_default); // default_value + ADD_COLUMN_SCHEMA_T("value1", //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 + MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + value1_default, + value1_default); //default_value } if (OB_SUCC(ret)) { ObObj name2_default; name2_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name2", // 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 - MAX_ROOTSERVICE_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - name2_default, - name2_default); // default_value + ADD_COLUMN_SCHEMA_T("name2", //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 + MAX_ROOTSERVICE_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + name2_default, + name2_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value2", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value2", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj name3_default; name3_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name3", // 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 - MAX_ROOTSERVICE_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - name3_default, - name3_default); // default_value + ADD_COLUMN_SCHEMA_T("name3", //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 + MAX_ROOTSERVICE_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + name3_default, + name3_default); //default_value } if (OB_SUCC(ret)) { ObObj value3_default; value3_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("value3", // 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 - MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - value3_default, - value3_default); // default_value + ADD_COLUMN_SCHEMA_T("value3", //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 + MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + value3_default, + value3_default); //default_value } if (OB_SUCC(ret)) { ObObj name4_default; name4_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name4", // 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 - MAX_ROOTSERVICE_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - name4_default, - name4_default); // default_value + ADD_COLUMN_SCHEMA_T("name4", //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 + MAX_ROOTSERVICE_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + name4_default, + name4_default); //default_value } if (OB_SUCC(ret)) { ObObj value4_default; value4_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("value4", // 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 - MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - value4_default, - value4_default); // default_value + ADD_COLUMN_SCHEMA_T("value4", //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 + MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + value4_default, + value4_default); //default_value } if (OB_SUCC(ret)) { ObObj name5_default; name5_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name5", // 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 - MAX_ROOTSERVICE_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - name5_default, - name5_default); // default_value + ADD_COLUMN_SCHEMA_T("name5", //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 + MAX_ROOTSERVICE_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + name5_default, + name5_default); //default_value } if (OB_SUCC(ret)) { ObObj value5_default; value5_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("value5", // 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 - MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - value5_default, - value5_default); // default_value + ADD_COLUMN_SCHEMA_T("value5", //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 + MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + value5_default, + value5_default); //default_value } if (OB_SUCC(ret)) { ObObj name6_default; name6_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name6", // 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 - MAX_ROOTSERVICE_EVENT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - name6_default, - name6_default); // default_value + ADD_COLUMN_SCHEMA_T("name6", //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 + MAX_ROOTSERVICE_EVENT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + name6_default, + name6_default); //default_value } if (OB_SUCC(ret)) { ObObj value6_default; value6_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("value6", // 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 - MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - value6_default, - value6_default); // default_value + ADD_COLUMN_SCHEMA_T("value6", //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 + MAX_ROOTSERVICE_EVENT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + value6_default, + value6_default); //default_value } if (OB_SUCC(ret)) { ObObj extra_info_default; extra_info_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("extra_info", // 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 - MAX_ROOTSERVICE_EVENT_EXTRA_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - extra_info_default, - extra_info_default); // default_value + ADD_COLUMN_SCHEMA_T("extra_info", //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 + MAX_ROOTSERVICE_EVENT_EXTRA_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + extra_info_default, + extra_info_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -2244,17 +2242,16 @@ int ObInnerTableSchema::all_server_event_history_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_rootservice_job_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_rootservice_job_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2290,21 +2287,21 @@ int ObInnerTableSchema::all_rootservice_job_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2313,355 +2310,355 @@ int ObInnerTableSchema::all_rootservice_job_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_type", // 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 + ADD_COLUMN_SCHEMA("job_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_status", // 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 + ADD_COLUMN_SCHEMA("job_status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("return_code", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("return_code", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj progress_default; progress_default.set_int(0); - ADD_COLUMN_SCHEMA_T("progress", // 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 - progress_default, - progress_default); // default_value + ADD_COLUMN_SCHEMA_T("progress", //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 + progress_default, + progress_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_name", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_name", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_name", // 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 - OB_MAX_CORE_TALBE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_name", //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 + OB_MAX_CORE_TALBE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_port", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("unit_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rs_svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("rs_svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rs_svr_port", // 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 + ADD_COLUMN_SCHEMA("rs_svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_text", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_text", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("extra_info", // 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 - MAX_ROOTSERVICE_EVENT_EXTRA_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("extra_info", //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 + MAX_ROOTSERVICE_EVENT_EXTRA_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("resource_pool_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("resource_pool_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tablegroup_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_name", // 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 - OB_MAX_TABLEGROUP_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tablegroup_name", //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 + OB_MAX_TABLEGROUP_NAME_LENGTH, //column_length + -1, //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(FLAT_ROW_STORE); @@ -2671,17 +2668,16 @@ int ObInnerTableSchema::all_rootservice_job_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_unit_load_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_unit_load_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2717,261 +2713,261 @@ int ObInnerTableSchema::all_unit_load_history_schema(ObTableSchema& table_schema gmt_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - 6, // column_scale - false, // is_nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_default_null, - gmt_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + 6, //column_scale + false, //is_nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_default_null, + gmt_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_port", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_id", // 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 + ADD_COLUMN_SCHEMA("unit_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("load", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("load", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_usage_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("disk_usage_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memory_usage_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("memory_usage_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_usage_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_usage_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("iops_usage_rate", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("iops_usage_rate", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("disk_weight", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("disk_weight", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memory_weight", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("memory_weight", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cpu_weight", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cpu_weight", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("iops_weight", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("iops_weight", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rs_svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("rs_svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rs_svr_port", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("rs_svr_port", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2981,17 +2977,16 @@ int ObInnerTableSchema::all_unit_load_history_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_sys_variable_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_sys_variable_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3027,21 +3022,21 @@ int ObInnerTableSchema::all_sys_variable_history_schema(ObTableSchema& table_sch gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -3050,198 +3045,198 @@ int ObInnerTableSchema::all_sys_variable_history_schema(ObTableSchema& table_sch gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj name_default; name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_CONFIG_NAME_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - name_default, - name_default); // default_value + ADD_COLUMN_SCHEMA_T("name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_CONFIG_NAME_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + name_default, + name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 + ADD_COLUMN_SCHEMA("data_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_CONFIG_INFO_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_CONFIG_INFO_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flags", // 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 + ADD_COLUMN_SCHEMA("flags", //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 } if (OB_SUCC(ret)) { ObObj min_val_default; min_val_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("min_val", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - min_val_default, - min_val_default); // default_value + ADD_COLUMN_SCHEMA_T("min_val", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + min_val_default, + min_val_default); //default_value } if (OB_SUCC(ret)) { ObObj max_val_default; max_val_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("max_val", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - max_val_default, - max_val_default); // default_value + ADD_COLUMN_SCHEMA_T("max_val", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + max_val_default, + max_val_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -3259,17 +3254,16 @@ int ObInnerTableSchema::all_sys_variable_history_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_restore_job_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_restore_job_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3305,21 +3299,21 @@ int ObInnerTableSchema::all_restore_job_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -3328,141 +3322,141 @@ int ObInnerTableSchema::all_restore_job_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_time", // 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 + ADD_COLUMN_SCHEMA("start_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_uri", // 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 - 2048, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_uri", //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 + 2048, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_end_time", // 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 + ADD_COLUMN_SCHEMA("backup_end_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("recycle_end_time", // 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 + ADD_COLUMN_SCHEMA("recycle_end_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("level", // 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 + ADD_COLUMN_SCHEMA("level", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 + ADD_COLUMN_SCHEMA("status", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3472,17 +3466,16 @@ int ObInnerTableSchema::all_restore_job_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_restore_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_restore_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3518,21 +3511,21 @@ int ObInnerTableSchema::all_restore_task_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -3541,141 +3534,141 @@ int ObInnerTableSchema::all_restore_task_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_table_id", // 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 + ADD_COLUMN_SCHEMA("backup_table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_map", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("index_map", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_time", // 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 + ADD_COLUMN_SCHEMA("start_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 + ADD_COLUMN_SCHEMA("status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // 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 + ADD_COLUMN_SCHEMA("job_id", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3685,17 +3678,16 @@ int ObInnerTableSchema::all_restore_task_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_restore_job_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_restore_job_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3731,21 +3723,21 @@ int ObInnerTableSchema::all_restore_job_history_schema(ObTableSchema& table_sche gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -3754,141 +3746,141 @@ int ObInnerTableSchema::all_restore_job_history_schema(ObTableSchema& table_sche gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_time", // 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 + ADD_COLUMN_SCHEMA("start_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_uri", // 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 - 2048, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_uri", //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 + 2048, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_end_time", // 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 + ADD_COLUMN_SCHEMA("backup_end_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("recycle_end_time", // 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 + ADD_COLUMN_SCHEMA("recycle_end_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("level", // 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 + ADD_COLUMN_SCHEMA("level", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 + ADD_COLUMN_SCHEMA("status", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3898,17 +3890,16 @@ int ObInnerTableSchema::all_restore_job_history_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_time_zone_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_time_zone_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3941,54 +3932,54 @@ int ObInnerTableSchema::all_time_zone_schema(ObTableSchema& table_schema) if (OB_SUCC(ret)) { ObObj time_zone_id_default; time_zone_id_default.set_null(); - ADD_COLUMN_SCHEMA_T("Time_zone_id", // column_name - ++column_id, // column_id - 1, // 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 - true, // is_autoincrement - time_zone_id_default, - time_zone_id_default); // default_value + ADD_COLUMN_SCHEMA_T("Time_zone_id", //column_name + ++column_id, //column_id + 1, //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 + true, //is_autoincrement + time_zone_id_default, + time_zone_id_default); //default_value } if (OB_SUCC(ret)) { ObObj use_leap_seconds_default; use_leap_seconds_default.set_varchar(ObString::make_string("N")); - ADD_COLUMN_SCHEMA_T("Use_leap_seconds", // 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 - 8, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - use_leap_seconds_default, - use_leap_seconds_default); // default_value + ADD_COLUMN_SCHEMA_T("Use_leap_seconds", //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 + 8, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + use_leap_seconds_default, + use_leap_seconds_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("Version", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3998,17 +3989,16 @@ int ObInnerTableSchema::all_time_zone_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_time_zone_name_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_time_zone_name_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4039,48 +4029,48 @@ int ObInnerTableSchema::all_time_zone_name_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Name", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("Name", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Time_zone_id", // 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 + ADD_COLUMN_SCHEMA("Time_zone_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("Version", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4090,17 +4080,16 @@ int ObInnerTableSchema::all_time_zone_name_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_time_zone_transition_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_time_zone_transition_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4131,63 +4120,63 @@ int ObInnerTableSchema::all_time_zone_transition_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Time_zone_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("Time_zone_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Transition_time", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("Transition_time", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Transition_type_id", // 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 + ADD_COLUMN_SCHEMA("Transition_type_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("Version", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4197,17 +4186,16 @@ int ObInnerTableSchema::all_time_zone_transition_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_time_zone_transition_type_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_time_zone_transition_type_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4238,105 +4226,105 @@ int ObInnerTableSchema::all_time_zone_transition_type_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Time_zone_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("Time_zone_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Transition_type_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("Transition_type_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { ObObj offset_default; offset_default.set_int(0); - ADD_COLUMN_SCHEMA_T("Offset", // 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 - offset_default, - offset_default); // default_value + ADD_COLUMN_SCHEMA_T("Offset", //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 + offset_default, + offset_default); //default_value } if (OB_SUCC(ret)) { ObObj is_dst_default; is_dst_default.set_int(0); - ADD_COLUMN_SCHEMA_T("Is_DST", // 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 - is_dst_default, - is_dst_default); // default_value + ADD_COLUMN_SCHEMA_T("Is_DST", //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 + is_dst_default, + is_dst_default); //default_value } if (OB_SUCC(ret)) { ObObj abbreviation_default; abbreviation_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("Abbreviation", // 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 - 8, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - abbreviation_default, - abbreviation_default); // default_value + ADD_COLUMN_SCHEMA_T("Abbreviation", //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 + 8, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + abbreviation_default, + abbreviation_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("Version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("Version", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4346,17 +4334,16 @@ int ObInnerTableSchema::all_time_zone_transition_type_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_ddl_id_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_ddl_id_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4392,21 +4379,21 @@ int ObInnerTableSchema::all_ddl_id_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -4415,66 +4402,66 @@ int ObInnerTableSchema::all_ddl_id_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ddl_id_str", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_DDL_ID_STR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ddl_id_str", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_DDL_ID_STR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ddl_stmt_str", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ddl_stmt_str", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -4492,17 +4479,16 @@ int ObInnerTableSchema::all_ddl_id_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_foreign_key_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_foreign_key_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4538,21 +4524,21 @@ int ObInnerTableSchema::all_foreign_key_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -4561,225 +4547,225 @@ int ObInnerTableSchema::all_foreign_key_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("foreign_key_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("foreign_key_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { ObObj foreign_key_name_default; foreign_key_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("foreign_key_name", // 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 - OB_MAX_CONSTRAINT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - foreign_key_name_default, - foreign_key_name_default); // default_value + ADD_COLUMN_SCHEMA_T("foreign_key_name", //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 + OB_MAX_CONSTRAINT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + foreign_key_name_default, + foreign_key_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("child_table_id", // 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 + ADD_COLUMN_SCHEMA("child_table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parent_table_id", // 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 + ADD_COLUMN_SCHEMA("parent_table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("update_action", // 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 + ADD_COLUMN_SCHEMA("update_action", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("delete_action", // 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 + ADD_COLUMN_SCHEMA("delete_action", //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 } if (OB_SUCC(ret)) { ObObj enable_flag_default; enable_flag_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("enable_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - enable_flag_default, - enable_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("enable_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + enable_flag_default, + enable_flag_default); //default_value } if (OB_SUCC(ret)) { ObObj ref_cst_type_default; ref_cst_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("ref_cst_type", // 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 - ref_cst_type_default, - ref_cst_type_default); // default_value + ADD_COLUMN_SCHEMA_T("ref_cst_type", //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 + ref_cst_type_default, + ref_cst_type_default); //default_value } if (OB_SUCC(ret)) { ObObj ref_cst_id_default; ref_cst_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("ref_cst_id", // 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 - ref_cst_id_default, - ref_cst_id_default); // default_value + ADD_COLUMN_SCHEMA_T("ref_cst_id", //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 + ref_cst_id_default, + ref_cst_id_default); //default_value } if (OB_SUCC(ret)) { ObObj validate_flag_default; validate_flag_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("validate_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - validate_flag_default, - validate_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("validate_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + validate_flag_default, + validate_flag_default); //default_value } if (OB_SUCC(ret)) { ObObj rely_flag_default; rely_flag_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("rely_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - rely_flag_default, - rely_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("rely_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + rely_flag_default, + rely_flag_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -4797,17 +4783,16 @@ int ObInnerTableSchema::all_foreign_key_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_foreign_key_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_foreign_key_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4843,21 +4828,21 @@ int ObInnerTableSchema::all_foreign_key_history_schema(ObTableSchema& table_sche gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -4866,255 +4851,255 @@ int ObInnerTableSchema::all_foreign_key_history_schema(ObTableSchema& table_sche gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("foreign_key_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("foreign_key_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj foreign_key_name_default; foreign_key_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("foreign_key_name", // 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 - OB_MAX_CONSTRAINT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - foreign_key_name_default, - foreign_key_name_default); // default_value + ADD_COLUMN_SCHEMA_T("foreign_key_name", //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 + OB_MAX_CONSTRAINT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + foreign_key_name_default, + foreign_key_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("child_table_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("child_table_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parent_table_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parent_table_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("update_action", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("update_action", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("delete_action", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("delete_action", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj enable_flag_default; enable_flag_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("enable_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - enable_flag_default, - enable_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("enable_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + enable_flag_default, + enable_flag_default); //default_value } if (OB_SUCC(ret)) { ObObj ref_cst_type_default; ref_cst_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("ref_cst_type", // 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 - true, // is_nullable - false, // is_autoincrement - ref_cst_type_default, - ref_cst_type_default); // default_value + ADD_COLUMN_SCHEMA_T("ref_cst_type", //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 + true, //is_nullable + false, //is_autoincrement + ref_cst_type_default, + ref_cst_type_default); //default_value } if (OB_SUCC(ret)) { ObObj ref_cst_id_default; ref_cst_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("ref_cst_id", // 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 - true, // is_nullable - false, // is_autoincrement - ref_cst_id_default, - ref_cst_id_default); // default_value + ADD_COLUMN_SCHEMA_T("ref_cst_id", //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 + true, //is_nullable + false, //is_autoincrement + ref_cst_id_default, + ref_cst_id_default); //default_value } if (OB_SUCC(ret)) { ObObj validate_flag_default; validate_flag_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("validate_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - validate_flag_default, - validate_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("validate_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + validate_flag_default, + validate_flag_default); //default_value } if (OB_SUCC(ret)) { ObObj rely_flag_default; rely_flag_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("rely_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - rely_flag_default, - rely_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("rely_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + rely_flag_default, + rely_flag_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -5132,17 +5117,16 @@ int ObInnerTableSchema::all_foreign_key_history_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_foreign_key_column_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_foreign_key_column_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5178,21 +5162,21 @@ int ObInnerTableSchema::all_foreign_key_column_schema(ObTableSchema& table_schem gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -5201,100 +5185,100 @@ int ObInnerTableSchema::all_foreign_key_column_schema(ObTableSchema& table_schem gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("foreign_key_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("foreign_key_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("child_column_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("child_column_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parent_column_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("parent_column_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { ObObj position_default; position_default.set_int(0); - ADD_COLUMN_SCHEMA_T("position", // 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 - position_default, - position_default); // default_value + ADD_COLUMN_SCHEMA_T("position", //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 + position_default, + position_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -5312,17 +5296,16 @@ int ObInnerTableSchema::all_foreign_key_column_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_foreign_key_column_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_foreign_key_column_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5358,21 +5341,21 @@ int ObInnerTableSchema::all_foreign_key_column_history_schema(ObTableSchema& tab gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -5381,130 +5364,130 @@ int ObInnerTableSchema::all_foreign_key_column_history_schema(ObTableSchema& tab gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("foreign_key_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("foreign_key_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("child_column_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("child_column_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parent_column_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("parent_column_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj position_default; position_default.set_int(0); - ADD_COLUMN_SCHEMA_T("position", // 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 - true, // is_nullable - false, // is_autoincrement - position_default, - position_default); // default_value + ADD_COLUMN_SCHEMA_T("position", //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 + true, //is_nullable + false, //is_autoincrement + position_default, + position_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -5522,17 +5505,16 @@ int ObInnerTableSchema::all_foreign_key_column_history_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_synonym_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_synonym_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5568,21 +5550,21 @@ int ObInnerTableSchema::all_synonym_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -5591,134 +5573,134 @@ int ObInnerTableSchema::all_synonym_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("synonym_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("synonym_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { ObObj synonym_name_default; synonym_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("synonym_name", // 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 - OB_MAX_SYNONYM_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - synonym_name_default, - synonym_name_default); // default_value + ADD_COLUMN_SCHEMA_T("synonym_name", //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 + OB_MAX_SYNONYM_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + synonym_name_default, + synonym_name_default); //default_value } if (OB_SUCC(ret)) { ObObj object_name_default; object_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("object_name", // 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 - OB_MAX_SYNONYM_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - object_name_default, - object_name_default); // default_value + ADD_COLUMN_SCHEMA_T("object_name", //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 + OB_MAX_SYNONYM_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + object_name_default, + object_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_database_id", // 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 + ADD_COLUMN_SCHEMA("object_database_id", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -5736,17 +5718,16 @@ int ObInnerTableSchema::all_synonym_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_synonym_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_synonym_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5782,21 +5763,21 @@ int ObInnerTableSchema::all_synonym_history_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -5805,149 +5786,149 @@ int ObInnerTableSchema::all_synonym_history_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("synonym_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("synonym_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj synonym_name_default; synonym_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("synonym_name", // 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 - OB_MAX_SYNONYM_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - synonym_name_default, - synonym_name_default); // default_value + ADD_COLUMN_SCHEMA_T("synonym_name", //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 + OB_MAX_SYNONYM_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + synonym_name_default, + synonym_name_default); //default_value } if (OB_SUCC(ret)) { ObObj object_name_default; object_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("object_name", // 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 - OB_MAX_SYNONYM_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - object_name_default, - object_name_default); // default_value + ADD_COLUMN_SCHEMA_T("object_name", //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 + OB_MAX_SYNONYM_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + object_name_default, + object_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("object_database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -5965,17 +5946,16 @@ int ObInnerTableSchema::all_synonym_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_sequence_v2_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_sequence_v2_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6011,21 +5991,21 @@ int ObInnerTableSchema::all_sequence_v2_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -6034,111 +6014,111 @@ int ObInnerTableSchema::all_sequence_v2_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_key", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("sequence_key", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_name", // 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 - OB_MAX_SEQUENCE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sequence_name", //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 + OB_MAX_SEQUENCE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_value", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sequence_value", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sync_value", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sync_value", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6148,17 +6128,16 @@ int ObInnerTableSchema::all_sequence_v2_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_meta_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_meta_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6194,21 +6173,21 @@ int ObInnerTableSchema::all_tenant_meta_table_schema(ObTableSchema& table_schema gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -6217,538 +6196,538 @@ int ObInnerTableSchema::all_tenant_meta_table_schema(ObTableSchema& table_schema gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_port", // 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 + ADD_COLUMN_SCHEMA("sql_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_id", // 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 + ADD_COLUMN_SCHEMA("unit_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role", // 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 + ADD_COLUMN_SCHEMA("role", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("member_list", // 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 - MAX_MEMBER_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("member_list", //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 + MAX_MEMBER_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_count", // 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 + ADD_COLUMN_SCHEMA("row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_size", // 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 + ADD_COLUMN_SCHEMA("data_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_version", // 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 + ADD_COLUMN_SCHEMA("data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_checksum", // 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 + ADD_COLUMN_SCHEMA("data_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_checksum", // 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 + ADD_COLUMN_SCHEMA("row_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_checksum", // 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 - COLUMN_CHECKSUM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("column_checksum", //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 + COLUMN_CHECKSUM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj is_original_leader_default; is_original_leader_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_original_leader", // 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 - is_original_leader_default, - is_original_leader_default); // default_value + ADD_COLUMN_SCHEMA_T("is_original_leader", //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 + is_original_leader_default, + is_original_leader_default); //default_value } if (OB_SUCC(ret)) { ObObj is_previous_leader_default; is_previous_leader_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_previous_leader", // 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 - is_previous_leader_default, - is_previous_leader_default); // default_value + ADD_COLUMN_SCHEMA_T("is_previous_leader", //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 + is_previous_leader_default, + is_previous_leader_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_time", // 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 + ADD_COLUMN_SCHEMA("create_time", //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 } if (OB_SUCC(ret)) { ObObj rebuild_default; rebuild_default.set_int(0); - ADD_COLUMN_SCHEMA_T("rebuild", // 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 - rebuild_default, - rebuild_default); // default_value + ADD_COLUMN_SCHEMA_T("rebuild", //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 + rebuild_default, + rebuild_default); //default_value } if (OB_SUCC(ret)) { ObObj replica_type_default; replica_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("replica_type", // 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 - replica_type_default, - replica_type_default); // default_value + ADD_COLUMN_SCHEMA_T("replica_type", //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 + replica_type_default, + replica_type_default); //default_value } if (OB_SUCC(ret)) { ObObj required_size_default; required_size_default.set_int(0); - ADD_COLUMN_SCHEMA_T("required_size", // 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 - required_size_default, - required_size_default); // default_value + ADD_COLUMN_SCHEMA_T("required_size", //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 + required_size_default, + required_size_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("REPLICA_STATUS_NORMAL")); - ADD_COLUMN_SCHEMA_T("status", // 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 - MAX_REPLICA_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + MAX_REPLICA_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { ObObj is_restore_default; is_restore_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_restore", // 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 - is_restore_default, - is_restore_default); // default_value + ADD_COLUMN_SCHEMA_T("is_restore", //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 + is_restore_default, + is_restore_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_checksum_default; partition_checksum_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_checksum", // 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 - partition_checksum_default, - partition_checksum_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_checksum", //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 + partition_checksum_default, + partition_checksum_default); //default_value } if (OB_SUCC(ret)) { ObObj quorum_default; quorum_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("quorum", // 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 - quorum_default, - quorum_default); // default_value + ADD_COLUMN_SCHEMA_T("quorum", //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 + quorum_default, + quorum_default); //default_value } if (OB_SUCC(ret)) { ObObj fail_list_default; fail_list_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("fail_list", // 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 - OB_MAX_FAILLIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - fail_list_default, - fail_list_default); // default_value + ADD_COLUMN_SCHEMA_T("fail_list", //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 + OB_MAX_FAILLIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + fail_list_default, + fail_list_default); //default_value } if (OB_SUCC(ret)) { ObObj recovery_timestamp_default; recovery_timestamp_default.set_int(0); - ADD_COLUMN_SCHEMA_T("recovery_timestamp", // 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 - recovery_timestamp_default, - recovery_timestamp_default); // default_value + ADD_COLUMN_SCHEMA_T("recovery_timestamp", //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 + recovery_timestamp_default, + recovery_timestamp_default); //default_value } if (OB_SUCC(ret)) { ObObj memstore_percent_default; memstore_percent_default.set_int(100); - ADD_COLUMN_SCHEMA_T("memstore_percent", // 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 - memstore_percent_default, - memstore_percent_default); // default_value + ADD_COLUMN_SCHEMA_T("memstore_percent", //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 + memstore_percent_default, + memstore_percent_default); //default_value } if (OB_SUCC(ret)) { ObObj data_file_id_default; data_file_id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("data_file_id", // 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 - data_file_id_default, - data_file_id_default); // default_value + ADD_COLUMN_SCHEMA_T("data_file_id", //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 + data_file_id_default, + data_file_id_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6758,17 +6737,16 @@ int ObInnerTableSchema::all_tenant_meta_table_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_index_wait_transaction_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_index_wait_transaction_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6804,21 +6782,21 @@ int ObInnerTableSchema::all_index_wait_transaction_status_schema(ObTableSchema& gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -6827,171 +6805,171 @@ int ObInnerTableSchema::all_index_wait_transaction_status_schema(ObTableSchema& gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("index_table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_type", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("svr_type", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_status", // 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 + ADD_COLUMN_SCHEMA("trans_status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("frozen_version", // 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 + ADD_COLUMN_SCHEMA("frozen_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -7009,17 +6987,16 @@ int ObInnerTableSchema::all_index_wait_transaction_status_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_index_schedule_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_index_schedule_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7055,21 +7032,21 @@ int ObInnerTableSchema::all_index_schedule_task_schema(ObTableSchema& table_sche gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -7078,126 +7055,126 @@ int ObInnerTableSchema::all_index_schedule_task_schema(ObTableSchema& table_sche gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("index_table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("frozen_version", // 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 + ADD_COLUMN_SCHEMA("frozen_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -7215,17 +7192,16 @@ int ObInnerTableSchema::all_index_schedule_task_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_index_checksum_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_index_checksum_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7261,21 +7237,21 @@ int ObInnerTableSchema::all_index_checksum_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -7284,145 +7260,145 @@ int ObInnerTableSchema::all_index_checksum_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("execution_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("execution_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_id", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("task_id", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("checksum", // 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 + ADD_COLUMN_SCHEMA("checksum", //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 } if (OB_SUCC(ret)) { ObObj checksum_method_default; checksum_method_default.set_int(0); - ADD_COLUMN_SCHEMA_T("checksum_method", // 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 - checksum_method_default, - checksum_method_default); // default_value + ADD_COLUMN_SCHEMA_T("checksum_method", //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 + checksum_method_default, + checksum_method_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -7440,17 +7416,16 @@ int ObInnerTableSchema::all_index_checksum_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_routine_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_routine_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7486,21 +7461,21 @@ int ObInnerTableSchema::all_routine_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -7509,276 +7484,276 @@ int ObInnerTableSchema::all_routine_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("routine_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_id", // 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 + ADD_COLUMN_SCHEMA("package_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_name", // 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 - OB_MAX_ROUTINE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("routine_name", //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 + OB_MAX_ROUTINE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("overload", // 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 + ADD_COLUMN_SCHEMA("overload", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subprogram_id", // 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 + ADD_COLUMN_SCHEMA("subprogram_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_type", // 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 + ADD_COLUMN_SCHEMA("routine_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flag", // 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 + ADD_COLUMN_SCHEMA("flag", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 + ADD_COLUMN_SCHEMA("owner_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_user", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("priv_user", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comp_flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comp_flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("exec_env", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("exec_env", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_body", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("routine_body", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("route_sql", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("route_sql", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -7796,17 +7771,16 @@ int ObInnerTableSchema::all_routine_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_routine_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_routine_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7842,21 +7816,21 @@ int ObInnerTableSchema::all_routine_history_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -7865,291 +7839,291 @@ int ObInnerTableSchema::all_routine_history_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("routine_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_name", // 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 - OB_MAX_ROUTINE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("routine_name", //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 + OB_MAX_ROUTINE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("overload", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("overload", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subprogram_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("subprogram_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("routine_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_user", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("priv_user", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comp_flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comp_flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("exec_env", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("exec_env", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_body", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("routine_body", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("route_sql", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("route_sql", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -8167,17 +8141,16 @@ int ObInnerTableSchema::all_routine_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_routine_param_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_routine_param_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8213,21 +8186,21 @@ int ObInnerTableSchema::all_routine_param_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -8236,352 +8209,352 @@ int ObInnerTableSchema::all_routine_param_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("routine_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("sequence", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subprogram_id", // 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 + ADD_COLUMN_SCHEMA("subprogram_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_position", // 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 + ADD_COLUMN_SCHEMA("param_position", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_level", // 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 + ADD_COLUMN_SCHEMA("param_level", //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 } if (OB_SUCC(ret)) { ObObj param_name_default; param_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("param_name", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - param_name_default, - param_name_default); // default_value + ADD_COLUMN_SCHEMA_T("param_name", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + param_name_default, + param_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_type", // 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 + ADD_COLUMN_SCHEMA("param_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_length", // 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 + ADD_COLUMN_SCHEMA("param_length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_precision", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_precision", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_scale", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_scale", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_zero_fill", // 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 + ADD_COLUMN_SCHEMA("param_zero_fill", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_charset", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_charset", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_coll_type", // 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 + ADD_COLUMN_SCHEMA("param_coll_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flag", // 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 + ADD_COLUMN_SCHEMA("flag", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("default_value", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("default_value", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_owner", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type_owner", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj type_name_default; type_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("type_name", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - type_name_default, - type_name_default); // default_value + ADD_COLUMN_SCHEMA_T("type_name", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + type_name_default, + type_name_default); //default_value } if (OB_SUCC(ret)) { ObObj type_subname_default; type_subname_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("type_subname", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - type_subname_default, - type_subname_default); // default_value + ADD_COLUMN_SCHEMA_T("type_subname", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + type_subname_default, + type_subname_default); //default_value } if (OB_SUCC(ret)) { ObObj extended_type_info_default; extended_type_info_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("extended_type_info", // 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_VARBINARY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - extended_type_info_default, - extended_type_info_default); // default_value + ADD_COLUMN_SCHEMA_T("extended_type_info", //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_VARBINARY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + extended_type_info_default, + extended_type_info_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -8599,17 +8572,16 @@ int ObInnerTableSchema::all_routine_param_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_routine_param_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_routine_param_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8645,21 +8617,21 @@ int ObInnerTableSchema::all_routine_param_history_schema(ObTableSchema& table_sc gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -8668,367 +8640,367 @@ int ObInnerTableSchema::all_routine_param_history_schema(ObTableSchema& table_sc gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("routine_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("routine_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("sequence", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subprogram_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("subprogram_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_position", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_position", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_level", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_level", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj param_name_default; param_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("param_name", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - param_name_default, - param_name_default); // default_value + ADD_COLUMN_SCHEMA_T("param_name", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + param_name_default, + param_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_length", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_length", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_precision", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_precision", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_scale", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_scale", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_zero_fill", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_zero_fill", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_charset", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_charset", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param_coll_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param_coll_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("default_value", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("default_value", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_owner", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type_owner", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj type_name_default; type_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("type_name", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - type_name_default, - type_name_default); // default_value + ADD_COLUMN_SCHEMA_T("type_name", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + type_name_default, + type_name_default); //default_value } if (OB_SUCC(ret)) { ObObj type_subname_default; type_subname_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("type_subname", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - type_subname_default, - type_subname_default); // default_value + ADD_COLUMN_SCHEMA_T("type_subname", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + type_subname_default, + type_subname_default); //default_value } if (OB_SUCC(ret)) { ObObj extended_type_info_default; extended_type_info_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("extended_type_info", // 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_VARBINARY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - extended_type_info_default, - extended_type_info_default); // default_value + ADD_COLUMN_SCHEMA_T("extended_type_info", //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_VARBINARY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + extended_type_info_default, + extended_type_info_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -9046,17 +9018,16 @@ int ObInnerTableSchema::all_routine_param_history_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_table_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_table_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9092,21 +9063,21 @@ int ObInnerTableSchema::all_table_stat_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -9115,187 +9086,187 @@ int ObInnerTableSchema::all_table_stat_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_type", // 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 + ADD_COLUMN_SCHEMA("object_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("last_analyzed", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("last_analyzed", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sstable_row_cnt", // 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 + ADD_COLUMN_SCHEMA("sstable_row_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sstable_avg_row_len", // 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 + ADD_COLUMN_SCHEMA("sstable_avg_row_len", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_blk_cnt", // 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 + ADD_COLUMN_SCHEMA("macro_blk_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("micro_blk_cnt", // 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 + ADD_COLUMN_SCHEMA("micro_blk_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memtable_row_cnt", // 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 + ADD_COLUMN_SCHEMA("memtable_row_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("memtable_avg_row_len", // 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 + ADD_COLUMN_SCHEMA("memtable_avg_row_len", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -9313,17 +9284,16 @@ int ObInnerTableSchema::all_table_stat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_column_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_column_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9359,21 +9329,21 @@ int ObInnerTableSchema::all_column_stat_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -9382,307 +9352,307 @@ int ObInnerTableSchema::all_column_stat_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_type", // 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 + ADD_COLUMN_SCHEMA("object_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("last_analyzed", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("last_analyzed", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("distinct_cnt", // 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 + ADD_COLUMN_SCHEMA("distinct_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("null_cnt", // 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 + ADD_COLUMN_SCHEMA("null_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_value", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_value", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_max_value", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_max_value", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_value", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("min_value", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_min_value", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_min_value", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("avg_len", // 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 + ADD_COLUMN_SCHEMA("avg_len", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("distinct_cnt_synopsis", // 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 - MAX_LLC_BITMAP_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("distinct_cnt_synopsis", //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 + MAX_LLC_BITMAP_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("distinct_cnt_synopsis_size", // 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 + ADD_COLUMN_SCHEMA("distinct_cnt_synopsis_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sample_size", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sample_size", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("density", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObDoubleType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(double), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("density", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObDoubleType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(double), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("bucket_cnt", // 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 + ADD_COLUMN_SCHEMA("bucket_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("histogram_type", // 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 + ADD_COLUMN_SCHEMA("histogram_type", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -9700,17 +9670,16 @@ int ObInnerTableSchema::all_column_stat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_histogram_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_histogram_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9746,21 +9715,21 @@ int ObInnerTableSchema::all_histogram_stat_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -9769,156 +9738,156 @@ int ObInnerTableSchema::all_histogram_stat_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("endpoint_num", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("endpoint_num", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_type", // 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 + ADD_COLUMN_SCHEMA("object_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("endpoint_value", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("endpoint_value", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("b_endpoint_value", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("b_endpoint_value", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("endpoint_repeat_cnt", // 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 + ADD_COLUMN_SCHEMA("endpoint_repeat_cnt", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -9936,17 +9905,16 @@ int ObInnerTableSchema::all_histogram_stat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_package_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_package_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9982,21 +9950,21 @@ int ObInnerTableSchema::all_package_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -10005,220 +9973,220 @@ int ObInnerTableSchema::all_package_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("package_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { ObObj package_name_default; package_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("package_name", // 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 - OB_MAX_PACKAGE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - package_name_default, - package_name_default); // default_value + ADD_COLUMN_SCHEMA_T("package_name", //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 + OB_MAX_PACKAGE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + package_name_default, + package_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 + ADD_COLUMN_SCHEMA("type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flag", // 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 + ADD_COLUMN_SCHEMA("flag", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 + ADD_COLUMN_SCHEMA("owner_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comp_flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comp_flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("exec_env", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("exec_env", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("source", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("source", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("route_sql", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("route_sql", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -10236,17 +10204,16 @@ int ObInnerTableSchema::all_package_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_package_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_package_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10282,21 +10249,21 @@ int ObInnerTableSchema::all_package_history_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -10305,235 +10272,235 @@ int ObInnerTableSchema::all_package_history_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("package_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj package_name_default; package_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("package_name", // 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 - OB_MAX_PACKAGE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - package_name_default, - package_name_default); // default_value + ADD_COLUMN_SCHEMA_T("package_name", //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 + OB_MAX_PACKAGE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + package_name_default, + package_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comp_flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comp_flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("exec_env", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("exec_env", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("source", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("source", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("route_sql", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("route_sql", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -10551,17 +10518,16 @@ int ObInnerTableSchema::all_package_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_sql_execute_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_sql_execute_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10597,21 +10563,21 @@ int ObInnerTableSchema::all_sql_execute_task_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -10620,171 +10586,171 @@ int ObInnerTableSchema::all_sql_execute_task_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("execution_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("execution_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_job_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("sql_job_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("task_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 5, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 5, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("slice_count", // 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 + ADD_COLUMN_SCHEMA("slice_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_stat", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("task_stat", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_result", // 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 + ADD_COLUMN_SCHEMA("task_result", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_info", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("task_info", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10794,17 +10760,16 @@ int ObInnerTableSchema::all_sql_execute_task_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_index_build_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_index_build_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10840,21 +10805,21 @@ int ObInnerTableSchema::all_index_build_stat_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -10863,111 +10828,111 @@ int ObInnerTableSchema::all_index_build_stat_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("data_table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_table_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("index_table_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 + ADD_COLUMN_SCHEMA("status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot", // 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 + ADD_COLUMN_SCHEMA("snapshot", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10977,10 +10942,10 @@ int ObInnerTableSchema::all_index_build_stat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase 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 a86891064..952a7e240 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 @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::all_core_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_core_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -63,21 +65,21 @@ int ObInnerTableSchema::all_core_table_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -86,81 +88,81 @@ int ObInnerTableSchema::all_core_table_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_name", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_CORE_TALBE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_name", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_CORE_TALBE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("row_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_name", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("column_name", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_value", // 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 - OB_OLD_MAX_VARCHAR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("column_value", //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 + OB_OLD_MAX_VARCHAR_LENGTH, //column_length + -1, //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(FLAT_ROW_STORE); @@ -170,17 +172,16 @@ int ObInnerTableSchema::all_core_table_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_root_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_root_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -216,21 +217,21 @@ int ObInnerTableSchema::all_root_table_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -239,538 +240,538 @@ int ObInnerTableSchema::all_root_table_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_port", // 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 + ADD_COLUMN_SCHEMA("sql_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("unit_id", // 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 + ADD_COLUMN_SCHEMA("unit_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role", // 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 + ADD_COLUMN_SCHEMA("role", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("member_list", // 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 - MAX_MEMBER_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("member_list", //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 + MAX_MEMBER_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_count", // 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 + ADD_COLUMN_SCHEMA("row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_size", // 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 + ADD_COLUMN_SCHEMA("data_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_version", // 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 + ADD_COLUMN_SCHEMA("data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_checksum", // 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 + ADD_COLUMN_SCHEMA("data_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_checksum", // 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 + ADD_COLUMN_SCHEMA("row_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_checksum", // 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 - COLUMN_CHECKSUM_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("column_checksum", //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 + COLUMN_CHECKSUM_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj is_original_leader_default; is_original_leader_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_original_leader", // 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 - is_original_leader_default, - is_original_leader_default); // default_value + ADD_COLUMN_SCHEMA_T("is_original_leader", //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 + is_original_leader_default, + is_original_leader_default); //default_value } if (OB_SUCC(ret)) { ObObj is_previous_leader_default; is_previous_leader_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_previous_leader", // 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 - is_previous_leader_default, - is_previous_leader_default); // default_value + ADD_COLUMN_SCHEMA_T("is_previous_leader", //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 + is_previous_leader_default, + is_previous_leader_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_time", // 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 + ADD_COLUMN_SCHEMA("create_time", //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 } if (OB_SUCC(ret)) { ObObj rebuild_default; rebuild_default.set_int(0); - ADD_COLUMN_SCHEMA_T("rebuild", // 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 - rebuild_default, - rebuild_default); // default_value + ADD_COLUMN_SCHEMA_T("rebuild", //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 + rebuild_default, + rebuild_default); //default_value } if (OB_SUCC(ret)) { ObObj replica_type_default; replica_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("replica_type", // 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 - replica_type_default, - replica_type_default); // default_value + ADD_COLUMN_SCHEMA_T("replica_type", //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 + replica_type_default, + replica_type_default); //default_value } if (OB_SUCC(ret)) { ObObj required_size_default; required_size_default.set_int(0); - ADD_COLUMN_SCHEMA_T("required_size", // 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 - required_size_default, - required_size_default); // default_value + ADD_COLUMN_SCHEMA_T("required_size", //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 + required_size_default, + required_size_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("REPLICA_STATUS_NORMAL")); - ADD_COLUMN_SCHEMA_T("status", // 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 - MAX_REPLICA_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + MAX_REPLICA_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { ObObj is_restore_default; is_restore_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_restore", // 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 - is_restore_default, - is_restore_default); // default_value + ADD_COLUMN_SCHEMA_T("is_restore", //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 + is_restore_default, + is_restore_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_checksum_default; partition_checksum_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_checksum", // 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 - partition_checksum_default, - partition_checksum_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_checksum", //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 + partition_checksum_default, + partition_checksum_default); //default_value } if (OB_SUCC(ret)) { ObObj quorum_default; quorum_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("quorum", // 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 - quorum_default, - quorum_default); // default_value + ADD_COLUMN_SCHEMA_T("quorum", //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 + quorum_default, + quorum_default); //default_value } if (OB_SUCC(ret)) { ObObj fail_list_default; fail_list_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("fail_list", // 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 - OB_MAX_FAILLIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - fail_list_default, - fail_list_default); // default_value + ADD_COLUMN_SCHEMA_T("fail_list", //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 + OB_MAX_FAILLIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + fail_list_default, + fail_list_default); //default_value } if (OB_SUCC(ret)) { ObObj recovery_timestamp_default; recovery_timestamp_default.set_int(0); - ADD_COLUMN_SCHEMA_T("recovery_timestamp", // 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 - recovery_timestamp_default, - recovery_timestamp_default); // default_value + ADD_COLUMN_SCHEMA_T("recovery_timestamp", //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 + recovery_timestamp_default, + recovery_timestamp_default); //default_value } if (OB_SUCC(ret)) { ObObj memstore_percent_default; memstore_percent_default.set_int(100); - ADD_COLUMN_SCHEMA_T("memstore_percent", // 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 - memstore_percent_default, - memstore_percent_default); // default_value + ADD_COLUMN_SCHEMA_T("memstore_percent", //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 + memstore_percent_default, + memstore_percent_default); //default_value } if (OB_SUCC(ret)) { ObObj data_file_id_default; data_file_id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("data_file_id", // 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 - data_file_id_default, - data_file_id_default); // default_value + ADD_COLUMN_SCHEMA_T("data_file_id", //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 + data_file_id_default, + data_file_id_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -780,17 +781,16 @@ int ObInnerTableSchema::all_root_table_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -826,21 +826,21 @@ int ObInnerTableSchema::all_table_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -849,1214 +849,1214 @@ int ObInnerTableSchema::all_table_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { ObObj table_name_default; table_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("table_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_name_default, - table_name_default); // default_value + ADD_COLUMN_SCHEMA_T("table_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_name_default, + table_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_type", // 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 + ADD_COLUMN_SCHEMA("table_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("load_type", // 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 + ADD_COLUMN_SCHEMA("load_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_type", // 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 + ADD_COLUMN_SCHEMA("def_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey_column_num", // 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 + ADD_COLUMN_SCHEMA("rowkey_column_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_column_num", // 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 + ADD_COLUMN_SCHEMA("index_column_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_used_column_id", // 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 + ADD_COLUMN_SCHEMA("max_used_column_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 + ADD_COLUMN_SCHEMA("replica_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("autoinc_column_id", // 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 + ADD_COLUMN_SCHEMA("autoinc_column_id", //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 } if (OB_SUCC(ret)) { ObObj auto_increment_default; auto_increment_default.set_uint64(1); - ADD_COLUMN_SCHEMA_T("auto_increment", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - auto_increment_default, - auto_increment_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_increment", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + auto_increment_default, + auto_increment_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("read_only", // 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 + ADD_COLUMN_SCHEMA("read_only", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey_split_pos", // 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 + ADD_COLUMN_SCHEMA("rowkey_split_pos", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("expire_condition", // 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 - OB_MAX_EXPIRE_INFO_STRING_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("expire_condition", //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 + OB_MAX_EXPIRE_INFO_STRING_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_use_bloomfilter", // 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 + ADD_COLUMN_SCHEMA("is_use_bloomfilter", //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 } if (OB_SUCC(ret)) { ObObj comment_default; comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - comment_default, - comment_default); // default_value + ADD_COLUMN_SCHEMA_T("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + comment_default, + comment_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 + ADD_COLUMN_SCHEMA("block_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 + ADD_COLUMN_SCHEMA("collation_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_table_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_table_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_status", // 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 + ADD_COLUMN_SCHEMA("index_status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // 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 + ADD_COLUMN_SCHEMA("tablegroup_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("progressive_merge_num", // 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 + ADD_COLUMN_SCHEMA("progressive_merge_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_type", // 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 + ADD_COLUMN_SCHEMA("index_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_level", // 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 + ADD_COLUMN_SCHEMA("part_level", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_func_type", // 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 + ADD_COLUMN_SCHEMA("part_func_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_func_expr", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_func_expr", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_num", // 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 + ADD_COLUMN_SCHEMA("part_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_func_type", // 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 + ADD_COLUMN_SCHEMA("sub_part_func_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_func_expr", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_func_expr", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_num", // 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 + ADD_COLUMN_SCHEMA("sub_part_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_mem_version", // 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 + ADD_COLUMN_SCHEMA("create_mem_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_definition", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("view_definition", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_check_option", // 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 + ADD_COLUMN_SCHEMA("view_check_option", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_is_updatable", // 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 + ADD_COLUMN_SCHEMA("view_is_updatable", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_list", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone_list", //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 + MAX_ZONE_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj index_using_type_default; index_using_type_default.set_int(USING_BTREE); - ADD_COLUMN_SCHEMA_T("index_using_type", // 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 - index_using_type_default, - index_using_type_default); // default_value + ADD_COLUMN_SCHEMA_T("index_using_type", //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 + index_using_type_default, + index_using_type_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parser_name", // 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 - OB_MAX_PARSER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parser_name", //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 + OB_MAX_PARSER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj index_attributes_set_default; index_attributes_set_default.set_int(0); - ADD_COLUMN_SCHEMA_T("index_attributes_set", // 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 - true, // is_nullable - false, // is_autoincrement - index_attributes_set_default, - index_attributes_set_default); // default_value + ADD_COLUMN_SCHEMA_T("index_attributes_set", //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 + true, //is_nullable + false, //is_autoincrement + index_attributes_set_default, + index_attributes_set_default); //default_value } if (OB_SUCC(ret)) { ObObj locality_default; locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - locality_default, - locality_default); // default_value + ADD_COLUMN_SCHEMA_T("locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + locality_default, + locality_default); //default_value } if (OB_SUCC(ret)) { ObObj tablet_size_default; tablet_size_default.set_int(OB_DEFAULT_TABLET_SIZE); - ADD_COLUMN_SCHEMA_T("tablet_size", // 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 - tablet_size_default, - tablet_size_default); // default_value + ADD_COLUMN_SCHEMA_T("tablet_size", //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 + tablet_size_default, + tablet_size_default); //default_value } if (OB_SUCC(ret)) { ObObj pctfree_default; pctfree_default.set_int(OB_DEFAULT_PCTFREE); - ADD_COLUMN_SCHEMA_T("pctfree", // 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 - pctfree_default, - pctfree_default); // default_value + ADD_COLUMN_SCHEMA_T("pctfree", //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 + pctfree_default, + pctfree_default); //default_value } if (OB_SUCC(ret)) { ObObj previous_locality_default; previous_locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("previous_locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - previous_locality_default, - previous_locality_default); // default_value + ADD_COLUMN_SCHEMA_T("previous_locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + previous_locality_default, + previous_locality_default); //default_value } if (OB_SUCC(ret)) { ObObj max_used_part_id_default; max_used_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("max_used_part_id", // 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_used_part_id_default, - max_used_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("max_used_part_id", //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_used_part_id_default, + max_used_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_cnt_within_partition_table_default; partition_cnt_within_partition_table_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("partition_cnt_within_partition_table", // 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 - partition_cnt_within_partition_table_default, - partition_cnt_within_partition_table_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_cnt_within_partition_table", //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 + partition_cnt_within_partition_table_default, + partition_cnt_within_partition_table_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_status_default; partition_status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_status", // 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 - true, // is_nullable - false, // is_autoincrement - partition_status_default, - partition_status_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_status", //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 + true, //is_nullable + false, //is_autoincrement + partition_status_default, + partition_status_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_schema_version_default; partition_schema_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - partition_schema_version_default, - partition_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + partition_schema_version_default, + partition_schema_version_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_used_constraint_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_used_constraint_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj session_id_default; session_id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("session_id", // 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 - true, // is_nullable - false, // is_autoincrement - session_id_default, - session_id_default); // default_value + ADD_COLUMN_SCHEMA_T("session_id", //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 + true, //is_nullable + false, //is_autoincrement + session_id_default, + session_id_default); //default_value } if (OB_SUCC(ret)) { ObObj pk_comment_default; pk_comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("pk_comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - pk_comment_default, - pk_comment_default); // default_value + ADD_COLUMN_SCHEMA_T("pk_comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + pk_comment_default, + pk_comment_default); //default_value } if (OB_SUCC(ret)) { ObObj sess_active_time_default; sess_active_time_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sess_active_time", // 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 - true, // is_nullable - false, // is_autoincrement - sess_active_time_default, - sess_active_time_default); // default_value + ADD_COLUMN_SCHEMA_T("sess_active_time", //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 + true, //is_nullable + false, //is_autoincrement + sess_active_time_default, + sess_active_time_default); //default_value } if (OB_SUCC(ret)) { ObObj row_store_type_default; row_store_type_default.set_varchar(ObString::make_string("FLAT_ROW_STORE")); - ADD_COLUMN_SCHEMA_T("row_store_type", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - row_store_type_default, - row_store_type_default); // default_value + ADD_COLUMN_SCHEMA_T("row_store_type", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + row_store_type_default, + row_store_type_default); //default_value } if (OB_SUCC(ret)) { ObObj store_format_default; store_format_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("store_format", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - store_format_default, - store_format_default); // default_value + ADD_COLUMN_SCHEMA_T("store_format", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + store_format_default, + store_format_default); //default_value } if (OB_SUCC(ret)) { ObObj duplicate_scope_default; duplicate_scope_default.set_int(0); - ADD_COLUMN_SCHEMA_T("duplicate_scope", // 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 - true, // is_nullable - false, // is_autoincrement - duplicate_scope_default, - duplicate_scope_default); // default_value + ADD_COLUMN_SCHEMA_T("duplicate_scope", //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 + true, //is_nullable + false, //is_autoincrement + duplicate_scope_default, + duplicate_scope_default); //default_value } if (OB_SUCC(ret)) { ObObj binding_default; binding_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("binding", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - binding_default, - binding_default); // default_value + ADD_COLUMN_SCHEMA_T("binding", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + binding_default, + binding_default); //default_value } if (OB_SUCC(ret)) { ObObj progressive_merge_round_default; progressive_merge_round_default.set_int(0); - ADD_COLUMN_SCHEMA_T("progressive_merge_round", // 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 - true, // is_nullable - false, // is_autoincrement - progressive_merge_round_default, - progressive_merge_round_default); // default_value + ADD_COLUMN_SCHEMA_T("progressive_merge_round", //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 + true, //is_nullable + false, //is_autoincrement + progressive_merge_round_default, + progressive_merge_round_default); //default_value } if (OB_SUCC(ret)) { ObObj storage_format_version_default; storage_format_version_default.set_int(2); - ADD_COLUMN_SCHEMA_T("storage_format_version", // 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 - true, // is_nullable - false, // is_autoincrement - storage_format_version_default, - storage_format_version_default); // default_value + ADD_COLUMN_SCHEMA_T("storage_format_version", //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 + true, //is_nullable + false, //is_autoincrement + storage_format_version_default, + storage_format_version_default); //default_value } if (OB_SUCC(ret)) { ObObj table_mode_default; table_mode_default.set_int(0); - ADD_COLUMN_SCHEMA_T("table_mode", // 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 - table_mode_default, - table_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("table_mode", //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 + table_mode_default, + table_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj encryption_default; encryption_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("encryption", // 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 - OB_MAX_ENCRYPTION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - encryption_default, - encryption_default); // default_value + ADD_COLUMN_SCHEMA_T("encryption", //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 + OB_MAX_ENCRYPTION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + encryption_default, + encryption_default); //default_value } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj is_sub_part_template_default; is_sub_part_template_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("is_sub_part_template", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_sub_part_template_default, - is_sub_part_template_default); // default_value + ADD_COLUMN_SCHEMA_T("is_sub_part_template", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_sub_part_template_default, + is_sub_part_template_default); //default_value } if (OB_SUCC(ret)) { ObObj dop_default; dop_default.set_int(1); - ADD_COLUMN_SCHEMA_T("dop", // 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 - dop_default, - dop_default); // default_value + ADD_COLUMN_SCHEMA_T("dop", //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 + dop_default, + dop_default); //default_value } if (OB_SUCC(ret)) { ObObj character_set_client_default; character_set_client_default.set_int(0); - ADD_COLUMN_SCHEMA_T("character_set_client", // 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 - character_set_client_default, - character_set_client_default); // default_value + ADD_COLUMN_SCHEMA_T("character_set_client", //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 + character_set_client_default, + character_set_client_default); //default_value } if (OB_SUCC(ret)) { ObObj collation_connection_default; collation_connection_default.set_int(0); - ADD_COLUMN_SCHEMA_T("collation_connection", // 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 - collation_connection_default, - collation_connection_default); // default_value + ADD_COLUMN_SCHEMA_T("collation_connection", //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 + collation_connection_default, + collation_connection_default); //default_value } if (OB_SUCC(ret)) { ObObj auto_part_size_default; auto_part_size_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("auto_part_size", // 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 - auto_part_size_default, - auto_part_size_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_part_size", //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 + auto_part_size_default, + auto_part_size_default); //default_value } if (OB_SUCC(ret)) { ObObj auto_part_default; auto_part_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("auto_part", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - auto_part_default, - auto_part_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_part", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + auto_part_default, + auto_part_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -2074,17 +2074,16 @@ int ObInnerTableSchema::all_table_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_column_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_column_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2120,21 +2119,21 @@ int ObInnerTableSchema::all_column_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2143,446 +2142,446 @@ int ObInnerTableSchema::all_column_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { ObObj column_name_default; column_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("column_name", // 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 - OB_MAX_COLUMN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - column_name_default, - column_name_default); // default_value + ADD_COLUMN_SCHEMA_T("column_name", //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 + OB_MAX_COLUMN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + column_name_default, + column_name_default); //default_value } if (OB_SUCC(ret)) { ObObj rowkey_position_default; rowkey_position_default.set_int(0); - ADD_COLUMN_SCHEMA_T("rowkey_position", // 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 - rowkey_position_default, - rowkey_position_default); // default_value + ADD_COLUMN_SCHEMA_T("rowkey_position", //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 + rowkey_position_default, + rowkey_position_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_position", // 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 + ADD_COLUMN_SCHEMA("index_position", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("order_in_rowkey", // 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 + ADD_COLUMN_SCHEMA("order_in_rowkey", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_key_position", // 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 + ADD_COLUMN_SCHEMA("partition_key_position", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 + ADD_COLUMN_SCHEMA("data_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_length", // 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 + ADD_COLUMN_SCHEMA("data_length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_precision", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_precision", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_scale", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_scale", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zero_fill", // 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 + ADD_COLUMN_SCHEMA("zero_fill", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("nullable", // 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 + ADD_COLUMN_SCHEMA("nullable", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("on_update_current_timestamp", // 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 + ADD_COLUMN_SCHEMA("on_update_current_timestamp", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("autoincrement", // 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 + ADD_COLUMN_SCHEMA("autoincrement", //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 } if (OB_SUCC(ret)) { ObObj is_hidden_default; is_hidden_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_hidden", // 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 - is_hidden_default, - is_hidden_default); // default_value + ADD_COLUMN_SCHEMA_T("is_hidden", //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 + is_hidden_default, + is_hidden_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 + ADD_COLUMN_SCHEMA("collation_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("orig_default_value", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("orig_default_value", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_default_value", // 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 - OB_MAX_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cur_default_value", //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 + OB_MAX_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { ObObj column_flags_default; column_flags_default.set_int(0); - ADD_COLUMN_SCHEMA_T("column_flags", // 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 - column_flags_default, - column_flags_default); // default_value + ADD_COLUMN_SCHEMA_T("column_flags", //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 + column_flags_default, + column_flags_default); //default_value } if (OB_SUCC(ret)) { ObObj prev_column_id_default; prev_column_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("prev_column_id", // 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 - prev_column_id_default, - prev_column_id_default); // default_value + ADD_COLUMN_SCHEMA_T("prev_column_id", //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 + prev_column_id_default, + prev_column_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("extended_type_info", // 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_VARBINARY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("extended_type_info", //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_VARBINARY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("orig_default_value_v2", // 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_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("orig_default_value_v2", //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_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_default_value_v2", // 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_DEFAULT_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cur_default_value_v2", //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_DEFAULT_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -2600,17 +2599,16 @@ int ObInnerTableSchema::all_column_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_ddl_operation_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_ddl_operation_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2646,21 +2644,21 @@ int ObInnerTableSchema::all_ddl_operation_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2669,190 +2667,190 @@ int ObInnerTableSchema::all_ddl_operation_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 + ADD_COLUMN_SCHEMA("tenant_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // 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 + ADD_COLUMN_SCHEMA("user_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_name", // 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 - OB_MAX_DATABASE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_name", //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 + OB_MAX_DATABASE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // 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 + ADD_COLUMN_SCHEMA("tablegroup_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 + ADD_COLUMN_SCHEMA("table_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_name", // 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 - OB_MAX_CORE_TALBE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_name", //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 + OB_MAX_CORE_TALBE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("operation_type", // 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 + ADD_COLUMN_SCHEMA("operation_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ddl_stmt_str", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ddl_stmt_str", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj exec_tenant_id_default; exec_tenant_id_default.set_int(1); - ADD_COLUMN_SCHEMA_T("exec_tenant_id", // 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 - exec_tenant_id_default, - exec_tenant_id_default); // default_value + ADD_COLUMN_SCHEMA_T("exec_tenant_id", //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 + exec_tenant_id_default, + exec_tenant_id_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2862,17 +2860,16 @@ int ObInnerTableSchema::all_ddl_operation_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_table_v2_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_table_v2_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2908,21 +2905,21 @@ int ObInnerTableSchema::all_table_v2_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2931,1214 +2928,1214 @@ int ObInnerTableSchema::all_table_v2_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { ObObj table_name_default; table_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("table_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - table_name_default, - table_name_default); // default_value + ADD_COLUMN_SCHEMA_T("table_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + table_name_default, + table_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_type", // 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 + ADD_COLUMN_SCHEMA("table_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("load_type", // 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 + ADD_COLUMN_SCHEMA("load_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_type", // 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 + ADD_COLUMN_SCHEMA("def_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey_column_num", // 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 + ADD_COLUMN_SCHEMA("rowkey_column_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_column_num", // 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 + ADD_COLUMN_SCHEMA("index_column_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_used_column_id", // 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 + ADD_COLUMN_SCHEMA("max_used_column_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 + ADD_COLUMN_SCHEMA("replica_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("autoinc_column_id", // 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 + ADD_COLUMN_SCHEMA("autoinc_column_id", //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 } if (OB_SUCC(ret)) { ObObj auto_increment_default; auto_increment_default.set_uint64(1); - ADD_COLUMN_SCHEMA_T("auto_increment", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - auto_increment_default, - auto_increment_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_increment", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + auto_increment_default, + auto_increment_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("read_only", // 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 + ADD_COLUMN_SCHEMA("read_only", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey_split_pos", // 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 + ADD_COLUMN_SCHEMA("rowkey_split_pos", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("expire_condition", // 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 - OB_MAX_EXPIRE_INFO_STRING_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("expire_condition", //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 + OB_MAX_EXPIRE_INFO_STRING_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_use_bloomfilter", // 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 + ADD_COLUMN_SCHEMA("is_use_bloomfilter", //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 } if (OB_SUCC(ret)) { ObObj comment_default; comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - comment_default, - comment_default); // default_value + ADD_COLUMN_SCHEMA_T("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + comment_default, + comment_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 + ADD_COLUMN_SCHEMA("block_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 + ADD_COLUMN_SCHEMA("collation_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_table_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_table_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_status", // 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 + ADD_COLUMN_SCHEMA("index_status", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // 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 + ADD_COLUMN_SCHEMA("tablegroup_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("progressive_merge_num", // 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 + ADD_COLUMN_SCHEMA("progressive_merge_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_type", // 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 + ADD_COLUMN_SCHEMA("index_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_level", // 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 + ADD_COLUMN_SCHEMA("part_level", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_func_type", // 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 + ADD_COLUMN_SCHEMA("part_func_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_func_expr", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_func_expr", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_num", // 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 + ADD_COLUMN_SCHEMA("part_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_func_type", // 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 + ADD_COLUMN_SCHEMA("sub_part_func_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_func_expr", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_func_expr", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_num", // 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 + ADD_COLUMN_SCHEMA("sub_part_num", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_mem_version", // 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 + ADD_COLUMN_SCHEMA("create_mem_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_definition", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("view_definition", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_check_option", // 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 + ADD_COLUMN_SCHEMA("view_check_option", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_is_updatable", // 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 + ADD_COLUMN_SCHEMA("view_is_updatable", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_list", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone_list", //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 + MAX_ZONE_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj index_using_type_default; index_using_type_default.set_int(USING_BTREE); - ADD_COLUMN_SCHEMA_T("index_using_type", // 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 - index_using_type_default, - index_using_type_default); // default_value + ADD_COLUMN_SCHEMA_T("index_using_type", //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 + index_using_type_default, + index_using_type_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parser_name", // 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 - OB_MAX_PARSER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parser_name", //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 + OB_MAX_PARSER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj index_attributes_set_default; index_attributes_set_default.set_int(0); - ADD_COLUMN_SCHEMA_T("index_attributes_set", // 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 - true, // is_nullable - false, // is_autoincrement - index_attributes_set_default, - index_attributes_set_default); // default_value + ADD_COLUMN_SCHEMA_T("index_attributes_set", //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 + true, //is_nullable + false, //is_autoincrement + index_attributes_set_default, + index_attributes_set_default); //default_value } if (OB_SUCC(ret)) { ObObj locality_default; locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - locality_default, - locality_default); // default_value + ADD_COLUMN_SCHEMA_T("locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + locality_default, + locality_default); //default_value } if (OB_SUCC(ret)) { ObObj tablet_size_default; tablet_size_default.set_int(OB_DEFAULT_TABLET_SIZE); - ADD_COLUMN_SCHEMA_T("tablet_size", // 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 - tablet_size_default, - tablet_size_default); // default_value + ADD_COLUMN_SCHEMA_T("tablet_size", //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 + tablet_size_default, + tablet_size_default); //default_value } if (OB_SUCC(ret)) { ObObj pctfree_default; pctfree_default.set_int(OB_DEFAULT_PCTFREE); - ADD_COLUMN_SCHEMA_T("pctfree", // 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 - pctfree_default, - pctfree_default); // default_value + ADD_COLUMN_SCHEMA_T("pctfree", //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 + pctfree_default, + pctfree_default); //default_value } if (OB_SUCC(ret)) { ObObj previous_locality_default; previous_locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("previous_locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - previous_locality_default, - previous_locality_default); // default_value + ADD_COLUMN_SCHEMA_T("previous_locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + previous_locality_default, + previous_locality_default); //default_value } if (OB_SUCC(ret)) { ObObj max_used_part_id_default; max_used_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("max_used_part_id", // 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_used_part_id_default, - max_used_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("max_used_part_id", //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_used_part_id_default, + max_used_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_cnt_within_partition_table_default; partition_cnt_within_partition_table_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("partition_cnt_within_partition_table", // 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 - partition_cnt_within_partition_table_default, - partition_cnt_within_partition_table_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_cnt_within_partition_table", //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 + partition_cnt_within_partition_table_default, + partition_cnt_within_partition_table_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_status_default; partition_status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_status", // 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 - true, // is_nullable - false, // is_autoincrement - partition_status_default, - partition_status_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_status", //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 + true, //is_nullable + false, //is_autoincrement + partition_status_default, + partition_status_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_schema_version_default; partition_schema_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - partition_schema_version_default, - partition_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + partition_schema_version_default, + partition_schema_version_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_used_constraint_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_used_constraint_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj session_id_default; session_id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("session_id", // 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 - true, // is_nullable - false, // is_autoincrement - session_id_default, - session_id_default); // default_value + ADD_COLUMN_SCHEMA_T("session_id", //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 + true, //is_nullable + false, //is_autoincrement + session_id_default, + session_id_default); //default_value } if (OB_SUCC(ret)) { ObObj pk_comment_default; pk_comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("pk_comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - pk_comment_default, - pk_comment_default); // default_value + ADD_COLUMN_SCHEMA_T("pk_comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + pk_comment_default, + pk_comment_default); //default_value } if (OB_SUCC(ret)) { ObObj sess_active_time_default; sess_active_time_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sess_active_time", // 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 - true, // is_nullable - false, // is_autoincrement - sess_active_time_default, - sess_active_time_default); // default_value + ADD_COLUMN_SCHEMA_T("sess_active_time", //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 + true, //is_nullable + false, //is_autoincrement + sess_active_time_default, + sess_active_time_default); //default_value } if (OB_SUCC(ret)) { ObObj row_store_type_default; row_store_type_default.set_varchar(ObString::make_string("FLAT_ROW_STORE")); - ADD_COLUMN_SCHEMA_T("row_store_type", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - row_store_type_default, - row_store_type_default); // default_value + ADD_COLUMN_SCHEMA_T("row_store_type", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + row_store_type_default, + row_store_type_default); //default_value } if (OB_SUCC(ret)) { ObObj store_format_default; store_format_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("store_format", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - store_format_default, - store_format_default); // default_value + ADD_COLUMN_SCHEMA_T("store_format", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + store_format_default, + store_format_default); //default_value } if (OB_SUCC(ret)) { ObObj duplicate_scope_default; duplicate_scope_default.set_int(0); - ADD_COLUMN_SCHEMA_T("duplicate_scope", // 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 - true, // is_nullable - false, // is_autoincrement - duplicate_scope_default, - duplicate_scope_default); // default_value + ADD_COLUMN_SCHEMA_T("duplicate_scope", //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 + true, //is_nullable + false, //is_autoincrement + duplicate_scope_default, + duplicate_scope_default); //default_value } if (OB_SUCC(ret)) { ObObj binding_default; binding_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("binding", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - binding_default, - binding_default); // default_value + ADD_COLUMN_SCHEMA_T("binding", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + binding_default, + binding_default); //default_value } if (OB_SUCC(ret)) { ObObj progressive_merge_round_default; progressive_merge_round_default.set_int(0); - ADD_COLUMN_SCHEMA_T("progressive_merge_round", // 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 - true, // is_nullable - false, // is_autoincrement - progressive_merge_round_default, - progressive_merge_round_default); // default_value + ADD_COLUMN_SCHEMA_T("progressive_merge_round", //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 + true, //is_nullable + false, //is_autoincrement + progressive_merge_round_default, + progressive_merge_round_default); //default_value } if (OB_SUCC(ret)) { ObObj storage_format_version_default; storage_format_version_default.set_int(2); - ADD_COLUMN_SCHEMA_T("storage_format_version", // 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 - true, // is_nullable - false, // is_autoincrement - storage_format_version_default, - storage_format_version_default); // default_value + ADD_COLUMN_SCHEMA_T("storage_format_version", //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 + true, //is_nullable + false, //is_autoincrement + storage_format_version_default, + storage_format_version_default); //default_value } if (OB_SUCC(ret)) { ObObj table_mode_default; table_mode_default.set_int(0); - ADD_COLUMN_SCHEMA_T("table_mode", // 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 - table_mode_default, - table_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("table_mode", //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 + table_mode_default, + table_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj encryption_default; encryption_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("encryption", // 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 - OB_MAX_ENCRYPTION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - encryption_default, - encryption_default); // default_value + ADD_COLUMN_SCHEMA_T("encryption", //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 + OB_MAX_ENCRYPTION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + encryption_default, + encryption_default); //default_value } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj is_sub_part_template_default; is_sub_part_template_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("is_sub_part_template", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_sub_part_template_default, - is_sub_part_template_default); // default_value + ADD_COLUMN_SCHEMA_T("is_sub_part_template", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_sub_part_template_default, + is_sub_part_template_default); //default_value } if (OB_SUCC(ret)) { ObObj dop_default; dop_default.set_int(1); - ADD_COLUMN_SCHEMA_T("dop", // 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 - dop_default, - dop_default); // default_value + ADD_COLUMN_SCHEMA_T("dop", //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 + dop_default, + dop_default); //default_value } if (OB_SUCC(ret)) { ObObj character_set_client_default; character_set_client_default.set_int(0); - ADD_COLUMN_SCHEMA_T("character_set_client", // 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 - character_set_client_default, - character_set_client_default); // default_value + ADD_COLUMN_SCHEMA_T("character_set_client", //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 + character_set_client_default, + character_set_client_default); //default_value } if (OB_SUCC(ret)) { ObObj collation_connection_default; collation_connection_default.set_int(0); - ADD_COLUMN_SCHEMA_T("collation_connection", // 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 - collation_connection_default, - collation_connection_default); // default_value + ADD_COLUMN_SCHEMA_T("collation_connection", //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 + collation_connection_default, + collation_connection_default); //default_value } if (OB_SUCC(ret)) { ObObj auto_part_size_default; auto_part_size_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("auto_part_size", // 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 - auto_part_size_default, - auto_part_size_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_part_size", //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 + auto_part_size_default, + auto_part_size_default); //default_value } if (OB_SUCC(ret)) { ObObj auto_part_default; auto_part_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("auto_part", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - auto_part_default, - auto_part_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_part", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + auto_part_default, + auto_part_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4148,10 +4145,10 @@ int ObInnerTableSchema::all_table_v2_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.20001_20050.cpp b/src/share/inner_table/ob_inner_table_schema.20001_20050.cpp index a42acdfa9..aa9355d35 100644 --- a/src/share/inner_table/ob_inner_table_schema.20001_20050.cpp +++ b/src/share/inner_table/ob_inner_table_schema.20001_20050.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::gv_plan_cache_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_plan_cache_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -58,8 +60,7 @@ int ObInnerTableSchema::gv_plan_cache_stat_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT tenant_id,svr_ip,svr_port,sql_num,mem_used,mem_hold,access_count, hit_count,hit_rate,plan_num,mem_limit,hash_bucket,stmtkey_num FROM oceanbase.__all_virtual_plan_cache_stat WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT tenant_id,svr_ip,svr_port,sql_num,mem_used,mem_hold,access_count, hit_count,hit_rate,plan_num,mem_limit,hash_bucket,stmtkey_num FROM oceanbase.__all_virtual_plan_cache_stat WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -71,17 +72,16 @@ int ObInnerTableSchema::gv_plan_cache_stat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_plan_cache_plan_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_plan_cache_plan_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -112,8 +112,7 @@ int ObInnerTableSchema::gv_plan_cache_plan_stat_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT tenant_id,svr_ip,svr_port,plan_id,sql_id,type,is_bind_sensitive,is_bind_aware,db_id,statement,query_sql,special_params,param_infos, sys_vars,plan_hash,first_load_time,schema_version,merged_version,last_active_time,avg_exe_usec,slowest_exe_time,slowest_exe_usec,slow_count,hit_count,plan_size,executions,disk_reads,direct_writes,buffer_gets,application_wait_time,concurrency_wait_time,user_io_wait_time,rows_processed,elapsed_time,cpu_time,large_querys,delayed_large_querys,delayed_px_querys,outline_version,outline_id,outline_data,acs_sel_info,table_scan,evolution, evo_executions, evo_cpu_time, timeout_count, ps_stmt_id, sessid, temp_tables, is_use_jit,object_type,hints_info,hints_all_worked, pl_schema_id, is_batched_multi_stmt FROM oceanbase.__all_virtual_plan_stat WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT tenant_id,svr_ip,svr_port,plan_id,sql_id,type,is_bind_sensitive,is_bind_aware,db_id,statement,query_sql,special_params,param_infos, sys_vars,plan_hash,first_load_time,schema_version,merged_version,last_active_time,avg_exe_usec,slowest_exe_time,slowest_exe_usec,slow_count,hit_count,plan_size,executions,disk_reads,direct_writes,buffer_gets,application_wait_time,concurrency_wait_time,user_io_wait_time,rows_processed,elapsed_time,cpu_time,large_querys,delayed_large_querys,delayed_px_querys,outline_version,outline_id,outline_data,acs_sel_info,table_scan,evolution, evo_executions, evo_cpu_time, timeout_count, ps_stmt_id, sessid, temp_tables, is_use_jit,object_type,hints_info,hints_all_worked, pl_schema_id, is_batched_multi_stmt FROM oceanbase.__all_virtual_plan_stat WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -125,17 +124,16 @@ int ObInnerTableSchema::gv_plan_cache_plan_stat_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::schemata_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::schemata_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -166,8 +164,7 @@ int ObInnerTableSchema::schemata_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT 'def' AS CATALOG_NAME, DATABASE_NAME AS SCHEMA_NAME, 'utf8mb4' AS DEFAULT_CHARACTER_SET_NAME, 'utf8mb4_general_ci' AS DEFAULT_COLLATION_NAME, NULL AS SQL_PATH FROM oceanbase.__all_virtual_database a WHERE a.tenant_id = effective_tenant_id() and in_recyclebin = 0 and database_name != '__recyclebin' )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT 'def' AS CATALOG_NAME, DATABASE_NAME AS SCHEMA_NAME, 'utf8mb4' AS DEFAULT_CHARACTER_SET_NAME, 'utf8mb4_general_ci' AS DEFAULT_COLLATION_NAME, NULL AS SQL_PATH FROM oceanbase.__all_virtual_database a WHERE a.tenant_id = effective_tenant_id() and in_recyclebin = 0 and database_name != '__recyclebin' )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -179,17 +176,16 @@ int ObInnerTableSchema::schemata_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::character_sets_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::character_sets_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -220,8 +216,7 @@ int ObInnerTableSchema::character_sets_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CHARSET AS CHARACTER_SET_NAME, DEFAULT_COLLATION AS DEFAULT_COLLATE_NAME, DESCRIPTION, max_length AS MAXLEN FROM oceanbase.__tenant_virtual_charset )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CHARSET AS CHARACTER_SET_NAME, DEFAULT_COLLATION AS DEFAULT_COLLATE_NAME, DESCRIPTION, max_length AS MAXLEN FROM oceanbase.__tenant_virtual_charset )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -233,17 +228,16 @@ int ObInnerTableSchema::character_sets_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::global_variables_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::global_variables_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -274,8 +268,7 @@ int ObInnerTableSchema::global_variables_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT `variable_name` as VARIABLE_NAME, `value` as VARIABLE_VALUE FROM oceanbase.__tenant_virtual_global_variable )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT `variable_name` as VARIABLE_NAME, `value` as VARIABLE_VALUE FROM oceanbase.__tenant_virtual_global_variable )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -287,17 +280,16 @@ int ObInnerTableSchema::global_variables_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::statistics_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::statistics_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -328,8 +320,7 @@ int ObInnerTableSchema::statistics_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT 'def' as TABLE_CATALOG, table_schema AS TABLE_SCHEMA, `table` as TABLE_NAME, non_unique AS NON_UNIQUE, index_schema as INDEX_SCHEMA, key_name as INDEX_NAME, seq_in_index as SEQ_IN_INDEX, column_name as COLUMN_NAME, collation as COLLATION, cardinality as CARDINALITY, sub_part as SUB_PART, packed as PACKED, `null` as NULLABLE, index_type as INDEX_TYPE, COMMENT, index_comment as INDEX_COMMENT, is_visible as IS_VISIBLE FROM oceanbase.__tenant_virtual_table_index )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT 'def' as TABLE_CATALOG, table_schema AS TABLE_SCHEMA, `table` as TABLE_NAME, non_unique AS NON_UNIQUE, index_schema as INDEX_SCHEMA, key_name as INDEX_NAME, seq_in_index as SEQ_IN_INDEX, column_name as COLUMN_NAME, collation as COLLATION, cardinality as CARDINALITY, sub_part as SUB_PART, packed as PACKED, `null` as NULLABLE, index_type as INDEX_TYPE, COMMENT, index_comment as INDEX_COMMENT, is_visible as IS_VISIBLE FROM oceanbase.__tenant_virtual_table_index )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -341,17 +332,16 @@ int ObInnerTableSchema::statistics_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::views_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::views_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -382,8 +372,7 @@ int ObInnerTableSchema::views_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select /*+ READ_CONSISTENCY(WEAK) */ 'def' AS TABLE_CATALOG, d.database_name as TABLE_SCHEMA, t.table_name as TABLE_NAME, t.view_definition as VIEW_DEFINITION, 'NONE' as CHECK_OPTION, case t.view_is_updatable when 1 then 'YES' else 'NO' end as IS_UPDATABLE, 'NONE' as DEFINER, 'NONE' AS SECURITY_TYPE, case t.collation_type when 45 then 'utf8mb4' else 'NONE' end AS CHARACTER_SET_CLIENT, case t.collation_type when 45 then 'utf8mb4_general_ci' else 'NONE' end AS COLLATION_CONNECTION from oceanbase.__all_virtual_table as t join oceanbase.__all_virtual_database as d on t.tenant_id = effective_tenant_id() and d.tenant_id = effective_tenant_id() and t.database_id = d.database_id where (t.table_type = 1 or t.table_type = 4) and d.in_recyclebin = 0 and d.database_name != '__recyclebin' and d.database_name != 'information_schema' and d.database_name != 'oceanbase' )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select /*+ READ_CONSISTENCY(WEAK) */ 'def' AS TABLE_CATALOG, d.database_name as TABLE_SCHEMA, t.table_name as TABLE_NAME, t.view_definition as VIEW_DEFINITION, 'NONE' as CHECK_OPTION, case t.view_is_updatable when 1 then 'YES' else 'NO' end as IS_UPDATABLE, 'NONE' as DEFINER, 'NONE' AS SECURITY_TYPE, case t.collation_type when 45 then 'utf8mb4' else 'NONE' end AS CHARACTER_SET_CLIENT, case t.collation_type when 45 then 'utf8mb4_general_ci' else 'NONE' end AS COLLATION_CONNECTION from oceanbase.__all_virtual_table as t join oceanbase.__all_virtual_database as d on t.tenant_id = effective_tenant_id() and d.tenant_id = effective_tenant_id() and t.database_id = d.database_id where (t.table_type = 1 or t.table_type = 4) and d.in_recyclebin = 0 and d.database_name != '__recyclebin' and d.database_name != 'information_schema' and d.database_name != 'oceanbase' )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -395,17 +384,16 @@ int ObInnerTableSchema::views_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::tables_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::tables_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -436,8 +424,7 @@ int ObInnerTableSchema::tables_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select /*+ READ_CONSISTENCY(WEAK), use_merge(b, c, d, e)*/ 'def' as TABLE_CATALOG, b.database_name as TABLE_SCHEMA, a.table_name as TABLE_NAME, case when a.database_id & 0xFFFFFFFFFF = 2 then 'SYSTEM VIEW' when (a.table_type = 1 or a.table_type = 4) then 'VIEW' when a.table_type = 2 then 'SYSTEM TABLE' when a.table_type = 1 then 'INDEX' else 'BASE TABLE' end as TABLE_TYPE, NULL as ENGINE, NULL as VERSION, NULL as ROW_FORMAT, sum(c.row_count) as TABLE_ROWS, case when sum(c.row_count) = 0 then 0 else sum(c.data_size)/sum(c.row_count) end as AVG_ROW_LENGTH, sum(c.data_size) as DATA_LENGTH, NULL as MAX_DATA_LENGTH, NULL as INDEX_LENGTH, NULL as DATA_FREE, NULL as AUTO_INCREMENT, a.gmt_create as CREATE_TIME, a.gmt_modified as UPDATE_TIME, NULL as CHECK_TIME, d.collation as TABLE_COLLATION, cast(NULL as unsigned) as CHECKSUM, NULL as CREATE_OPTIONS, a.comment as TABLE_COMMENT from oceanbase.__all_virtual_table a inner join oceanbase.__all_virtual_database b on a.database_id = b.database_id left join oceanbase.__all_virtual_tenant_partition_meta_table c on a.table_id = c.table_id and c.tenant_id = effective_tenant_id() and a.tenant_id = c.tenant_id and c.role = 1 inner join oceanbase.__all_collation d on a.collation_type = d.id where a.tenant_id = effective_tenant_id() and b.tenant_id = effective_tenant_id() and a.table_type != 5 and b.database_name != '__recyclebin' and b.in_recyclebin = 0 group by a.table_id, b.database_name, a.table_name, a.table_type, a.gmt_create, a.gmt_modified, d.collation, a.comment )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select /*+ READ_CONSISTENCY(WEAK), use_merge(b, c, d, e)*/ 'def' as TABLE_CATALOG, b.database_name as TABLE_SCHEMA, a.table_name as TABLE_NAME, case when a.database_id & 0xFFFFFFFFFF = 2 then 'SYSTEM VIEW' when (a.table_type = 1 or a.table_type = 4) then 'VIEW' when a.table_type = 2 then 'SYSTEM TABLE' when a.table_type = 1 then 'INDEX' else 'BASE TABLE' end as TABLE_TYPE, NULL as ENGINE, NULL as VERSION, NULL as ROW_FORMAT, sum(c.row_count) as TABLE_ROWS, case when sum(c.row_count) = 0 then 0 else sum(c.data_size)/sum(c.row_count) end as AVG_ROW_LENGTH, sum(c.data_size) as DATA_LENGTH, NULL as MAX_DATA_LENGTH, NULL as INDEX_LENGTH, NULL as DATA_FREE, NULL as AUTO_INCREMENT, a.gmt_create as CREATE_TIME, a.gmt_modified as UPDATE_TIME, NULL as CHECK_TIME, d.collation as TABLE_COLLATION, cast(NULL as unsigned) as CHECKSUM, NULL as CREATE_OPTIONS, a.comment as TABLE_COMMENT from oceanbase.__all_virtual_table a inner join oceanbase.__all_virtual_database b on a.database_id = b.database_id left join oceanbase.__all_virtual_tenant_partition_meta_table c on a.table_id = c.table_id and c.tenant_id = effective_tenant_id() and a.tenant_id = c.tenant_id and c.role = 1 inner join oceanbase.__all_collation d on a.collation_type = d.id where a.tenant_id = effective_tenant_id() and b.tenant_id = effective_tenant_id() and a.table_type != 5 and b.database_name != '__recyclebin' and b.in_recyclebin = 0 group by a.table_id, b.database_name, a.table_name, a.table_type, a.gmt_create, a.gmt_modified, d.collation, a.comment )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -449,17 +436,16 @@ int ObInnerTableSchema::tables_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::collations_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::collations_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -490,8 +476,7 @@ int ObInnerTableSchema::collations_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select collation as COLLATION_NAME, charset as CHARACTER_SET_NAME, id as ID, `is_default` as IS_DEFAULT, is_compiled as IS_COMPILED, sortlen as SORTLEN from oceanbase.__tenant_virtual_collation )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select collation as COLLATION_NAME, charset as CHARACTER_SET_NAME, id as ID, `is_default` as IS_DEFAULT, is_compiled as IS_COMPILED, sortlen as SORTLEN from oceanbase.__tenant_virtual_collation )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -503,17 +488,16 @@ int ObInnerTableSchema::collations_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::collation_character_set_applicability_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::collation_character_set_applicability_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -544,8 +528,7 @@ int ObInnerTableSchema::collation_character_set_applicability_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select collation as COLLATION_NAME, charset as CHARACTER_SET_NAME from oceanbase.__tenant_virtual_collation )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select collation as COLLATION_NAME, charset as CHARACTER_SET_NAME from oceanbase.__tenant_virtual_collation )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -557,17 +540,16 @@ int ObInnerTableSchema::collation_character_set_applicability_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::processlist_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::processlist_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -598,8 +580,7 @@ int ObInnerTableSchema::processlist_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT id AS ID, user AS USER, host AS HOST, db AS DB, command AS COMMAND, time AS TIME, state AS STATE, info AS INFO FROM oceanbase.__all_virtual_processlist WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT id AS ID, user AS USER, host AS HOST, db AS DB, command AS COMMAND, time AS TIME, state AS STATE, info AS INFO FROM oceanbase.__all_virtual_processlist WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -611,17 +592,16 @@ int ObInnerTableSchema::processlist_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::key_column_usage_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::key_column_usage_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -652,8 +632,7 @@ int ObInnerTableSchema::key_column_usage_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__((select /*+ READ_CONSISTENCY(WEAK) */ 'def' as CONSTRAINT_CATALOG, c.database_name as CONSTRAINT_SCHEMA, 'PRIMARY' as CONSTRAINT_NAME, 'def' as TABLE_CATALOG, c.database_name as TABLE_SCHEMA, a.table_name as TABLE_NAME, b.column_name as COLUMN_NAME, b.rowkey_position as ORDINAL_POSITION, NULL as POSITION_IN_UNIQUE_CONSTRAINT, NULL as REFERENCED_TABLE_SCHEMA, NULL as REFERENCED_TABLE_NAME, NULL as REFERENCED_COLUMN_NAME from oceanbase.__all_virtual_table a inner join oceanbase.__all_virtual_column b on a.table_id = b.table_id inner join oceanbase.__all_virtual_database c on a.database_id = c.database_id where a.tenant_id = effective_tenant_id() and b.tenant_id = effective_tenant_id() and c.tenant_id = effective_tenant_id() and c.in_recyclebin = 0 and c.database_name != '__recyclebin' and b.rowkey_position > 0 and b.column_id >= 16 and a.table_type != 5 and b.column_flags & (0x1 << 8) = 0) union (select /*+ READ_CONSISTENCY(WEAK) */ 'def' as CONSTRAINT_CATALOG, d.database_name as CONSTRAINT_SCHEMA, substr(a.table_name, 2 + length(substring_index(a.table_name,'_',4))) as CONSTRAINT_NAME, 'def' as TABLE_CATALOG, d.database_name as TABLE_SCHEMA, c.table_name as TABLE_NAME, b.column_name as COLUMN_NAME, b.index_position as ORDINAL_POSITION, NULL as POSITION_IN_UNIQUE_CONSTRAINT, NULL as REFERENCED_TABLE_SCHEMA, NULL as REFERENCED_TABLE_NAME, NULL as REFERENCED_COLUMN_NAME from oceanbase.__all_virtual_table a inner join oceanbase.__all_virtual_column b on a.table_id = b.table_id inner join oceanbase.__all_virtual_table c on a.data_table_id = c.table_id inner join oceanbase.__all_virtual_database d on c.database_id = d.database_id where a.tenant_id = effective_tenant_id() and b.tenant_id = effective_tenant_id() and c.tenant_id = effective_tenant_id() and d.in_recyclebin = 0 and d.tenant_id = effective_tenant_id() and d.database_name != '__recyclebin' and a.table_type = 5 and a.index_type in (2, 4, 8) and b.index_position > 0) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__((select /*+ READ_CONSISTENCY(WEAK) */ 'def' as CONSTRAINT_CATALOG, c.database_name as CONSTRAINT_SCHEMA, 'PRIMARY' as CONSTRAINT_NAME, 'def' as TABLE_CATALOG, c.database_name as TABLE_SCHEMA, a.table_name as TABLE_NAME, b.column_name as COLUMN_NAME, b.rowkey_position as ORDINAL_POSITION, NULL as POSITION_IN_UNIQUE_CONSTRAINT, NULL as REFERENCED_TABLE_SCHEMA, NULL as REFERENCED_TABLE_NAME, NULL as REFERENCED_COLUMN_NAME from oceanbase.__all_virtual_table a inner join oceanbase.__all_virtual_column b on a.table_id = b.table_id inner join oceanbase.__all_virtual_database c on a.database_id = c.database_id where a.tenant_id = effective_tenant_id() and b.tenant_id = effective_tenant_id() and c.tenant_id = effective_tenant_id() and c.in_recyclebin = 0 and c.database_name != '__recyclebin' and b.rowkey_position > 0 and b.column_id >= 16 and a.table_type != 5 and b.column_flags & (0x1 << 8) = 0) union (select /*+ READ_CONSISTENCY(WEAK) */ 'def' as CONSTRAINT_CATALOG, d.database_name as CONSTRAINT_SCHEMA, substr(a.table_name, 2 + length(substring_index(a.table_name,'_',4))) as CONSTRAINT_NAME, 'def' as TABLE_CATALOG, d.database_name as TABLE_SCHEMA, c.table_name as TABLE_NAME, b.column_name as COLUMN_NAME, b.index_position as ORDINAL_POSITION, NULL as POSITION_IN_UNIQUE_CONSTRAINT, NULL as REFERENCED_TABLE_SCHEMA, NULL as REFERENCED_TABLE_NAME, NULL as REFERENCED_COLUMN_NAME from oceanbase.__all_virtual_table a inner join oceanbase.__all_virtual_column b on a.table_id = b.table_id inner join oceanbase.__all_virtual_table c on a.data_table_id = c.table_id inner join oceanbase.__all_virtual_database d on c.database_id = d.database_id where a.tenant_id = effective_tenant_id() and b.tenant_id = effective_tenant_id() and c.tenant_id = effective_tenant_id() and d.in_recyclebin = 0 and d.tenant_id = effective_tenant_id() and d.database_name != '__recyclebin' and a.table_type = 5 and a.index_type in (2, 4, 8) and b.index_position > 0) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -665,17 +644,16 @@ int ObInnerTableSchema::key_column_usage_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_outlines_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_outlines_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -706,8 +684,7 @@ int ObInnerTableSchema::dba_outlines_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select /*+ READ_CONSISTENCY(WEAK)*/ a.name as NAME, a.owner as OWNER, b.database_name as DB_NAME, NULL as CATEGORY, a.used as USED, a.gmt_create as TIMESTAMP, a.version as VERSION, a.sql_text as SQL_TEXT, a.signature as SIGNATURE, a.compatible as COMPATIBLE, a.enabled as ENABLED, a.format as FORMAT, a.outline_content as OUTLINE_CONTENT, a.outline_target as OUTLINE_TARGET, a.owner_id as OWNER_ID from oceanbase.__all_virtual_outline a inner join oceanbase.__all_virtual_database b on a.database_id = b.database_id where a.tenant_id = effective_tenant_id() and b.tenant_id = effective_tenant_id() and b.in_recyclebin = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select /*+ READ_CONSISTENCY(WEAK)*/ a.name as NAME, a.owner as OWNER, b.database_name as DB_NAME, NULL as CATEGORY, a.used as USED, a.gmt_create as TIMESTAMP, a.version as VERSION, a.sql_text as SQL_TEXT, a.signature as SIGNATURE, a.compatible as COMPATIBLE, a.enabled as ENABLED, a.format as FORMAT, a.outline_content as OUTLINE_CONTENT, a.outline_target as OUTLINE_TARGET, a.owner_id as OWNER_ID from oceanbase.__all_virtual_outline a inner join oceanbase.__all_virtual_database b on a.database_id = b.database_id where a.tenant_id = effective_tenant_id() and b.tenant_id = effective_tenant_id() and b.in_recyclebin = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -719,17 +696,16 @@ int ObInnerTableSchema::dba_outlines_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::engines_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::engines_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -772,17 +748,16 @@ int ObInnerTableSchema::engines_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::routines_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::routines_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -813,8 +788,7 @@ int ObInnerTableSchema::routines_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( select SPECIFIC_NAME, 'def' as ROUTINE_CATALOG, db as ROUTINE_SCHEMA, name as ROUTINE_NAME, type as ROUTINE_TYPE, '' as DATA_TYPE, NULL as CHARACTER_MAXIMUM_LENGTH, NULL as CHARACTER_OCTET_LENGTH, NULL as NUMERIC_PRECISION, NULL as NUMERIC_SCALE, NULL as DATETIME_PRECISION, NULL as CHARACTER_SET_NAME, NULL as COLLATION_NAME, NULL as DTD_IDENTIFIER, 'SQL' as ROUTINE_BODY, body as ROUTINE_DEFINITION, NULL as EXTERNAL_NAME, NULL as EXTERNAL_LANGUAGE, 'SQL' as PARAMETER_STYLE, IS_DETERMINISTIC, SQL_DATA_ACCESS, NULL as SQL_PATH, SECURITY_TYPE, CREATED, modified as LAST_ALTERED, SQL_MODE, comment as ROUTINE_COMMENT, DEFINER, CHARACTER_SET_CLIENT, COLLATION_CONNECTION, collation_database as DATABASE_COLLATION from mysql.proc; )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( select SPECIFIC_NAME, 'def' as ROUTINE_CATALOG, db as ROUTINE_SCHEMA, name as ROUTINE_NAME, type as ROUTINE_TYPE, '' as DATA_TYPE, NULL as CHARACTER_MAXIMUM_LENGTH, NULL as CHARACTER_OCTET_LENGTH, NULL as NUMERIC_PRECISION, NULL as NUMERIC_SCALE, NULL as DATETIME_PRECISION, NULL as CHARACTER_SET_NAME, NULL as COLLATION_NAME, NULL as DTD_IDENTIFIER, 'SQL' as ROUTINE_BODY, body as ROUTINE_DEFINITION, NULL as EXTERNAL_NAME, NULL as EXTERNAL_LANGUAGE, 'SQL' as PARAMETER_STYLE, IS_DETERMINISTIC, SQL_DATA_ACCESS, NULL as SQL_PATH, SECURITY_TYPE, CREATED, modified as LAST_ALTERED, SQL_MODE, comment as ROUTINE_COMMENT, DEFINER, CHARACTER_SET_CLIENT, COLLATION_CONNECTION, collation_database as DATABASE_COLLATION from mysql.proc; )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -826,10 +800,10 @@ int ObInnerTableSchema::routines_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.201_250.cpp b/src/share/inner_table/ob_inner_table_schema.201_250.cpp index 84bdaf727..c31aabd06 100644 --- a/src/share/inner_table/ob_inner_table_schema.201_250.cpp +++ b/src/share/inner_table/ob_inner_table_schema.201_250.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::all_build_index_param_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_build_index_param_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -63,21 +65,21 @@ int ObInnerTableSchema::all_build_index_param_schema(ObTableSchema& table_schema gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -86,96 +88,96 @@ int ObInnerTableSchema::all_build_index_param_schema(ObTableSchema& table_schema gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("execution_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("execution_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("seq_no", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("seq_no", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("param", // 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 - MAX_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("param", //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 + MAX_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -185,17 +187,16 @@ int ObInnerTableSchema::all_build_index_param_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_global_index_data_src_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_global_index_data_src_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -231,21 +232,21 @@ int ObInnerTableSchema::all_global_index_data_src_schema(ObTableSchema& table_sc gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -254,111 +255,111 @@ int ObInnerTableSchema::all_global_index_data_src_schema(ObTableSchema& table_sc gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("index_table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_table_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("data_table_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_partition_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("data_partition_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -368,17 +369,16 @@ int ObInnerTableSchema::all_global_index_data_src_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_acquired_snapshot_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_acquired_snapshot_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -414,115 +414,115 @@ int ObInnerTableSchema::all_acquired_snapshot_schema(ObTableSchema& table_schema gmt_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - 6, // column_scale - false, // is_nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_default_null, - gmt_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + 6, //column_scale + false, //is_nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_default_null, + gmt_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_type", // 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 + ADD_COLUMN_SCHEMA("snapshot_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_ts", // 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 + ADD_COLUMN_SCHEMA("snapshot_ts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("schema_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj extra_info_default; extra_info_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("extra_info", // 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 - MAX_ROOTSERVICE_EVENT_EXTRA_INFO_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - extra_info_default, - extra_info_default); // default_value + ADD_COLUMN_SCHEMA_T("extra_info", //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 + MAX_ROOTSERVICE_EVENT_EXTRA_INFO_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + extra_info_default, + extra_info_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -532,17 +532,16 @@ int ObInnerTableSchema::all_acquired_snapshot_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_immediate_effect_index_sstable_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_immediate_effect_index_sstable_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -578,21 +577,21 @@ int ObInnerTableSchema::all_immediate_effect_index_sstable_schema(ObTableSchema& gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -601,141 +600,141 @@ int ObInnerTableSchema::all_immediate_effect_index_sstable_schema(ObTableSchema& gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("index_table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id,", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id,", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot", // 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 + ADD_COLUMN_SCHEMA("snapshot", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_cnt", // 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 + ADD_COLUMN_SCHEMA("partition_cnt", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_size", // 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 + ADD_COLUMN_SCHEMA("data_size", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -745,17 +744,16 @@ int ObInnerTableSchema::all_immediate_effect_index_sstable_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_sstable_checksum_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_sstable_checksum_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -791,21 +789,21 @@ int ObInnerTableSchema::all_sstable_checksum_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -814,201 +812,201 @@ int ObInnerTableSchema::all_sstable_checksum_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("data_table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sstable_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("sstable_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sstable_type", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("sstable_type", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 6, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 6, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 7, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_checksum", // 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 + ADD_COLUMN_SCHEMA("row_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_checksum", // 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 + ADD_COLUMN_SCHEMA("data_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_count", // 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 + ADD_COLUMN_SCHEMA("row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_type", // 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 + ADD_COLUMN_SCHEMA("replica_type", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -1026,17 +1024,16 @@ int ObInnerTableSchema::all_sstable_checksum_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_gc_partition_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_gc_partition_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1072,21 +1069,21 @@ int ObInnerTableSchema::all_tenant_gc_partition_info_schema(ObTableSchema& table gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -1095,66 +1092,66 @@ int ObInnerTableSchema::all_tenant_gc_partition_info_schema(ObTableSchema& table gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1164,17 +1161,16 @@ int ObInnerTableSchema::all_tenant_gc_partition_info_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_constraint_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_constraint_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1210,21 +1206,21 @@ int ObInnerTableSchema::all_constraint_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -1233,183 +1229,183 @@ int ObInnerTableSchema::all_constraint_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("constraint_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("constraint_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("constraint_name", // 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 - OB_MAX_CONSTRAINT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("constraint_name", //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 + OB_MAX_CONSTRAINT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("check_expr", // 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 - OB_MAX_CONSTRAINT_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("check_expr", //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 + OB_MAX_CONSTRAINT_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("constraint_type", // 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 + ADD_COLUMN_SCHEMA("constraint_type", //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 } if (OB_SUCC(ret)) { ObObj rely_flag_default; rely_flag_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("rely_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - rely_flag_default, - rely_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("rely_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + rely_flag_default, + rely_flag_default); //default_value } if (OB_SUCC(ret)) { ObObj enable_flag_default; enable_flag_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("enable_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - enable_flag_default, - enable_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("enable_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + enable_flag_default, + enable_flag_default); //default_value } if (OB_SUCC(ret)) { ObObj validate_flag_default; validate_flag_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("validate_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - validate_flag_default, - validate_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("validate_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + validate_flag_default, + validate_flag_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -1427,17 +1423,16 @@ int ObInnerTableSchema::all_constraint_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_constraint_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_constraint_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1473,21 +1468,21 @@ int ObInnerTableSchema::all_constraint_history_schema(ObTableSchema& table_schem gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -1496,198 +1491,198 @@ int ObInnerTableSchema::all_constraint_history_schema(ObTableSchema& table_schem gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("constraint_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("constraint_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("constraint_name", // 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 - OB_MAX_CONSTRAINT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("constraint_name", //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 + OB_MAX_CONSTRAINT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("check_expr", // 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 - OB_MAX_CONSTRAINT_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("check_expr", //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 + OB_MAX_CONSTRAINT_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("constraint_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("constraint_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj rely_flag_default; rely_flag_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("rely_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - rely_flag_default, - rely_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("rely_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + rely_flag_default, + rely_flag_default); //default_value } if (OB_SUCC(ret)) { ObObj enable_flag_default; enable_flag_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("enable_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - enable_flag_default, - enable_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("enable_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + enable_flag_default, + enable_flag_default); //default_value } if (OB_SUCC(ret)) { ObObj validate_flag_default; validate_flag_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("validate_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - validate_flag_default, - validate_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("validate_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + validate_flag_default, + validate_flag_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -1705,17 +1700,16 @@ int ObInnerTableSchema::all_constraint_history_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_ori_schema_version_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_ori_schema_version_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1751,21 +1745,21 @@ int ObInnerTableSchema::all_ori_schema_version_schema(ObTableSchema& table_schem gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -1774,85 +1768,85 @@ int ObInnerTableSchema::all_ori_schema_version_schema(ObTableSchema& table_schem gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ori_schema_version", // 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 + ADD_COLUMN_SCHEMA("ori_schema_version", //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 } if (OB_SUCC(ret)) { ObObj building_snapshot_default; building_snapshot_default.set_int(0); - ADD_COLUMN_SCHEMA_T("building_snapshot", // 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 - building_snapshot_default, - building_snapshot_default); // default_value + ADD_COLUMN_SCHEMA_T("building_snapshot", //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 + building_snapshot_default, + building_snapshot_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -1870,17 +1864,16 @@ int ObInnerTableSchema::all_ori_schema_version_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_func_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_func_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1916,21 +1909,21 @@ int ObInnerTableSchema::all_func_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -1939,111 +1932,111 @@ int ObInnerTableSchema::all_func_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_UDF_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_UDF_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ret", // 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 + ADD_COLUMN_SCHEMA("ret", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dl", // 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 - OB_MAX_DL_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dl", //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 + OB_MAX_DL_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("udf_id", // 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 + ADD_COLUMN_SCHEMA("udf_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 + ADD_COLUMN_SCHEMA("type", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -2061,17 +2054,16 @@ int ObInnerTableSchema::all_func_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_func_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_func_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2107,21 +2099,21 @@ int ObInnerTableSchema::all_func_history_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2130,141 +2122,141 @@ int ObInnerTableSchema::all_func_history_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_UDF_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_UDF_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ret", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ret", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dl", // 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 - OB_MAX_DL_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dl", //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 + OB_MAX_DL_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("udf_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("udf_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -2282,17 +2274,16 @@ int ObInnerTableSchema::all_func_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_temp_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_temp_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2323,52 +2314,52 @@ int ObInnerTableSchema::all_temp_table_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { ObObj create_host_default; create_host_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("create_host", // 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 - OB_MAX_HOST_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - create_host_default, - create_host_default); // default_value + ADD_COLUMN_SCHEMA_T("create_host", //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 + OB_MAX_HOST_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + create_host_default, + create_host_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -2386,17 +2377,16 @@ int ObInnerTableSchema::all_temp_table_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_sstable_column_checksum_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_sstable_column_checksum_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2432,21 +2422,21 @@ int ObInnerTableSchema::all_sstable_column_checksum_schema(ObTableSchema& table_ gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2455,216 +2445,216 @@ int ObInnerTableSchema::all_sstable_column_checksum_schema(ObTableSchema& table_ gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("data_table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("index_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sstable_type", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("sstable_type", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 7, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 7, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 8, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 8, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_checksum", // 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 + ADD_COLUMN_SCHEMA("column_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("checksum_method", // 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 + ADD_COLUMN_SCHEMA("checksum_method", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_type", // 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 + ADD_COLUMN_SCHEMA("replica_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("major_version", // 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 + ADD_COLUMN_SCHEMA("major_version", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -2682,17 +2672,16 @@ int ObInnerTableSchema::all_sstable_column_checksum_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_sequence_object_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_sequence_object_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2728,21 +2717,21 @@ int ObInnerTableSchema::all_sequence_object_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2751,201 +2740,201 @@ int ObInnerTableSchema::all_sequence_object_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("sequence_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_name", // 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 - OB_MAX_SEQUENCE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sequence_name", //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 + OB_MAX_SEQUENCE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_value", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("min_value", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_value", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_value", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("increment_by", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("increment_by", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_with", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("start_with", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cache_size", // 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 - 28, // column_precision - 0, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cache_size", //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 + 28, //column_precision + 0, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("order_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("order_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cycle_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cycle_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -2963,17 +2952,16 @@ int ObInnerTableSchema::all_sequence_object_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_sequence_object_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_sequence_object_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3009,21 +2997,21 @@ int ObInnerTableSchema::all_sequence_object_history_schema(ObTableSchema& table_ gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -3032,216 +3020,216 @@ int ObInnerTableSchema::all_sequence_object_history_schema(ObTableSchema& table_ gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("sequence_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_name", // 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 - OB_MAX_SEQUENCE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sequence_name", //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 + OB_MAX_SEQUENCE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_value", // 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 - 28, // column_precision - 0, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("min_value", //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 + 28, //column_precision + 0, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_value", // 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 - 28, // column_precision - 0, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_value", //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 + 28, //column_precision + 0, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("increment_by", // 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 - 28, // column_precision - 0, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("increment_by", //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 + 28, //column_precision + 0, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("start_with", // 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 - 28, // column_precision - 0, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("start_with", //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 + 28, //column_precision + 0, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cache_size", // 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 - 28, // column_precision - 0, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cache_size", //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 + 28, //column_precision + 0, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("order_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("order_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cycle_flag", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cycle_flag", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -3259,17 +3247,16 @@ int ObInnerTableSchema::all_sequence_object_history_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_sequence_value_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_sequence_value_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3305,21 +3292,21 @@ int ObInnerTableSchema::all_sequence_value_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -3328,51 +3315,51 @@ int ObInnerTableSchema::all_sequence_value_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sequence_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("sequence_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("next_value", // 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 + ADD_COLUMN_SCHEMA("next_value", //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(FLAT_ROW_STORE); @@ -3382,17 +3369,16 @@ int ObInnerTableSchema::all_sequence_value_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_plan_baseline_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_plan_baseline_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3428,21 +3414,21 @@ int ObInnerTableSchema::all_tenant_plan_baseline_schema(ObTableSchema& table_sch gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -3451,240 +3437,240 @@ int ObInnerTableSchema::all_tenant_plan_baseline_schema(ObTableSchema& table_sch gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_baseline_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("plan_baseline_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { ObObj database_id_default; database_id_default.set_uint64(0); - ADD_COLUMN_SCHEMA_T("database_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - database_id_default, - database_id_default); // default_value + ADD_COLUMN_SCHEMA_T("database_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + database_id_default, + database_id_default); //default_value } if (OB_SUCC(ret)) { ObObj schema_version_default; schema_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("schema_version", // 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 - schema_version_default, - schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("schema_version", //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 + schema_version_default, + schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj sql_id_default; sql_id_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sql_id", // 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_SQL_ID_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - sql_id_default, - sql_id_default); // default_value + ADD_COLUMN_SCHEMA_T("sql_id", //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_SQL_ID_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + sql_id_default, + sql_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_hash_value", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("plan_hash_value", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("params_info", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_BINARY, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("params_info", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_BINARY, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_data", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("outline_data", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_text", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_text", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj fixed_default; fixed_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("fixed", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - fixed_default, - fixed_default); // default_value + ADD_COLUMN_SCHEMA_T("fixed", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + fixed_default, + fixed_default); //default_value } if (OB_SUCC(ret)) { ObObj enabled_default; enabled_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("enabled", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - enabled_default, - enabled_default); // default_value + ADD_COLUMN_SCHEMA_T("enabled", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + enabled_default, + enabled_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hints_info", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("hints_info", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj hints_all_worked_default; hints_all_worked_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("hints_all_worked", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - hints_all_worked_default, - hints_all_worked_default); // default_value + ADD_COLUMN_SCHEMA_T("hints_all_worked", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + hints_all_worked_default, + hints_all_worked_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -3702,17 +3688,16 @@ int ObInnerTableSchema::all_tenant_plan_baseline_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_plan_baseline_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_plan_baseline_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3748,21 +3733,21 @@ int ObInnerTableSchema::all_tenant_plan_baseline_history_schema(ObTableSchema& t gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -3771,251 +3756,251 @@ int ObInnerTableSchema::all_tenant_plan_baseline_history_schema(ObTableSchema& t gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_baseline_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("plan_baseline_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj database_id_default; database_id_default.set_uint64(0); - ADD_COLUMN_SCHEMA_T("database_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - database_id_default, - database_id_default); // default_value + ADD_COLUMN_SCHEMA_T("database_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + database_id_default, + database_id_default); //default_value } if (OB_SUCC(ret)) { ObObj sql_id_default; sql_id_default.set_varbinary(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("sql_id", // 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_SQL_ID_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - sql_id_default, - sql_id_default); // default_value + ADD_COLUMN_SCHEMA_T("sql_id", //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_SQL_ID_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + sql_id_default, + sql_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan_hash_value", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("plan_hash_value", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("params_info", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_BINARY, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("params_info", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_BINARY, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("outline_data", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("outline_data", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_text", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_text", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj fixed_default; fixed_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("fixed", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - fixed_default, - fixed_default); // default_value + ADD_COLUMN_SCHEMA_T("fixed", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + fixed_default, + fixed_default); //default_value } if (OB_SUCC(ret)) { ObObj enabled_default; enabled_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("enabled", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - enabled_default, - enabled_default); // default_value + ADD_COLUMN_SCHEMA_T("enabled", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + enabled_default, + enabled_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hints_info", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("hints_info", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj hints_all_worked_default; hints_all_worked_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("hints_all_worked", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - hints_all_worked_default, - hints_all_worked_default); // default_value + ADD_COLUMN_SCHEMA_T("hints_all_worked", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + hints_all_worked_default, + hints_all_worked_default); //default_value } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -4033,17 +4018,16 @@ int ObInnerTableSchema::all_tenant_plan_baseline_history_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_ddl_helper_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_ddl_helper_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4079,21 +4063,21 @@ int ObInnerTableSchema::all_ddl_helper_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -4102,81 +4086,81 @@ int ObInnerTableSchema::all_ddl_helper_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_id", // 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 + ADD_COLUMN_SCHEMA("schema_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ddl_type", // 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 + ADD_COLUMN_SCHEMA("ddl_type", //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 } if (OB_SUCC(ret)) { table_schema.get_part_option().set_part_func_type(PARTITION_FUNC_TYPE_KEY); @@ -4194,17 +4178,16 @@ int ObInnerTableSchema::all_ddl_helper_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_freeze_schema_version_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_freeze_schema_version_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4240,21 +4223,21 @@ int ObInnerTableSchema::all_freeze_schema_version_schema(ObTableSchema& table_sc gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -4263,66 +4246,66 @@ int ObInnerTableSchema::all_freeze_schema_version_schema(ObTableSchema& table_sc gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("frozen_version", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("frozen_version", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4332,17 +4315,16 @@ int ObInnerTableSchema::all_freeze_schema_version_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_type_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_type_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4378,21 +4360,21 @@ int ObInnerTableSchema::all_type_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -4401,314 +4383,314 @@ int ObInnerTableSchema::all_type_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("type_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("typecode", // 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 + ADD_COLUMN_SCHEMA("typecode", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("properties", // 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 + ADD_COLUMN_SCHEMA("properties", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("attributes", // 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 + ADD_COLUMN_SCHEMA("attributes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("methods", // 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 + ADD_COLUMN_SCHEMA("methods", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hiddenmethods", // 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 + ADD_COLUMN_SCHEMA("hiddenmethods", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("supertypes", // 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 + ADD_COLUMN_SCHEMA("supertypes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subtypes", // 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 + ADD_COLUMN_SCHEMA("subtypes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("externtype", // 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 + ADD_COLUMN_SCHEMA("externtype", //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 } if (OB_SUCC(ret)) { ObObj externname_default; externname_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("externname", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - externname_default, - externname_default); // default_value + ADD_COLUMN_SCHEMA_T("externname", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + externname_default, + externname_default); //default_value } if (OB_SUCC(ret)) { ObObj helperclassname_default; helperclassname_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("helperclassname", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - helperclassname_default, - helperclassname_default); // default_value + ADD_COLUMN_SCHEMA_T("helperclassname", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + helperclassname_default, + helperclassname_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("local_attrs", // 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 + ADD_COLUMN_SCHEMA("local_attrs", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("local_methods", // 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 + ADD_COLUMN_SCHEMA("local_methods", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("supertypeid", // 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 + ADD_COLUMN_SCHEMA("supertypeid", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_name", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type_name", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_id", // 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 + ADD_COLUMN_SCHEMA("package_id", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4718,17 +4700,16 @@ int ObInnerTableSchema::all_type_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_type_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_type_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4764,21 +4745,21 @@ int ObInnerTableSchema::all_type_history_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -4787,329 +4768,329 @@ int ObInnerTableSchema::all_type_history_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("type_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("typecode", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("typecode", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("properties", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("properties", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("attributes", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("attributes", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("methods", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("methods", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("hiddenmethods", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("hiddenmethods", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("supertypes", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("supertypes", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("subtypes", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("subtypes", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("externtype", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("externtype", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj externname_default; externname_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("externname", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - externname_default, - externname_default); // default_value + ADD_COLUMN_SCHEMA_T("externname", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + externname_default, + externname_default); //default_value } if (OB_SUCC(ret)) { ObObj helperclassname_default; helperclassname_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("helperclassname", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - helperclassname_default, - helperclassname_default); // default_value + ADD_COLUMN_SCHEMA_T("helperclassname", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + helperclassname_default, + helperclassname_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("local_attrs", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("local_attrs", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("local_methods", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("local_methods", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("supertypeid", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("supertypeid", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_name", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type_name", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_id", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5119,17 +5100,16 @@ int ObInnerTableSchema::all_type_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_type_attr_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_type_attr_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5165,21 +5145,21 @@ int ObInnerTableSchema::all_type_attr_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -5188,295 +5168,295 @@ int ObInnerTableSchema::all_type_attr_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("type_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("attribute", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("attribute", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_attr_id", // 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 + ADD_COLUMN_SCHEMA("type_attr_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("properties", // 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 + ADD_COLUMN_SCHEMA("properties", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_id", // 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 + ADD_COLUMN_SCHEMA("charset_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_form", // 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 + ADD_COLUMN_SCHEMA("charset_form", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("length", // 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 + ADD_COLUMN_SCHEMA("length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("number_precision", // 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 + ADD_COLUMN_SCHEMA("number_precision", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scale", // 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 + ADD_COLUMN_SCHEMA("scale", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zero_fill", // 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 + ADD_COLUMN_SCHEMA("zero_fill", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_type", // 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 + ADD_COLUMN_SCHEMA("coll_type", //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 } if (OB_SUCC(ret)) { ObObj externname_default; externname_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("externname", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - externname_default, - externname_default); // default_value + ADD_COLUMN_SCHEMA_T("externname", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + externname_default, + externname_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("xflags", // 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 + ADD_COLUMN_SCHEMA("xflags", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("setter", // 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 + ADD_COLUMN_SCHEMA("setter", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("getter", // 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 + ADD_COLUMN_SCHEMA("getter", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5486,17 +5466,16 @@ int ObInnerTableSchema::all_type_attr_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_type_attr_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_type_attr_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5532,21 +5511,21 @@ int ObInnerTableSchema::all_type_attr_history_schema(ObTableSchema& table_schema gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -5555,310 +5534,310 @@ int ObInnerTableSchema::all_type_attr_history_schema(ObTableSchema& table_schema gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("type_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("attribute", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("attribute", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type_attr_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type_attr_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("properties", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("properties", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("charset_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_form", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("charset_form", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("length", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("length", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("number_precision", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("number_precision", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scale", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("scale", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zero_fill", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zero_fill", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("coll_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj externname_default; externname_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("externname", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - externname_default, - externname_default); // default_value + ADD_COLUMN_SCHEMA_T("externname", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + externname_default, + externname_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("xflags", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("xflags", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("setter", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("setter", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("getter", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("getter", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5868,17 +5847,16 @@ int ObInnerTableSchema::all_type_attr_history_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_coll_type_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_coll_type_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5914,21 +5892,21 @@ int ObInnerTableSchema::all_coll_type_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -5937,261 +5915,261 @@ int ObInnerTableSchema::all_coll_type_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_type_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("coll_type_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("elem_type_id", // 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 + ADD_COLUMN_SCHEMA("elem_type_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("elem_schema_version", // 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 + ADD_COLUMN_SCHEMA("elem_schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("properties", // 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 + ADD_COLUMN_SCHEMA("properties", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_id", // 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 + ADD_COLUMN_SCHEMA("charset_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_form", // 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 + ADD_COLUMN_SCHEMA("charset_form", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("length", // 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 + ADD_COLUMN_SCHEMA("length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("number_precision", // 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 + ADD_COLUMN_SCHEMA("number_precision", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scale", // 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 + ADD_COLUMN_SCHEMA("scale", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zero_fill", // 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 + ADD_COLUMN_SCHEMA("zero_fill", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_type", // 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 + ADD_COLUMN_SCHEMA("coll_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("upper_bound", // 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 + ADD_COLUMN_SCHEMA("upper_bound", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_id", // 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 + ADD_COLUMN_SCHEMA("package_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_name", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("coll_name", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6201,17 +6179,16 @@ int ObInnerTableSchema::all_coll_type_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_coll_type_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_coll_type_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6247,21 +6224,21 @@ int ObInnerTableSchema::all_coll_type_history_schema(ObTableSchema& table_schema gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -6270,276 +6247,276 @@ int ObInnerTableSchema::all_coll_type_history_schema(ObTableSchema& table_schema gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_type_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("coll_type_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("elem_type_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("elem_type_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("elem_schema_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("elem_schema_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("properties", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("properties", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("charset_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_form", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("charset_form", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("length", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("length", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("number_precision", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("number_precision", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scale", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("scale", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zero_fill", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zero_fill", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("coll_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("upper_bound", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("upper_bound", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_name", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("coll_name", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //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(FLAT_ROW_STORE); @@ -6549,17 +6526,16 @@ int ObInnerTableSchema::all_coll_type_history_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_weak_read_service_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_weak_read_service_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6595,21 +6571,21 @@ int ObInnerTableSchema::all_weak_read_service_schema(ObTableSchema& table_schema gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -6618,96 +6594,96 @@ int ObInnerTableSchema::all_weak_read_service_schema(ObTableSchema& table_schema gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("level_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("level_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("level_value", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_WRS_LEVEL_VALUE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("level_value", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_WRS_LEVEL_VALUE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("level_name", // 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 - OB_WRS_LEVEL_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("level_name", //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 + OB_WRS_LEVEL_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("min_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("min_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_version", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6717,17 +6693,16 @@ int ObInnerTableSchema::all_weak_read_service_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_gts_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_gts_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6763,21 +6738,21 @@ int ObInnerTableSchema::all_gts_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -6786,141 +6761,141 @@ int ObInnerTableSchema::all_gts_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("gts_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("gts_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("gts_name", // 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 - MAX_GTS_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("gts_name", //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 + MAX_GTS_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("region", // 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 - MAX_REGION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("region", //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 + MAX_REGION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("epoch_id", // 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 + ADD_COLUMN_SCHEMA("epoch_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("member_list", // 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 - MAX_MEMBER_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("member_list", //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 + MAX_MEMBER_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("standby_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("standby_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("standby_port", // 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 + ADD_COLUMN_SCHEMA("standby_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("heartbeat_ts", // 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 + ADD_COLUMN_SCHEMA("heartbeat_ts", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6930,17 +6905,16 @@ int ObInnerTableSchema::all_gts_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_gts_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_gts_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6976,21 +6950,21 @@ int ObInnerTableSchema::all_tenant_gts_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -6999,93 +6973,93 @@ int ObInnerTableSchema::all_tenant_gts_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { ObObj gts_id_default; gts_id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("gts_id", // 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 - gts_id_default, - gts_id_default); // default_value + ADD_COLUMN_SCHEMA_T("gts_id", //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 + gts_id_default, + gts_id_default); //default_value } if (OB_SUCC(ret)) { ObObj orig_gts_id_default; orig_gts_id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("orig_gts_id", // 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 - orig_gts_id_default, - orig_gts_id_default); // default_value + ADD_COLUMN_SCHEMA_T("orig_gts_id", //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 + orig_gts_id_default, + orig_gts_id_default); //default_value } if (OB_SUCC(ret)) { ObObj gts_invalid_ts_default; gts_invalid_ts_default.set_int(0); - ADD_COLUMN_SCHEMA_T("gts_invalid_ts", // 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 - gts_invalid_ts_default, - gts_invalid_ts_default); // default_value + ADD_COLUMN_SCHEMA_T("gts_invalid_ts", //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 + gts_invalid_ts_default, + gts_invalid_ts_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -7095,17 +7069,16 @@ int ObInnerTableSchema::all_tenant_gts_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_partition_member_list_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_partition_member_list_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7141,21 +7114,21 @@ int ObInnerTableSchema::all_partition_member_list_schema(ObTableSchema& table_sc gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -7164,119 +7137,119 @@ int ObInnerTableSchema::all_partition_member_list_schema(ObTableSchema& table_sc gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("member_list", // 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 - MAX_MEMBER_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("member_list", //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 + MAX_MEMBER_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj schema_version_default; schema_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("schema_version", // 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 - schema_version_default, - schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("schema_version", //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 + schema_version_default, + schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_status_default; partition_status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_status", // 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 - partition_status_default, - partition_status_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_status", //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 + partition_status_default, + partition_status_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -7286,17 +7259,16 @@ int ObInnerTableSchema::all_partition_member_list_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_dblink_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_dblink_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7332,21 +7304,21 @@ int ObInnerTableSchema::all_dblink_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -7355,171 +7327,171 @@ int ObInnerTableSchema::all_dblink_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dblink_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("dblink_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dblink_name", // 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 - OB_MAX_DBLINK_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dblink_name", //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 + OB_MAX_DBLINK_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 + ADD_COLUMN_SCHEMA("owner_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("host_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("host_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("host_port", // 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 + ADD_COLUMN_SCHEMA("host_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_name", // 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 - OB_MAX_CLUSTER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_name", //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 + OB_MAX_CLUSTER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_name", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_name", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("password", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -7529,17 +7501,16 @@ int ObInnerTableSchema::all_dblink_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_dblink_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_dblink_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7575,21 +7546,21 @@ int ObInnerTableSchema::all_dblink_history_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -7598,201 +7569,201 @@ int ObInnerTableSchema::all_dblink_history_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dblink_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("dblink_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dblink_name", // 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 - OB_MAX_DBLINK_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dblink_name", //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 + OB_MAX_DBLINK_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("host_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("host_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("host_port", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("host_port", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_name", // 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 - OB_MAX_CLUSTER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_name", //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 + OB_MAX_CLUSTER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_name", // 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 - OB_MAX_USER_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_name", //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 + OB_MAX_USER_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("password", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //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(FLAT_ROW_STORE); @@ -7802,17 +7773,16 @@ int ObInnerTableSchema::all_dblink_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_partition_meta_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_partition_meta_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7848,21 +7818,21 @@ int ObInnerTableSchema::all_tenant_partition_meta_table_schema(ObTableSchema& ta gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -7871,232 +7841,232 @@ int ObInnerTableSchema::all_tenant_partition_meta_table_schema(ObTableSchema& ta gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - 32, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + 32, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role", // 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 + ADD_COLUMN_SCHEMA("role", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("row_count", // 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 + ADD_COLUMN_SCHEMA("row_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_size", // 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 + ADD_COLUMN_SCHEMA("data_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_version", // 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 + ADD_COLUMN_SCHEMA("data_version", //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 } if (OB_SUCC(ret)) { ObObj required_size_default; required_size_default.set_int(0); - ADD_COLUMN_SCHEMA_T("required_size", // 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 - required_size_default, - required_size_default); // default_value + ADD_COLUMN_SCHEMA_T("required_size", //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 + required_size_default, + required_size_default); //default_value } if (OB_SUCC(ret)) { ObObj replica_type_default; replica_type_default.set_int(0); - ADD_COLUMN_SCHEMA_T("replica_type", // 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 - replica_type_default, - replica_type_default); // default_value + ADD_COLUMN_SCHEMA_T("replica_type", //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 + replica_type_default, + replica_type_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("REPLICA_STATUS_NORMAL")); - ADD_COLUMN_SCHEMA_T("status", // 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 - MAX_REPLICA_STATUS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + MAX_REPLICA_STATUS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { ObObj data_checksum_default; data_checksum_default.set_int(0); - ADD_COLUMN_SCHEMA_T("data_checksum", // 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 - data_checksum_default, - data_checksum_default); // default_value + ADD_COLUMN_SCHEMA_T("data_checksum", //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 + data_checksum_default, + data_checksum_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8106,17 +8076,16 @@ int ObInnerTableSchema::all_tenant_partition_meta_table_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_role_grantee_map_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_role_grantee_map_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8152,21 +8121,21 @@ int ObInnerTableSchema::all_tenant_role_grantee_map_schema(ObTableSchema& table_ gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -8175,104 +8144,104 @@ int ObInnerTableSchema::all_tenant_role_grantee_map_schema(ObTableSchema& table_ gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grantee_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("grantee_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("role_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { ObObj admin_option_default; admin_option_default.set_int(0); - ADD_COLUMN_SCHEMA_T("admin_option", // 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 - admin_option_default, - admin_option_default); // default_value + ADD_COLUMN_SCHEMA_T("admin_option", //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 + admin_option_default, + admin_option_default); //default_value } if (OB_SUCC(ret)) { ObObj disable_flag_default; disable_flag_default.set_int(0); - ADD_COLUMN_SCHEMA_T("disable_flag", // 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 - disable_flag_default, - disable_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("disable_flag", //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 + disable_flag_default, + disable_flag_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8282,17 +8251,16 @@ int ObInnerTableSchema::all_tenant_role_grantee_map_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_role_grantee_map_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_role_grantee_map_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8328,21 +8296,21 @@ int ObInnerTableSchema::all_tenant_role_grantee_map_history_schema(ObTableSchema gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -8351,134 +8319,134 @@ int ObInnerTableSchema::all_tenant_role_grantee_map_history_schema(ObTableSchema gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grantee_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("grantee_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("role_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("role_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj admin_option_default; admin_option_default.set_int(0); - ADD_COLUMN_SCHEMA_T("admin_option", // 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 - true, // is_nullable - false, // is_autoincrement - admin_option_default, - admin_option_default); // default_value + ADD_COLUMN_SCHEMA_T("admin_option", //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 + true, //is_nullable + false, //is_autoincrement + admin_option_default, + admin_option_default); //default_value } if (OB_SUCC(ret)) { ObObj disable_flag_default; disable_flag_default.set_int(0); - ADD_COLUMN_SCHEMA_T("disable_flag", // 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 - true, // is_nullable - false, // is_autoincrement - disable_flag_default, - disable_flag_default); // default_value + ADD_COLUMN_SCHEMA_T("disable_flag", //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 + true, //is_nullable + false, //is_autoincrement + disable_flag_default, + disable_flag_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8488,17 +8456,16 @@ int ObInnerTableSchema::all_tenant_role_grantee_map_history_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_keystore_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_keystore_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8534,21 +8501,21 @@ int ObInnerTableSchema::all_tenant_keystore_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -8557,130 +8524,130 @@ int ObInnerTableSchema::all_tenant_keystore_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("keystore_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("keystore_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("keystore_name", // 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 - OB_MAX_KEYSTORE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("keystore_name", //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 + OB_MAX_KEYSTORE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("password", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("status", // 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 - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("master_key_id", // 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 + ADD_COLUMN_SCHEMA("master_key_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("master_key", // 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 - OB_MAX_MASTER_KEY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("master_key", //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 + OB_MAX_MASTER_KEY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8690,17 +8657,16 @@ int ObInnerTableSchema::all_tenant_keystore_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_keystore_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_keystore_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8736,21 +8702,21 @@ int ObInnerTableSchema::all_tenant_keystore_history_schema(ObTableSchema& table_ gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -8759,160 +8725,160 @@ int ObInnerTableSchema::all_tenant_keystore_history_schema(ObTableSchema& table_ gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("keystore_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("keystore_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("keystore_name", // 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 - OB_MAX_KEYSTORE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("keystore_name", //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 + OB_MAX_KEYSTORE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("password", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("status", // 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 - true, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + true, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("master_key_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("master_key_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("master_key", // 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 - OB_MAX_MASTER_KEY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("master_key", //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 + OB_MAX_MASTER_KEY_LENGTH, //column_length + -1, //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(FLAT_ROW_STORE); @@ -8922,17 +8888,16 @@ int ObInnerTableSchema::all_tenant_keystore_history_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_tablespace_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_tablespace_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8968,21 +8933,21 @@ int ObInnerTableSchema::all_tenant_tablespace_schema(ObTableSchema& table_schema gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -8991,111 +8956,111 @@ int ObInnerTableSchema::all_tenant_tablespace_schema(ObTableSchema& table_schema gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablespace_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("tablespace_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablespace_name", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tablespace_name", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("encryption_name", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("encryption_name", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("encrypt_key", // 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_MASTER_KEY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("encrypt_key", //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_MASTER_KEY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("master_key_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("master_key_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9105,17 +9070,16 @@ int ObInnerTableSchema::all_tenant_tablespace_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_tablespace_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_tablespace_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9151,21 +9115,21 @@ int ObInnerTableSchema::all_tenant_tablespace_history_schema(ObTableSchema& tabl gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -9174,141 +9138,141 @@ int ObInnerTableSchema::all_tenant_tablespace_history_schema(ObTableSchema& tabl gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablespace_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("tablespace_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablespace_name", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tablespace_name", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("encryption_name", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("encryption_name", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("encrypt_key", // 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_MASTER_KEY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("encrypt_key", //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_MASTER_KEY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("master_key_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("master_key_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //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(FLAT_ROW_STORE); @@ -9318,17 +9282,16 @@ int ObInnerTableSchema::all_tenant_tablespace_history_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_user_failed_login_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_user_failed_login_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9364,21 +9327,21 @@ int ObInnerTableSchema::all_tenant_user_failed_login_stat_schema(ObTableSchema& gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -9387,100 +9350,100 @@ int ObInnerTableSchema::all_tenant_user_failed_login_stat_schema(ObTableSchema& gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_name", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_name", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("failed_login_attempts", // 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 + ADD_COLUMN_SCHEMA("failed_login_attempts", //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 } if (OB_SUCC(ret)) { ObObj last_failed_login_svr_ip_default; last_failed_login_svr_ip_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("last_failed_login_svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - last_failed_login_svr_ip_default, - last_failed_login_svr_ip_default); // default_value + ADD_COLUMN_SCHEMA_T("last_failed_login_svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + last_failed_login_svr_ip_default, + last_failed_login_svr_ip_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9490,10 +9453,10 @@ int ObInnerTableSchema::all_tenant_user_failed_login_stat_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.21001_21050.cpp b/src/share/inner_table/ob_inner_table_schema.21001_21050.cpp index c2f09f6ad..68cc2aa81 100644 --- a/src/share/inner_table/ob_inner_table_schema.21001_21050.cpp +++ b/src/share/inner_table/ob_inner_table_schema.21001_21050.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::gv_session_event_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_session_event_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -58,8 +60,7 @@ int ObInnerTableSchema::gv_session_event_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select session_id as SID, tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, event_id as EVENT_ID, event as EVENT, wait_class_id as WAIT_CLASS_ID, `wait_class#` as `WAIT_CLASS#`, wait_class as WAIT_CLASS, total_waits as TOTAL_WAITS, total_timeouts as TOTAL_TIMEOUTS, time_waited as TIME_WAITED, max_wait as MAX_WAIT, average_wait as AVERAGE_WAIT, time_waited_micro as TIME_WAITED_MICRO from oceanbase.__all_virtual_session_event where is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select session_id as SID, tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, event_id as EVENT_ID, event as EVENT, wait_class_id as WAIT_CLASS_ID, `wait_class#` as `WAIT_CLASS#`, wait_class as WAIT_CLASS, total_waits as TOTAL_WAITS, total_timeouts as TOTAL_TIMEOUTS, time_waited as TIME_WAITED, max_wait as MAX_WAIT, average_wait as AVERAGE_WAIT, time_waited_micro as TIME_WAITED_MICRO from oceanbase.__all_virtual_session_event where is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -71,17 +72,16 @@ int ObInnerTableSchema::gv_session_event_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_session_wait_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_session_wait_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -112,8 +112,7 @@ int ObInnerTableSchema::gv_session_wait_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select session_id as SID, tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, event as EVENT, p1text as P1TEXT, p1 as P1, p2text as P2TEXT, p2 as P2, p3text as P3TEXT, p3 as P3, wait_class_id as WAIT_CLASS_ID, `wait_class#` as `WAIT_CLASS#`, wait_class as WAIT_CLASS, state as STATE, wait_time_micro as WAIT_TIME_MICRO, time_remaining_micro as TIME_REMAINING_MICRO, time_since_last_wait_micro as TIME_SINCE_LAST_WAIT_MICRO from oceanbase.__all_virtual_session_wait where (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select session_id as SID, tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, event as EVENT, p1text as P1TEXT, p1 as P1, p2text as P2TEXT, p2 as P2, p3text as P3TEXT, p3 as P3, wait_class_id as WAIT_CLASS_ID, `wait_class#` as `WAIT_CLASS#`, wait_class as WAIT_CLASS, state as STATE, wait_time_micro as WAIT_TIME_MICRO, time_remaining_micro as TIME_REMAINING_MICRO, time_since_last_wait_micro as TIME_SINCE_LAST_WAIT_MICRO from oceanbase.__all_virtual_session_wait where (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -125,17 +124,16 @@ int ObInnerTableSchema::gv_session_wait_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_session_wait_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_session_wait_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -166,8 +164,7 @@ int ObInnerTableSchema::gv_session_wait_history_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select session_id as SID, tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, `seq#` as `SEQ#`, `event#` as `EVENT#`, event as EVENT, p1text as P1TEXT, p1 as P1, p2text as P2TEXT, p2 as P2, p3text as P3TEXT, p3 as P3, wait_time_micro as WAIT_TIME_MICRO, time_since_last_wait_micro as TIME_SINCE_LAST_WAIT_MICRO, wait_time as WAIT_TIME from oceanbase.__all_virtual_session_wait_history where is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select session_id as SID, tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, `seq#` as `SEQ#`, `event#` as `EVENT#`, event as EVENT, p1text as P1TEXT, p1 as P1, p2text as P2TEXT, p2 as P2, p3text as P3TEXT, p3 as P3, wait_time_micro as WAIT_TIME_MICRO, time_since_last_wait_micro as TIME_SINCE_LAST_WAIT_MICRO, wait_time as WAIT_TIME from oceanbase.__all_virtual_session_wait_history where is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -179,17 +176,16 @@ int ObInnerTableSchema::gv_session_wait_history_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_system_event_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_system_event_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -220,8 +216,7 @@ int ObInnerTableSchema::gv_system_event_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, event_id as EVENT_ID, event as EVENT, wait_class_id as WAIT_CLASS_ID, `wait_class#` as `WAIT_CLASS#`, wait_class as WAIT_CLASS, total_waits as TOTAL_WAITS, total_timeouts as TOTAL_TIMEOUTS, time_waited as TIME_WAITED, average_wait as AVERAGE_WAIT, time_waited_micro as TIME_WAITED_MICRO from oceanbase.__all_virtual_system_event where is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, event_id as EVENT_ID, event as EVENT, wait_class_id as WAIT_CLASS_ID, `wait_class#` as `WAIT_CLASS#`, wait_class as WAIT_CLASS, total_waits as TOTAL_WAITS, total_timeouts as TOTAL_TIMEOUTS, time_waited as TIME_WAITED, average_wait as AVERAGE_WAIT, time_waited_micro as TIME_WAITED_MICRO from oceanbase.__all_virtual_system_event where is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -233,17 +228,16 @@ int ObInnerTableSchema::gv_system_event_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sesstat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sesstat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -274,8 +268,7 @@ int ObInnerTableSchema::gv_sesstat_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select session_id as SID, tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, `statistic#` as `STATISTIC#`, value as VALUE from oceanbase.__all_virtual_sesstat where is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and can_visible = true and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select session_id as SID, tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, `statistic#` as `STATISTIC#`, value as VALUE from oceanbase.__all_virtual_sesstat where is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and can_visible = true and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -287,17 +280,16 @@ int ObInnerTableSchema::gv_sesstat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sysstat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sysstat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -328,8 +320,7 @@ int ObInnerTableSchema::gv_sysstat_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, `statistic#` as `STATISTIC#`, value as VALUE, stat_id as STAT_ID, name as NAME, class as CLASS from oceanbase.__all_virtual_sysstat where is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and can_visible = true and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, `statistic#` as `STATISTIC#`, value as VALUE, stat_id as STAT_ID, name as NAME, class as CLASS from oceanbase.__all_virtual_sysstat where is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and can_visible = true and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -341,17 +332,16 @@ int ObInnerTableSchema::gv_sysstat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_statname_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_statname_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -382,8 +372,7 @@ int ObInnerTableSchema::v_statname_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select tenant_id as CON_ID, stat_id as STAT_ID, `statistic#` as `STATISTIC#`, name as NAME, display_name as DISPLAY_NAME, class as CLASS from oceanbase.__tenant_virtual_statname )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select tenant_id as CON_ID, stat_id as STAT_ID, `statistic#` as `STATISTIC#`, name as NAME, display_name as DISPLAY_NAME, class as CLASS from oceanbase.__tenant_virtual_statname )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -395,17 +384,16 @@ int ObInnerTableSchema::v_statname_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_event_name_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_event_name_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -436,8 +424,7 @@ int ObInnerTableSchema::v_event_name_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select tenant_id as CON_ID, event_id as EVENT_ID, `event#` as `EVENT#`, name as NAME, display_name as DISPLAY_NAME, parameter1 as PARAMETER1, parameter2 as PARAMETER2, parameter3 as PARAMETER3, wait_class_id as WAIT_CLASS_ID, `wait_class#` as `WAIT_CLASS#`, wait_class as WAIT_CLASS from oceanbase.__tenant_virtual_event_name )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select tenant_id as CON_ID, event_id as EVENT_ID, `event#` as `EVENT#`, name as NAME, display_name as DISPLAY_NAME, parameter1 as PARAMETER1, parameter2 as PARAMETER2, parameter3 as PARAMETER3, wait_class_id as WAIT_CLASS_ID, `wait_class#` as `WAIT_CLASS#`, wait_class as WAIT_CLASS from oceanbase.__tenant_virtual_event_name )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -449,17 +436,16 @@ int ObInnerTableSchema::v_event_name_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_session_event_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_session_event_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -490,8 +476,7 @@ int ObInnerTableSchema::v_session_event_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select SID,CON_ID,EVENT_ID,EVENT,WAIT_CLASS_ID, `WAIT_CLASS#`,WAIT_CLASS,TOTAL_WAITS,TOTAL_TIMEOUTS,TIME_WAITED, MAX_WAIT,AVERAGE_WAIT,TIME_WAITED_MICRO from oceanbase.gv$session_event where SVR_IP=host_ip() and SVR_PORT=rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select SID,CON_ID,EVENT_ID,EVENT,WAIT_CLASS_ID, `WAIT_CLASS#`,WAIT_CLASS,TOTAL_WAITS,TOTAL_TIMEOUTS,TIME_WAITED, MAX_WAIT,AVERAGE_WAIT,TIME_WAITED_MICRO from oceanbase.gv$session_event where SVR_IP=host_ip() and SVR_PORT=rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -503,17 +488,16 @@ int ObInnerTableSchema::v_session_event_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_session_wait_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_session_wait_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -544,8 +528,7 @@ int ObInnerTableSchema::v_session_wait_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select SID,CON_ID,EVENT,P1TEXT,P1, P2TEXT,P2,P3TEXT,P3,WAIT_CLASS_ID, `WAIT_CLASS#`,WAIT_CLASS,STATE,WAIT_TIME_MICRO,TIME_REMAINING_MICRO, TIME_SINCE_LAST_WAIT_MICRO from oceanbase.gv$session_wait where SVR_IP=host_ip() and SVR_PORT=rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select SID,CON_ID,EVENT,P1TEXT,P1, P2TEXT,P2,P3TEXT,P3,WAIT_CLASS_ID, `WAIT_CLASS#`,WAIT_CLASS,STATE,WAIT_TIME_MICRO,TIME_REMAINING_MICRO, TIME_SINCE_LAST_WAIT_MICRO from oceanbase.gv$session_wait where SVR_IP=host_ip() and SVR_PORT=rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -557,17 +540,16 @@ int ObInnerTableSchema::v_session_wait_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_session_wait_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_session_wait_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -598,8 +580,7 @@ int ObInnerTableSchema::v_session_wait_history_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select SID,CON_ID,`SEQ#`,`EVENT#`,EVENT, P1TEXT,P1,P2TEXT,P2,P3TEXT, P3,WAIT_TIME_MICRO,TIME_SINCE_LAST_WAIT_MICRO,WAIT_TIME from oceanbase.gv$session_wait_history where SVR_IP=host_ip() and SVR_PORT=rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select SID,CON_ID,`SEQ#`,`EVENT#`,EVENT, P1TEXT,P1,P2TEXT,P2,P3TEXT, P3,WAIT_TIME_MICRO,TIME_SINCE_LAST_WAIT_MICRO,WAIT_TIME from oceanbase.gv$session_wait_history where SVR_IP=host_ip() and SVR_PORT=rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -611,17 +592,16 @@ int ObInnerTableSchema::v_session_wait_history_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sesstat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sesstat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -652,8 +632,7 @@ int ObInnerTableSchema::v_sesstat_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select SID,CON_ID,`STATISTIC#`,VALUE from oceanbase.gv$sesstat where SVR_IP=host_ip() and SVR_PORT=rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select SID,CON_ID,`STATISTIC#`,VALUE from oceanbase.gv$sesstat where SVR_IP=host_ip() and SVR_PORT=rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -665,17 +644,16 @@ int ObInnerTableSchema::v_sesstat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sysstat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sysstat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -706,8 +684,7 @@ int ObInnerTableSchema::v_sysstat_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select CON_ID,`STATISTIC#`,VALUE,STAT_ID,NAME,CLASS from oceanbase.gv$sysstat where SVR_IP=host_ip() and SVR_PORT=rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select CON_ID,`STATISTIC#`,VALUE,STAT_ID,NAME,CLASS from oceanbase.gv$sysstat where SVR_IP=host_ip() and SVR_PORT=rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -719,17 +696,16 @@ int ObInnerTableSchema::v_sysstat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_system_event_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_system_event_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -760,8 +736,7 @@ int ObInnerTableSchema::v_system_event_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select CON_ID,EVENT_ID,EVENT,WAIT_CLASS_ID,`WAIT_CLASS#`, WAIT_CLASS,TOTAL_WAITS,TOTAL_TIMEOUTS,TIME_WAITED,AVERAGE_WAIT, TIME_WAITED_MICRO from oceanbase.gv$system_event where SVR_IP=host_ip() and SVR_PORT=rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select CON_ID,EVENT_ID,EVENT,WAIT_CLASS_ID,`WAIT_CLASS#`, WAIT_CLASS,TOTAL_WAITS,TOTAL_TIMEOUTS,TIME_WAITED,AVERAGE_WAIT, TIME_WAITED_MICRO from oceanbase.gv$system_event where SVR_IP=host_ip() and SVR_PORT=rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -773,17 +748,16 @@ int ObInnerTableSchema::v_system_event_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sql_audit_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sql_audit_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -814,8 +788,7 @@ int ObInnerTableSchema::gv_sql_audit_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select svr_ip as SVR_IP, svr_port as SVR_PORT, request_id as REQUEST_ID, execution_id as SQL_EXEC_ID, trace_id as TRACE_ID, session_id as SID, client_ip as CLIENT_IP, client_port as CLIENT_PORT, tenant_id as TENANT_ID, tenant_name as TENANT_NAME, effective_tenant_id as EFFECTIVE_TENANT_ID, user_id as USER_ID, user_name as USER_NAME, user_group as USER_GROUP, user_client_ip as USER_CLIENT_IP, db_id as DB_ID, db_name as DB_NAME, sql_id as SQL_ID, query_sql as QUERY_SQL, plan_id as PLAN_ID, affected_rows as AFFECTED_ROWS, return_rows as RETURN_ROWS, partition_cnt as PARTITION_CNT, ret_code as RET_CODE, qc_id as QC_ID, dfo_id as DFO_ID, sqc_id as SQC_ID, worker_id as WORKER_ID, event as EVENT, p1text as P1TEXT, p1 as P1, p2text as P2TEXT, p2 as P2, p3text as P3TEXT, p3 as P3, `level` as `LEVEL`, wait_class_id as WAIT_CLASS_ID, `wait_class#` as `WAIT_CLASS#`, wait_class as WAIT_CLASS, state as STATE, wait_time_micro as WAIT_TIME_MICRO, total_wait_time_micro as TOTAL_WAIT_TIME_MICRO, total_waits as TOTAL_WAITS, rpc_count as RPC_COUNT, plan_type as PLAN_TYPE, is_inner_sql as IS_INNER_SQL, is_executor_rpc as IS_EXECUTOR_RPC, is_hit_plan as IS_HIT_PLAN, request_time as REQUEST_TIME, elapsed_time as ELAPSED_TIME, net_time as NET_TIME, net_wait_time as NET_WAIT_TIME, queue_time as QUEUE_TIME, decode_time as DECODE_TIME, get_plan_time as GET_PLAN_TIME, execute_time as EXECUTE_TIME, application_wait_time as APPLICATION_WAIT_TIME, concurrency_wait_time as CONCURRENCY_WAIT_TIME, user_io_wait_time as USER_IO_WAIT_TIME, schedule_time as SCHEDULE_TIME, row_cache_hit as ROW_CACHE_HIT, bloom_filter_cache_hit as BLOOM_FILTER_CACHE_HIT, block_cache_hit as BLOCK_CACHE_HIT, block_index_cache_hit as BLOCK_INDEX_CACHE_HIT, disk_reads as DISK_READS, retry_cnt as RETRY_CNT, table_scan as TABLE_SCAN, consistency_level as CONSISTENCY_LEVEL, memstore_read_row_count as MEMSTORE_READ_ROW_COUNT, ssstore_read_row_count as SSSTORE_READ_ROW_COUNT, request_memory_used as REQUEST_MEMORY_USED, expected_worker_count as EXPECTED_WORKER_COUNT, used_worker_count as USED_WORKER_COUNT, sched_info as SCHED_INFO, fuse_row_cache_hit as FUSE_ROW_CACHE_HIT, ps_stmt_id as PS_STMT_ID, transaction_hash as TRANSACTION_HASH, request_type as REQUEST_TYPE, is_batched_multi_stmt as IS_BATCHED_MULTI_STMT, ob_trace_info as OB_TRACE_INFO, plan_hash as PLAN_HASH, lock_for_read_time as LOCK_FOR_READ_TIME, wait_trx_migrate_time as WAIT_TRX_MIGRATE_TIME from oceanbase.__all_virtual_sql_audit where is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select svr_ip as SVR_IP, svr_port as SVR_PORT, request_id as REQUEST_ID, execution_id as SQL_EXEC_ID, trace_id as TRACE_ID, session_id as SID, client_ip as CLIENT_IP, client_port as CLIENT_PORT, tenant_id as TENANT_ID, tenant_name as TENANT_NAME, effective_tenant_id as EFFECTIVE_TENANT_ID, user_id as USER_ID, user_name as USER_NAME, user_group as USER_GROUP, user_client_ip as USER_CLIENT_IP, db_id as DB_ID, db_name as DB_NAME, sql_id as SQL_ID, query_sql as QUERY_SQL, plan_id as PLAN_ID, affected_rows as AFFECTED_ROWS, return_rows as RETURN_ROWS, partition_cnt as PARTITION_CNT, ret_code as RET_CODE, qc_id as QC_ID, dfo_id as DFO_ID, sqc_id as SQC_ID, worker_id as WORKER_ID, event as EVENT, p1text as P1TEXT, p1 as P1, p2text as P2TEXT, p2 as P2, p3text as P3TEXT, p3 as P3, `level` as `LEVEL`, wait_class_id as WAIT_CLASS_ID, `wait_class#` as `WAIT_CLASS#`, wait_class as WAIT_CLASS, state as STATE, wait_time_micro as WAIT_TIME_MICRO, total_wait_time_micro as TOTAL_WAIT_TIME_MICRO, total_waits as TOTAL_WAITS, rpc_count as RPC_COUNT, plan_type as PLAN_TYPE, is_inner_sql as IS_INNER_SQL, is_executor_rpc as IS_EXECUTOR_RPC, is_hit_plan as IS_HIT_PLAN, request_time as REQUEST_TIME, elapsed_time as ELAPSED_TIME, net_time as NET_TIME, net_wait_time as NET_WAIT_TIME, queue_time as QUEUE_TIME, decode_time as DECODE_TIME, get_plan_time as GET_PLAN_TIME, execute_time as EXECUTE_TIME, application_wait_time as APPLICATION_WAIT_TIME, concurrency_wait_time as CONCURRENCY_WAIT_TIME, user_io_wait_time as USER_IO_WAIT_TIME, schedule_time as SCHEDULE_TIME, row_cache_hit as ROW_CACHE_HIT, bloom_filter_cache_hit as BLOOM_FILTER_CACHE_HIT, block_cache_hit as BLOCK_CACHE_HIT, block_index_cache_hit as BLOCK_INDEX_CACHE_HIT, disk_reads as DISK_READS, retry_cnt as RETRY_CNT, table_scan as TABLE_SCAN, consistency_level as CONSISTENCY_LEVEL, memstore_read_row_count as MEMSTORE_READ_ROW_COUNT, ssstore_read_row_count as SSSTORE_READ_ROW_COUNT, request_memory_used as REQUEST_MEMORY_USED, expected_worker_count as EXPECTED_WORKER_COUNT, used_worker_count as USED_WORKER_COUNT, sched_info as SCHED_INFO, fuse_row_cache_hit as FUSE_ROW_CACHE_HIT, ps_stmt_id as PS_STMT_ID, transaction_hash as TRANSACTION_HASH, request_type as REQUEST_TYPE, is_batched_multi_stmt as IS_BATCHED_MULTI_STMT, ob_trace_info as OB_TRACE_INFO, plan_hash as PLAN_HASH, lock_for_read_time as LOCK_FOR_READ_TIME, wait_trx_migrate_time as WAIT_TRX_MIGRATE_TIME from oceanbase.__all_virtual_sql_audit where is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -827,17 +800,16 @@ int ObInnerTableSchema::gv_sql_audit_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_latch_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_latch_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -868,8 +840,7 @@ int ObInnerTableSchema::gv_latch_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, addr as ADDR, latch_id as `LATCH#`, `level` as `LEVEL#`, name as NAME, hash as HASH, gets as GETS, misses as MISSES, sleeps as SLEEPS, immediate_gets as IMMEDIATE_GETS, immediate_misses as IMMEDIATE_MISSES, spin_gets as SPIN_GETS, wait_time as WAIT_TIME from oceanbase.__all_virtual_latch where is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, addr as ADDR, latch_id as `LATCH#`, `level` as `LEVEL#`, name as NAME, hash as HASH, gets as GETS, misses as MISSES, sleeps as SLEEPS, immediate_gets as IMMEDIATE_GETS, immediate_misses as IMMEDIATE_MISSES, spin_gets as SPIN_GETS, wait_time as WAIT_TIME from oceanbase.__all_virtual_latch where is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -881,17 +852,16 @@ int ObInnerTableSchema::gv_latch_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_memory_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_memory_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -922,8 +892,7 @@ int ObInnerTableSchema::gv_memory_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID, svr_ip AS IP, svr_port AS PORT, mod_name AS CONTEXT, sum(COUNT) AS COUNT, sum(USED) AS USED, sum(ALLOC_COUNT) AS ALLOC_COUNT, sum(FREE_COUNT) AS FREE_COUNT FROM oceanbase.__all_virtual_memory_info WHERE ( effective_tenant_id()=1 OR tenant_id=effective_tenant_id() ) AND mod_type='user' AND is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) GROUP BY tenant_id, svr_ip, svr_port, mod_name ORDER BY tenant_id, svr_ip, svr_port, mod_name )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, svr_ip AS IP, svr_port AS PORT, mod_name AS CONTEXT, sum(COUNT) AS COUNT, sum(USED) AS USED, sum(ALLOC_COUNT) AS ALLOC_COUNT, sum(FREE_COUNT) AS FREE_COUNT FROM oceanbase.__all_virtual_memory_info WHERE ( effective_tenant_id()=1 OR tenant_id=effective_tenant_id() ) AND mod_type='user' AND is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) GROUP BY tenant_id, svr_ip, svr_port, mod_name ORDER BY tenant_id, svr_ip, svr_port, mod_name )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -935,17 +904,16 @@ int ObInnerTableSchema::gv_memory_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_memory_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_memory_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -976,8 +944,7 @@ int ObInnerTableSchema::v_memory_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID, CONTEXT, COUNT, USED, ALLOC_COUNT, FREE_COUNT FROM oceanbase.gv$memory WHERE IP=HOST_IP() AND PORT=RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, CONTEXT, COUNT, USED, ALLOC_COUNT, FREE_COUNT FROM oceanbase.gv$memory WHERE IP=HOST_IP() AND PORT=RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -989,17 +956,16 @@ int ObInnerTableSchema::v_memory_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_memstore_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_memstore_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1030,8 +996,7 @@ int ObInnerTableSchema::gv_memstore_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID, SVR_IP AS IP, SVR_PORT AS PORT, ACTIVE_MEMSTORE_USED AS ACTIVE, TOTAL_MEMSTORE_USED AS TOTAL, MAJOR_FREEZE_TRIGGER AS `FREEZE_TRIGGER`, MEMSTORE_LIMIT AS `MEM_LIMIT`, FREEZE_CNT FROM oceanbase.__all_virtual_tenant_memstore_info WHERE (EFFECTIVE_TENANT_ID()=1 OR TENANT_ID=EFFECTIVE_TENANT_ID()) AND is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, SVR_IP AS IP, SVR_PORT AS PORT, ACTIVE_MEMSTORE_USED AS ACTIVE, TOTAL_MEMSTORE_USED AS TOTAL, MAJOR_FREEZE_TRIGGER AS `FREEZE_TRIGGER`, MEMSTORE_LIMIT AS `MEM_LIMIT`, FREEZE_CNT FROM oceanbase.__all_virtual_tenant_memstore_info WHERE (EFFECTIVE_TENANT_ID()=1 OR TENANT_ID=EFFECTIVE_TENANT_ID()) AND is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1043,17 +1008,16 @@ int ObInnerTableSchema::gv_memstore_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_memstore_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_memstore_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1084,8 +1048,7 @@ int ObInnerTableSchema::v_memstore_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID, ACTIVE, TOTAL, `FREEZE_TRIGGER`, `MEM_LIMIT` FROM oceanbase.gv$memstore WHERE IP=HOST_IP() AND PORT=RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, ACTIVE, TOTAL, `FREEZE_TRIGGER`, `MEM_LIMIT` FROM oceanbase.gv$memstore WHERE IP=HOST_IP() AND PORT=RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1097,17 +1060,16 @@ int ObInnerTableSchema::v_memstore_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_memstore_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_memstore_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1138,8 +1100,7 @@ int ObInnerTableSchema::gv_memstore_info_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID, SVR_IP AS IP, SVR_PORT AS PORT, table_id AS TABLE_ID, partition_idx AS PARTITION_ID, VERSION, BASE_VERSION, MULTI_VERSION_START, SNAPSHOT_VERSION, IS_ACTIVE, MEM_USED as USED, hash_item_count as HASH_ITEMS, btree_item_count as BTREE_ITEMS FROM oceanbase.__all_virtual_memstore_info WHERE (EFFECTIVE_TENANT_ID()=1 OR TENANT_ID=EFFECTIVE_TENANT_ID()) AND is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, SVR_IP AS IP, SVR_PORT AS PORT, table_id AS TABLE_ID, partition_idx AS PARTITION_ID, VERSION, BASE_VERSION, MULTI_VERSION_START, SNAPSHOT_VERSION, IS_ACTIVE, MEM_USED as USED, hash_item_count as HASH_ITEMS, btree_item_count as BTREE_ITEMS FROM oceanbase.__all_virtual_memstore_info WHERE (EFFECTIVE_TENANT_ID()=1 OR TENANT_ID=EFFECTIVE_TENANT_ID()) AND is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1151,17 +1112,16 @@ int ObInnerTableSchema::gv_memstore_info_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_memstore_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_memstore_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1192,8 +1152,7 @@ int ObInnerTableSchema::v_memstore_info_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID, IP, PORT, TABLE_ID, PARTITION_ID, VERSION, BASE_VERSION, MULTI_VERSION_START, SNAPSHOT_VERSION, IS_ACTIVE, USED, HASH_ITEMS, BTREE_ITEMS FROM oceanbase.gv$memstore_info WHERE IP=HOST_IP() AND PORT=RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, IP, PORT, TABLE_ID, PARTITION_ID, VERSION, BASE_VERSION, MULTI_VERSION_START, SNAPSHOT_VERSION, IS_ACTIVE, USED, HASH_ITEMS, BTREE_ITEMS FROM oceanbase.gv$memstore_info WHERE IP=HOST_IP() AND PORT=RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1205,17 +1164,16 @@ int ObInnerTableSchema::v_memstore_info_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_plan_cache_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_plan_cache_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1246,8 +1204,7 @@ int ObInnerTableSchema::v_plan_cache_stat_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT tenant_id,svr_ip,svr_port,sql_num,mem_used, mem_hold, access_count,hit_count, hit_rate,plan_num,mem_limit,hash_bucket,stmtkey_num FROM oceanbase.gv$plan_cache_stat WHERE svr_ip=HOST_IP() AND svr_port=RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT tenant_id,svr_ip,svr_port,sql_num,mem_used, mem_hold, access_count,hit_count, hit_rate,plan_num,mem_limit,hash_bucket,stmtkey_num FROM oceanbase.gv$plan_cache_stat WHERE svr_ip=HOST_IP() AND svr_port=RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1259,17 +1216,16 @@ int ObInnerTableSchema::v_plan_cache_stat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_plan_cache_plan_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_plan_cache_plan_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1300,8 +1256,7 @@ int ObInnerTableSchema::v_plan_cache_plan_stat_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT tenant_id,svr_ip,svr_port,plan_id,sql_id,type,is_bind_sensitive,is_bind_aware,db_id,statement,query_sql,special_params,param_infos,sys_vars,plan_hash,first_load_time,schema_version,merged_version,last_active_time,avg_exe_usec,slowest_exe_time,slowest_exe_usec,slow_count,hit_count,plan_size,executions,disk_reads,direct_writes,buffer_gets,application_wait_time,concurrency_wait_time,user_io_wait_time,rows_processed,elapsed_time,cpu_time,large_querys,delayed_large_querys,delayed_px_querys,outline_version,outline_id,outline_data,acs_sel_info,table_scan,evolution, evo_executions, evo_cpu_time, timeout_count, ps_stmt_id, sessid, temp_tables, is_use_jit, object_type,hints_info,hints_all_worked, pl_schema_id,is_batched_multi_stmt FROM oceanbase.gv$plan_cache_plan_stat WHERE svr_ip=HOST_IP() AND svr_port=RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT tenant_id,svr_ip,svr_port,plan_id,sql_id,type,is_bind_sensitive,is_bind_aware,db_id,statement,query_sql,special_params,param_infos,sys_vars,plan_hash,first_load_time,schema_version,merged_version,last_active_time,avg_exe_usec,slowest_exe_time,slowest_exe_usec,slow_count,hit_count,plan_size,executions,disk_reads,direct_writes,buffer_gets,application_wait_time,concurrency_wait_time,user_io_wait_time,rows_processed,elapsed_time,cpu_time,large_querys,delayed_large_querys,delayed_px_querys,outline_version,outline_id,outline_data,acs_sel_info,table_scan,evolution, evo_executions, evo_cpu_time, timeout_count, ps_stmt_id, sessid, temp_tables, is_use_jit, object_type,hints_info,hints_all_worked, pl_schema_id,is_batched_multi_stmt FROM oceanbase.gv$plan_cache_plan_stat WHERE svr_ip=HOST_IP() AND svr_port=RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1313,17 +1268,16 @@ int ObInnerTableSchema::v_plan_cache_plan_stat_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_plan_cache_plan_explain_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_plan_cache_plan_explain_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1354,8 +1308,7 @@ int ObInnerTableSchema::gv_plan_cache_plan_explain_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID, SVR_IP as IP, SVR_PORT as PORT, PLAN_ID, PLAN_DEPTH, PLAN_LINE_ID, OPERATOR, NAME, ROWS, COST, PROPERTY FROM oceanbase.__all_virtual_plan_cache_plan_explain WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (EFFECTIVE_TENANT_ID()=1 or TENANT_ID=EFFECTIVE_TENANT_ID()) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, SVR_IP as IP, SVR_PORT as PORT, PLAN_ID, PLAN_DEPTH, PLAN_LINE_ID, OPERATOR, NAME, ROWS, COST, PROPERTY FROM oceanbase.__all_virtual_plan_cache_plan_explain WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (EFFECTIVE_TENANT_ID()=1 or TENANT_ID=EFFECTIVE_TENANT_ID()) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1367,17 +1320,16 @@ int ObInnerTableSchema::gv_plan_cache_plan_explain_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_plan_cache_plan_explain_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_plan_cache_plan_explain_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1408,8 +1360,7 @@ int ObInnerTableSchema::v_plan_cache_plan_explain_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * FROM oceanbase.gv$plan_cache_plan_explain WHERE IP =HOST_IP() AND PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM oceanbase.gv$plan_cache_plan_explain WHERE IP =HOST_IP() AND PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1421,17 +1372,16 @@ int ObInnerTableSchema::v_plan_cache_plan_explain_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sql_audit_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sql_audit_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1462,8 +1412,7 @@ int ObInnerTableSchema::v_sql_audit_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT * FROM oceanbase.gv$sql_audit WHERE svr_ip=HOST_IP() AND svr_port=RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT * FROM oceanbase.gv$sql_audit WHERE svr_ip=HOST_IP() AND svr_port=RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1475,17 +1424,16 @@ int ObInnerTableSchema::v_sql_audit_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_latch_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_latch_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1516,8 +1464,7 @@ int ObInnerTableSchema::v_latch_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT * FROM oceanbase.gv$latch where SVR_IP=host_ip() and SVR_PORT=rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT * FROM oceanbase.gv$latch where SVR_IP=host_ip() and SVR_PORT=rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1529,17 +1476,16 @@ int ObInnerTableSchema::v_latch_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_obrpc_outgoing_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_obrpc_outgoing_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1570,8 +1516,7 @@ int ObInnerTableSchema::gv_obrpc_outgoing_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID, SVR_IP AS IP, SVR_PORT AS PORT, PCODE, PCODE_NAME, COUNT, TOTAL_TIME, TOTAL_SIZE, FAILURE, TIMEOUT, SYNC, ASYNC, LAST_TIMESTAMP FROM oceanbase.__all_virtual_obrpc_stat WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) AND (EFFECTIVE_TENANT_ID()=1 OR TENANT_ID=EFFECTIVE_TENANT_ID()) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, SVR_IP AS IP, SVR_PORT AS PORT, PCODE, PCODE_NAME, COUNT, TOTAL_TIME, TOTAL_SIZE, FAILURE, TIMEOUT, SYNC, ASYNC, LAST_TIMESTAMP FROM oceanbase.__all_virtual_obrpc_stat WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) AND (EFFECTIVE_TENANT_ID()=1 OR TENANT_ID=EFFECTIVE_TENANT_ID()) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1583,17 +1528,16 @@ int ObInnerTableSchema::gv_obrpc_outgoing_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_obrpc_outgoing_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_obrpc_outgoing_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1624,8 +1568,7 @@ int ObInnerTableSchema::v_obrpc_outgoing_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * FROM gv$obrpc_outgoing WHERE IP=HOST_IP() AND PORT=RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM gv$obrpc_outgoing WHERE IP=HOST_IP() AND PORT=RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1637,17 +1580,16 @@ int ObInnerTableSchema::v_obrpc_outgoing_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_obrpc_incoming_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_obrpc_incoming_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1678,8 +1620,7 @@ int ObInnerTableSchema::gv_obrpc_incoming_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID, SVR_IP AS IP, SVR_PORT AS PORT, PCODE, PCODE_NAME, ICOUNT AS COUNT, ISIZE AS TOTAL_SIZE, NET_TIME, WAIT_TIME, QUEUE_TIME, PROCESS_TIME, ILAST_TIMESTAMP AS LAST_TIMESTAMP FROM oceanbase.__all_virtual_obrpc_stat WHERE EFFECTIVE_TENANT_ID()=1 OR TENANT_ID=EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, SVR_IP AS IP, SVR_PORT AS PORT, PCODE, PCODE_NAME, ICOUNT AS COUNT, ISIZE AS TOTAL_SIZE, NET_TIME, WAIT_TIME, QUEUE_TIME, PROCESS_TIME, ILAST_TIMESTAMP AS LAST_TIMESTAMP FROM oceanbase.__all_virtual_obrpc_stat WHERE EFFECTIVE_TENANT_ID()=1 OR TENANT_ID=EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1691,17 +1632,16 @@ int ObInnerTableSchema::gv_obrpc_incoming_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_obrpc_incoming_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_obrpc_incoming_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1732,8 +1672,7 @@ int ObInnerTableSchema::v_obrpc_incoming_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * FROM oceanbase.gv$obrpc_incoming WHERE IP=HOST_IP() AND PORT=RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM oceanbase.gv$obrpc_incoming WHERE IP=HOST_IP() AND PORT=RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1745,17 +1684,16 @@ int ObInnerTableSchema::v_obrpc_incoming_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sql_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sql_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1786,9 +1724,7 @@ int ObInnerTableSchema::gv_sql_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL( - table_schema - .set_view_definition(R"__(SELECT tenant_id AS CON_ID, svr_ip AS SVR_IP, svr_port AS SVR_PORT, plan_id AS PLAN_ID, sql_id AS SQL_ID, type AS TYPE, statement AS SQL_TEXT, plan_hash AS PLAN_HASH_VALUE, first_load_time AS FIRST_LOAD_TIME, last_active_time AS LAST_ACTIVE_TIME, avg_exe_usec AS AVG_EXE_USEC, slowest_exe_time AS SLOWEST_EXE_TIME, slowest_exe_usec as SLOWEST_EXE_USEC, slow_count as SLOW_COUNT, hit_count as HIT_COUNT, plan_size as PLAN_SIZE, executions as EXECUTIONS, disk_reads as DISK_READS, direct_writes as DIRECT_WRITES, buffer_gets as BUFFER_GETS, application_wait_time as APPLICATION_WAIT_TIME, concurrency_wait_time as CONCURRENCY_WAIT_TIME, user_io_wait_time as USER_IO_WAIT_TIME, rows_processed as ROWS_PROCESSED, elapsed_time as ELAPSED_TIME, cpu_time as CPU_TIME FROM oceanbase.__all_virtual_plan_stat WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT tenant_id AS CON_ID, svr_ip AS SVR_IP, svr_port AS SVR_PORT, plan_id AS PLAN_ID, sql_id AS SQL_ID, type AS TYPE, statement AS SQL_TEXT, plan_hash AS PLAN_HASH_VALUE, first_load_time AS FIRST_LOAD_TIME, last_active_time AS LAST_ACTIVE_TIME, avg_exe_usec AS AVG_EXE_USEC, slowest_exe_time AS SLOWEST_EXE_TIME, slowest_exe_usec as SLOWEST_EXE_USEC, slow_count as SLOW_COUNT, hit_count as HIT_COUNT, plan_size as PLAN_SIZE, executions as EXECUTIONS, disk_reads as DISK_READS, direct_writes as DIRECT_WRITES, buffer_gets as BUFFER_GETS, application_wait_time as APPLICATION_WAIT_TIME, concurrency_wait_time as CONCURRENCY_WAIT_TIME, user_io_wait_time as USER_IO_WAIT_TIME, rows_processed as ROWS_PROCESSED, elapsed_time as ELAPSED_TIME, cpu_time as CPU_TIME FROM oceanbase.__all_virtual_plan_stat WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1800,17 +1736,16 @@ int ObInnerTableSchema::gv_sql_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sql_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sql_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1841,8 +1776,7 @@ int ObInnerTableSchema::v_sql_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT * FROM oceanbase.gv$sql WHERE svr_ip=HOST_IP() AND svr_port=RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT * FROM oceanbase.gv$sql WHERE svr_ip=HOST_IP() AND svr_port=RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1854,17 +1788,16 @@ int ObInnerTableSchema::v_sql_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sql_monitor_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sql_monitor_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1895,8 +1828,7 @@ int ObInnerTableSchema::gv_sql_monitor_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT tenant_id as CON_ID, request_id as SQL_EXEC_ID, job_id as JOB_ID, task_id as TASK_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, sql_exec_start as SQL_EXEC_START, plan_id as PLAN_ID, scheduler_ip as SCHEDULER_IP, scheduler_port as SCHEDULER_PORT, monitor_info as MONITOR_INFO, extend_info as EXTEND_INFO FROM oceanbase.__all_virtual_sql_monitor WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT tenant_id as CON_ID, request_id as SQL_EXEC_ID, job_id as JOB_ID, task_id as TASK_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, sql_exec_start as SQL_EXEC_START, plan_id as PLAN_ID, scheduler_ip as SCHEDULER_IP, scheduler_port as SCHEDULER_PORT, monitor_info as MONITOR_INFO, extend_info as EXTEND_INFO FROM oceanbase.__all_virtual_sql_monitor WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1908,17 +1840,16 @@ int ObInnerTableSchema::gv_sql_monitor_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sql_monitor_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sql_monitor_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1949,8 +1880,7 @@ int ObInnerTableSchema::v_sql_monitor_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT * from oceanbase.gv$sql_monitor WHERE svr_ip=HOST_IP() AND svr_port=RPC_Port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT * from oceanbase.gv$sql_monitor WHERE svr_ip=HOST_IP() AND svr_port=RPC_Port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1962,17 +1892,16 @@ int ObInnerTableSchema::v_sql_monitor_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sql_plan_monitor_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sql_plan_monitor_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2003,8 +1932,7 @@ int ObInnerTableSchema::gv_sql_plan_monitor_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT TENANT_ID as CON_ID, REQUEST_ID, NULL `KEY`, NULL STATUS, SVR_IP, SVR_PORT, TRACE_ID, FIRST_REFRESH_TIME, LAST_REFRESH_TIME, FIRST_CHANGE_TIME, LAST_CHANGE_TIME, NULL REFRESH_COUNT, NULL SID, THREAD_ID PROCESS_NAME, NULL SQL_ID, NULL SQL_EXEC_START, NULL SQL_EXEC_ID, NULL SQL_PLAN_HASH_VALUE, NULL SQL_CHILD_ADDRESS, NULL PLAN_PARENT_ID, PLAN_LINE_ID, PLAN_OPERATION, NULL PLAN_OPTIONS, NULL PLAN_OBJECT_OWNER, NULL PLAN_OBJECT_NAME, NULL PLAN_OBJECT_TYPE, PLAN_DEPTH, NULL PLAN_POSITION, NULL PLAN_COST, NULL PLAN_CARDINALITY, NULL PLAN_BYTES, NULL PLAN_TIME, NULL PLAN_PARTITION_START, NULL PLAN_PARTITION_STOP, NULL PLAN_CPU_COST, NULL PLAN_IO_COST, NULL PLAN_TEMP_SPACE, STARTS, OUTPUT_ROWS, NULL IO_INTERCONNECT_BYTES, NULL PHYSICAL_READ_REQUESTS, NULL PHYSICAL_READ_BYTES, NULL PHYSICAL_WRITE_REQUESTS, NULL PHYSICAL_WRITE_BYTES, NULL WORKAREA_MEM, NULL WORKAREA_MAX_MEM, NULL WORKAREA_TEMPSEG, NULL WORKAREA_MAX_TEMPSEG, NULL OTHERSTAT_GROUP_ID, OTHERSTAT_1_ID, NULL OTHERSTAT_1_TYPE, OTHERSTAT_1_VALUE, OTHERSTAT_2_ID, NULL OTHERSTAT_2_TYPE, OTHERSTAT_2_VALUE, OTHERSTAT_3_ID, NULL OTHERSTAT_3_TYPE, OTHERSTAT_3_VALUE, OTHERSTAT_4_ID, NULL OTHERSTAT_4_TYPE, OTHERSTAT_4_VALUE, OTHERSTAT_5_ID, NULL OTHERSTAT_5_TYPE, OTHERSTAT_5_VALUE, OTHERSTAT_6_ID, NULL OTHERSTAT_6_TYPE, OTHERSTAT_6_VALUE, OTHERSTAT_7_ID, NULL OTHERSTAT_7_TYPE, OTHERSTAT_7_VALUE, OTHERSTAT_8_ID, NULL OTHERSTAT_8_TYPE, OTHERSTAT_8_VALUE, OTHERSTAT_9_ID, NULL OTHERSTAT_9_TYPE, OTHERSTAT_9_VALUE, OTHERSTAT_10_ID, NULL OTHERSTAT_10_TYPE, OTHERSTAT_10_VALUE, NULL OTHER_XML, NULL PLAN_OPERATION_INACTIVE FROM oceanbase.__all_virtual_sql_plan_monitor WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT TENANT_ID as CON_ID, REQUEST_ID, NULL `KEY`, NULL STATUS, SVR_IP, SVR_PORT, TRACE_ID, FIRST_REFRESH_TIME, LAST_REFRESH_TIME, FIRST_CHANGE_TIME, LAST_CHANGE_TIME, NULL REFRESH_COUNT, NULL SID, THREAD_ID PROCESS_NAME, NULL SQL_ID, NULL SQL_EXEC_START, NULL SQL_EXEC_ID, NULL SQL_PLAN_HASH_VALUE, NULL SQL_CHILD_ADDRESS, NULL PLAN_PARENT_ID, PLAN_LINE_ID, PLAN_OPERATION, NULL PLAN_OPTIONS, NULL PLAN_OBJECT_OWNER, NULL PLAN_OBJECT_NAME, NULL PLAN_OBJECT_TYPE, PLAN_DEPTH, NULL PLAN_POSITION, NULL PLAN_COST, NULL PLAN_CARDINALITY, NULL PLAN_BYTES, NULL PLAN_TIME, NULL PLAN_PARTITION_START, NULL PLAN_PARTITION_STOP, NULL PLAN_CPU_COST, NULL PLAN_IO_COST, NULL PLAN_TEMP_SPACE, STARTS, OUTPUT_ROWS, NULL IO_INTERCONNECT_BYTES, NULL PHYSICAL_READ_REQUESTS, NULL PHYSICAL_READ_BYTES, NULL PHYSICAL_WRITE_REQUESTS, NULL PHYSICAL_WRITE_BYTES, NULL WORKAREA_MEM, NULL WORKAREA_MAX_MEM, NULL WORKAREA_TEMPSEG, NULL WORKAREA_MAX_TEMPSEG, NULL OTHERSTAT_GROUP_ID, OTHERSTAT_1_ID, NULL OTHERSTAT_1_TYPE, OTHERSTAT_1_VALUE, OTHERSTAT_2_ID, NULL OTHERSTAT_2_TYPE, OTHERSTAT_2_VALUE, OTHERSTAT_3_ID, NULL OTHERSTAT_3_TYPE, OTHERSTAT_3_VALUE, OTHERSTAT_4_ID, NULL OTHERSTAT_4_TYPE, OTHERSTAT_4_VALUE, OTHERSTAT_5_ID, NULL OTHERSTAT_5_TYPE, OTHERSTAT_5_VALUE, OTHERSTAT_6_ID, NULL OTHERSTAT_6_TYPE, OTHERSTAT_6_VALUE, OTHERSTAT_7_ID, NULL OTHERSTAT_7_TYPE, OTHERSTAT_7_VALUE, OTHERSTAT_8_ID, NULL OTHERSTAT_8_TYPE, OTHERSTAT_8_VALUE, OTHERSTAT_9_ID, NULL OTHERSTAT_9_TYPE, OTHERSTAT_9_VALUE, OTHERSTAT_10_ID, NULL OTHERSTAT_10_TYPE, OTHERSTAT_10_VALUE, NULL OTHER_XML, NULL PLAN_OPERATION_INACTIVE FROM oceanbase.__all_virtual_sql_plan_monitor WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2016,17 +1944,16 @@ int ObInnerTableSchema::gv_sql_plan_monitor_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sql_plan_monitor_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sql_plan_monitor_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2057,8 +1984,7 @@ int ObInnerTableSchema::v_sql_plan_monitor_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * from oceanbase.gv$sql_plan_monitor WHERE svr_ip=HOST_IP() AND svr_port=RPC_Port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * from oceanbase.gv$sql_plan_monitor WHERE svr_ip=HOST_IP() AND svr_port=RPC_Port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2070,17 +1996,16 @@ int ObInnerTableSchema::v_sql_plan_monitor_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_recyclebin_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_recyclebin_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -2111,8 +2036,7 @@ int ObInnerTableSchema::user_recyclebin_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT OBJECT_NAME, ORIGINAL_NAME, case TYPE when 1 then 'TABLE' when 2 then 'INDEX' when 3 then 'VIEW' when 4 then 'DATABASE' else 'INVALID' end as TYPE, gmt_create as CREATETIME FROM oceanbase.__all_virtual_recyclebin where tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT OBJECT_NAME, ORIGINAL_NAME, case TYPE when 1 then 'TABLE' when 2 then 'INDEX' when 3 then 'VIEW' when 4 then 'DATABASE' else 'INVALID' end as TYPE, gmt_create as CREATETIME FROM oceanbase.__all_virtual_recyclebin where tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2124,17 +2048,16 @@ int ObInnerTableSchema::user_recyclebin_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_outline_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_outline_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2177,17 +2100,16 @@ int ObInnerTableSchema::gv_outline_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_concurrent_limit_sql_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_concurrent_limit_sql_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2218,8 +2140,7 @@ int ObInnerTableSchema::gv_concurrent_limit_sql_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * from oceanbase.__tenant_virtual_concurrent_limit_sql )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * from oceanbase.__tenant_virtual_concurrent_limit_sql )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2231,17 +2152,16 @@ int ObInnerTableSchema::gv_concurrent_limit_sql_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sql_plan_statistics_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sql_plan_statistics_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2272,8 +2192,7 @@ int ObInnerTableSchema::gv_sql_plan_statistics_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, plan_id as PLAN_ID, operation_id as OPERATION_ID, executions as EXECUTIONS, output_rows as OUTPUT_ROWS, input_rows as INPUT_ROWS, rescan_times as RESCAN_TIMES, buffer_gets as BUFFER_GETS, disk_reads as DISK_READS, disk_writes as DISK_WRITES, elapsed_time as ELAPSED_TIME, extend_info1 as EXTEND_INFO1, extend_info2 as EXTEND_INFO2 FROM oceanbase.__all_virtual_sql_plan_statistics WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, plan_id as PLAN_ID, operation_id as OPERATION_ID, executions as EXECUTIONS, output_rows as OUTPUT_ROWS, input_rows as INPUT_ROWS, rescan_times as RESCAN_TIMES, buffer_gets as BUFFER_GETS, disk_reads as DISK_READS, disk_writes as DISK_WRITES, elapsed_time as ELAPSED_TIME, extend_info1 as EXTEND_INFO1, extend_info2 as EXTEND_INFO2 FROM oceanbase.__all_virtual_sql_plan_statistics WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2285,17 +2204,16 @@ int ObInnerTableSchema::gv_sql_plan_statistics_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sql_plan_statistics_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sql_plan_statistics_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2326,8 +2244,7 @@ int ObInnerTableSchema::v_sql_plan_statistics_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT * from oceanbase.gv$sql_plan_statistics WHERE svr_ip=HOST_IP() AND svr_port=RPC_Port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT * from oceanbase.gv$sql_plan_statistics WHERE svr_ip=HOST_IP() AND svr_port=RPC_Port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2339,17 +2256,16 @@ int ObInnerTableSchema::v_sql_plan_statistics_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_server_memstore_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_server_memstore_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2380,8 +2296,7 @@ int ObInnerTableSchema::gv_server_memstore_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SVR_IP AS IP, SVR_PORT AS PORT, ACTIVE_MEMSTORE_USED AS ACTIVE, TOTAL_MEMSTORE_USED AS TOTAL, MAJOR_FREEZE_TRIGGER AS `FREEZE_TRIGGER`, MEMSTORE_LIMIT AS `MEM_LIMIT` FROM oceanbase.__all_virtual_server_memory_info WHERE (EFFECTIVE_TENANT_ID()=1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SVR_IP AS IP, SVR_PORT AS PORT, ACTIVE_MEMSTORE_USED AS ACTIVE, TOTAL_MEMSTORE_USED AS TOTAL, MAJOR_FREEZE_TRIGGER AS `FREEZE_TRIGGER`, MEMSTORE_LIMIT AS `MEM_LIMIT` FROM oceanbase.__all_virtual_server_memory_info WHERE (EFFECTIVE_TENANT_ID()=1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2393,17 +2308,16 @@ int ObInnerTableSchema::gv_server_memstore_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_unit_load_balance_event_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_unit_load_balance_event_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2434,8 +2348,7 @@ int ObInnerTableSchema::gv_unit_load_balance_event_history_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT gmt_create, substring_index(substring_index(value3, 'zone:"', -1), '"', 1) AS zone, substring_index(substring_index(value1, 'tid:', -1), ',', 1) AS table_id, substring_index(substring_index(value1, 'partition_id:', -1), ',', 1) AS partition_id, substring_index(substring_index(value1, 'data_size:', -1), '}', 1) AS data_size, substring_index(substring_index(value3, 'replica_type:', -1), '}', 1) AS replica_type, substring_index(substring_index(value2, '"', -2), ':', 1) AS src_ip, substring_index(substring_index(value2, '"', 2), ':', -1) AS src_port, substring_index(substring_index(value3, 'unit_id:', -1), ',', 1) AS dest_unit_id, substring_index(substring_index(value3, 'server:"', -1), ':', 1) AS dest_ip, substring_index(substring_index(value3, '"', 4), ':', -1) AS dest_port, IF (value5 = '"0.0.0.0"' , "0.0.0.0", substring_index(substring_index(value5, '"', -2), ':', 1)) AS data_src_ip, IF (value5 = '"0.0.0.0"', "0", substring_index(substring_index(value5, '"', 2), ':', -1)) AS data_src_port, value4 AS result_code, CASE value4 when "-4012" then "OB_TIMEOUT" when "-4013" then "OB_ALLOCATE_MEMORY_FAILED" when "-4018" then "OB_ENTRY_NOT_EXIST" when "-4023" then "OB_EAGAIN" when "-4070" then "OB_INVALID_DATA" when "-4184" then "OB_CS_OUTOF_DISK_SPACE" when "-4109" then "OB_STATE_NOT_MATCH" when "-4209" then "OB_LEADER_NOT_EXIST" when "-4552" then "OB_REBALANCE_TASK_CANT_EXEC" when "-4551" then "OB_SERVER_MIGRATE_IN_DENIED" when "-4600" then "OB_DATA_SOURCE_NOT_EXIST" else "" END AS result_str, value6 AS comment, rs_svr_ip, rs_svr_port FROM oceanbase.__all_rootservice_event_history WHERE module = 'balancer' and event = 'finish_migrate_replica' )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT gmt_create, substring_index(substring_index(value3, 'zone:"', -1), '"', 1) AS zone, substring_index(substring_index(value1, 'tid:', -1), ',', 1) AS table_id, substring_index(substring_index(value1, 'partition_id:', -1), ',', 1) AS partition_id, substring_index(substring_index(value1, 'data_size:', -1), '}', 1) AS data_size, substring_index(substring_index(value3, 'replica_type:', -1), '}', 1) AS replica_type, substring_index(substring_index(value2, '"', -2), ':', 1) AS src_ip, substring_index(substring_index(value2, '"', 2), ':', -1) AS src_port, substring_index(substring_index(value3, 'unit_id:', -1), ',', 1) AS dest_unit_id, substring_index(substring_index(value3, 'server:"', -1), ':', 1) AS dest_ip, substring_index(substring_index(value3, '"', 4), ':', -1) AS dest_port, IF (value5 = '"0.0.0.0"' , "0.0.0.0", substring_index(substring_index(value5, '"', -2), ':', 1)) AS data_src_ip, IF (value5 = '"0.0.0.0"', "0", substring_index(substring_index(value5, '"', 2), ':', -1)) AS data_src_port, value4 AS result_code, CASE value4 when "-4012" then "OB_TIMEOUT" when "-4013" then "OB_ALLOCATE_MEMORY_FAILED" when "-4018" then "OB_ENTRY_NOT_EXIST" when "-4023" then "OB_EAGAIN" when "-4070" then "OB_INVALID_DATA" when "-4184" then "OB_CS_OUTOF_DISK_SPACE" when "-4109" then "OB_STATE_NOT_MATCH" when "-4209" then "OB_LEADER_NOT_EXIST" when "-4552" then "OB_REBALANCE_TASK_CANT_EXEC" when "-4551" then "OB_SERVER_MIGRATE_IN_DENIED" when "-4600" then "OB_DATA_SOURCE_NOT_EXIST" else "" END AS result_str, value6 AS comment, rs_svr_ip, rs_svr_port FROM oceanbase.__all_rootservice_event_history WHERE module = 'balancer' and event = 'finish_migrate_replica' )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2447,17 +2360,16 @@ int ObInnerTableSchema::gv_unit_load_balance_event_history_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_tenant_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_tenant_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2488,8 +2400,7 @@ int ObInnerTableSchema::gv_tenant_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT tenant_id, tenant_name, zone_list, primary_zone, collation_type, info, read_only, locality FROM oceanbase.__all_tenant WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT tenant_id, tenant_name, zone_list, primary_zone, collation_type, info, read_only, locality FROM oceanbase.__all_tenant WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2501,17 +2412,16 @@ int ObInnerTableSchema::gv_tenant_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_database_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_database_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2542,8 +2452,7 @@ int ObInnerTableSchema::gv_database_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT t.tenant_id, t.tenant_name, d.database_id, d.database_name, IF(d.zone_list = '' OR d.zone_list is NULL, t.zone_list, d.zone_list) AS zone_list, IF(d.primary_zone = '' OR d.primary_zone is NULL, t.primary_zone, d.primary_zone) AS primary_zone, IF(d.collation_type is NULL, t.collation_type, d.collation_type) AS collation_type, d.comment, d.read_only, d.default_tablegroup_id, d.in_recyclebin FROM oceanbase.__all_virtual_database AS d LEFT JOIN oceanbase.__all_tenant AS t ON d.tenant_id = t.tenant_id WHERE effective_tenant_id() = 1 OR t.tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT t.tenant_id, t.tenant_name, d.database_id, d.database_name, IF(d.zone_list = '' OR d.zone_list is NULL, t.zone_list, d.zone_list) AS zone_list, IF(d.primary_zone = '' OR d.primary_zone is NULL, t.primary_zone, d.primary_zone) AS primary_zone, IF(d.collation_type is NULL, t.collation_type, d.collation_type) AS collation_type, d.comment, d.read_only, d.default_tablegroup_id, d.in_recyclebin FROM oceanbase.__all_virtual_database AS d LEFT JOIN oceanbase.__all_tenant AS t ON d.tenant_id = t.tenant_id WHERE effective_tenant_id() = 1 OR t.tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2555,17 +2464,16 @@ int ObInnerTableSchema::gv_database_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_table_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_table_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2596,8 +2504,7 @@ int ObInnerTableSchema::gv_table_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT t.tenant_id, a.tenant_name, t.table_id, t.table_name, d.database_id, d.database_name, t.tablegroup_id, tg.tablegroup_name, t.table_type, IF(t.zone_list = '' OR t.zone_list is NULL, d.zone_list, t.zone_list) AS zone_list, IF(t.primary_zone = '' OR t.primary_zone is NULL, d.primary_zone, t.primary_zone) AS primary_zone, IF(t.collation_type is NULL, d.collation_type, t.collation_type) AS collation_type, IF(t.locality = '' OR t.locality is NULL, a.locality, t.locality) AS locality, t.schema_version, t.read_only, t.comment, t.index_status, t.index_type, t.part_level, t.part_func_type, t.part_func_expr, t.part_num, t.sub_part_func_type, t.sub_part_func_expr, t.sub_part_num, t.dop, t.auto_part, t.auto_part_size FROM oceanbase.__all_virtual_table AS t LEFT JOIN oceanbase.__all_tenant AS a ON t.tenant_id = a.tenant_id LEFT JOIN oceanbase.gv$database AS d ON t.database_id = d.database_id LEFT JOIN oceanbase.__all_virtual_tablegroup AS tg ON t.tablegroup_id = tg.tablegroup_id WHERE effective_tenant_id() = 1 OR t.tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT t.tenant_id, a.tenant_name, t.table_id, t.table_name, d.database_id, d.database_name, t.tablegroup_id, tg.tablegroup_name, t.table_type, IF(t.zone_list = '' OR t.zone_list is NULL, d.zone_list, t.zone_list) AS zone_list, IF(t.primary_zone = '' OR t.primary_zone is NULL, d.primary_zone, t.primary_zone) AS primary_zone, IF(t.collation_type is NULL, d.collation_type, t.collation_type) AS collation_type, IF(t.locality = '' OR t.locality is NULL, a.locality, t.locality) AS locality, t.schema_version, t.read_only, t.comment, t.index_status, t.index_type, t.part_level, t.part_func_type, t.part_func_expr, t.part_num, t.sub_part_func_type, t.sub_part_func_expr, t.sub_part_num, t.dop, t.auto_part, t.auto_part_size FROM oceanbase.__all_virtual_table AS t LEFT JOIN oceanbase.__all_tenant AS a ON t.tenant_id = a.tenant_id LEFT JOIN oceanbase.gv$database AS d ON t.database_id = d.database_id LEFT JOIN oceanbase.__all_virtual_tablegroup AS tg ON t.tablegroup_id = tg.tablegroup_id WHERE effective_tenant_id() = 1 OR t.tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2609,17 +2516,16 @@ int ObInnerTableSchema::gv_table_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_unit_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_unit_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2650,8 +2556,7 @@ int ObInnerTableSchema::gv_unit_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT a.unit_id, b.unit_config_id, b.name as unit_config_name, c.resource_pool_id, c.name as resource_pool_name, a.zone, t.tenant_id, t.tenant_name, a.svr_ip, a.svr_port, a.migrate_from_svr_ip, a.migrate_from_svr_port, b.max_cpu, b.min_cpu, b.max_memory, b.min_memory, b.max_iops, b.min_iops, b.max_disk_size, b.max_session_num FROM ( (SELECT unit_id, zone, resource_pool_id, svr_ip, svr_port, migrate_from_svr_ip, migrate_from_svr_port FROM oceanbase.__all_unit) UNION (SELECT unit_id, zone, resource_pool_id, migrate_from_svr_ip as svr_ip, migrate_from_svr_port as svr_port, '' as migrate_from_svr_ip, 0 as migrate_from_svr_port FROM oceanbase.__all_unit WHERE migrate_from_svr_ip != '') ) AS a LEFT JOIN oceanbase.__all_resource_pool AS c ON a.resource_pool_id = c.resource_pool_id LEFT JOIN oceanbase.__all_unit_config AS b ON c.unit_config_id = b.unit_config_id LEFT JOIN oceanbase.__all_tenant AS t ON c.tenant_id = t.tenant_id WHERE effective_tenant_id() = 1 OR c.tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT a.unit_id, b.unit_config_id, b.name as unit_config_name, c.resource_pool_id, c.name as resource_pool_name, a.zone, t.tenant_id, t.tenant_name, a.svr_ip, a.svr_port, a.migrate_from_svr_ip, a.migrate_from_svr_port, b.max_cpu, b.min_cpu, b.max_memory, b.min_memory, b.max_iops, b.min_iops, b.max_disk_size, b.max_session_num FROM ( (SELECT unit_id, zone, resource_pool_id, svr_ip, svr_port, migrate_from_svr_ip, migrate_from_svr_port FROM oceanbase.__all_unit) UNION (SELECT unit_id, zone, resource_pool_id, migrate_from_svr_ip as svr_ip, migrate_from_svr_port as svr_port, '' as migrate_from_svr_ip, 0 as migrate_from_svr_port FROM oceanbase.__all_unit WHERE migrate_from_svr_ip != '') ) AS a LEFT JOIN oceanbase.__all_resource_pool AS c ON a.resource_pool_id = c.resource_pool_id LEFT JOIN oceanbase.__all_unit_config AS b ON c.unit_config_id = b.unit_config_id LEFT JOIN oceanbase.__all_tenant AS t ON c.tenant_id = t.tenant_id WHERE effective_tenant_id() = 1 OR c.tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2663,17 +2568,16 @@ int ObInnerTableSchema::gv_unit_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_unit_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_unit_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2704,8 +2608,7 @@ int ObInnerTableSchema::v_unit_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * FROM oceanbase.gv$unit WHERE svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM oceanbase.gv$unit WHERE svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2717,10 +2620,10 @@ int ObInnerTableSchema::v_unit_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.21051_21100.cpp b/src/share/inner_table/ob_inner_table_schema.21051_21100.cpp index 2f67dcf04..0a6454396 100644 --- a/src/share/inner_table/ob_inner_table_schema.21051_21100.cpp +++ b/src/share/inner_table/ob_inner_table_schema.21051_21100.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::gv_partition_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_partition_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -58,8 +60,7 @@ int ObInnerTableSchema::gv_partition_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT p.tenant_id, p.table_id, t.tablegroup_id, p.partition_id, p.svr_ip, p.svr_port, p.sql_port, p.unit_id, p.partition_cnt, p.zone, p.role, p.member_list, p.row_count, p.data_size, p.data_version, p.partition_checksum, p.data_checksum, p.row_checksum, p.column_checksum, p.rebuild, p.replica_type, p.required_size, p.status, p.is_restore, p.quorum FROM oceanbase.__all_virtual_partition_table as p LEFT JOIN oceanbase.gv$table AS t ON p.table_id = t.table_id WHERE effective_tenant_id() = 1 OR p.tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT p.tenant_id, p.table_id, t.tablegroup_id, p.partition_id, p.svr_ip, p.svr_port, p.sql_port, p.unit_id, p.partition_cnt, p.zone, p.role, p.member_list, p.row_count, p.data_size, p.data_version, p.partition_checksum, p.data_checksum, p.row_checksum, p.column_checksum, p.rebuild, p.replica_type, p.required_size, p.status, p.is_restore, p.quorum FROM oceanbase.__all_virtual_partition_table as p LEFT JOIN oceanbase.gv$table AS t ON p.table_id = t.table_id WHERE effective_tenant_id() = 1 OR p.tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -71,17 +72,16 @@ int ObInnerTableSchema::gv_partition_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_partition_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_partition_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -112,8 +112,7 @@ int ObInnerTableSchema::v_partition_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * FROM oceanbase.gv$partition WHERE svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM oceanbase.gv$partition WHERE svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -125,17 +124,16 @@ int ObInnerTableSchema::v_partition_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_lock_wait_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_lock_wait_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -166,8 +164,7 @@ int ObInnerTableSchema::gv_lock_wait_stat_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT t.tenant_id as TENANT_ID, l.table_id as TABLE_ID, t.table_name as TABLE_NAME, l.rowkey as ROWKEY, l.svr_ip as SVR_IP, l.svr_port as SVR_PORT, l.session_id as SESSION_ID, l.need_wait as NEED_WAIT, l.recv_ts as RECV_TS, l.lock_ts as LOCK_TS, l.abs_timeout as ABS_TIMEOUT, l.try_lock_times as TRY_LOCK_TIMES, l.time_after_recv as TIME_AFTER_RECV FROM oceanbase.__all_virtual_lock_wait_stat as l LEFT JOIN oceanbase.gv$table AS t ON l.table_id = t.table_id WHERE effective_tenant_id() = 1 OR t.tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT t.tenant_id as TENANT_ID, l.table_id as TABLE_ID, t.table_name as TABLE_NAME, l.rowkey as ROWKEY, l.svr_ip as SVR_IP, l.svr_port as SVR_PORT, l.session_id as SESSION_ID, l.need_wait as NEED_WAIT, l.recv_ts as RECV_TS, l.lock_ts as LOCK_TS, l.abs_timeout as ABS_TIMEOUT, l.try_lock_times as TRY_LOCK_TIMES, l.time_after_recv as TIME_AFTER_RECV FROM oceanbase.__all_virtual_lock_wait_stat as l LEFT JOIN oceanbase.gv$table AS t ON l.table_id = t.table_id WHERE effective_tenant_id() = 1 OR t.tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -179,17 +176,16 @@ int ObInnerTableSchema::gv_lock_wait_stat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_lock_wait_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_lock_wait_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -220,8 +216,7 @@ int ObInnerTableSchema::v_lock_wait_stat_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * FROM oceanbase.gv$lock_wait_stat WHERE svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM oceanbase.gv$lock_wait_stat WHERE svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -233,17 +228,16 @@ int ObInnerTableSchema::v_lock_wait_stat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::time_zone_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::time_zone_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_MYSQL_SCHEMA_ID)); @@ -274,8 +268,7 @@ int ObInnerTableSchema::time_zone_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT time_zone_id as Time_zone_id, use_leap_seconds as Use_leap_seconds FROM oceanbase.__all_tenant_time_zone )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT time_zone_id as Time_zone_id, use_leap_seconds as Use_leap_seconds FROM oceanbase.__all_tenant_time_zone )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -287,17 +280,16 @@ int ObInnerTableSchema::time_zone_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::time_zone_name_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::time_zone_name_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_MYSQL_SCHEMA_ID)); @@ -328,8 +320,7 @@ int ObInnerTableSchema::time_zone_name_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT name as Name, time_zone_id as Time_zone_id FROM oceanbase.__all_tenant_time_zone_name )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT name as Name, time_zone_id as Time_zone_id FROM oceanbase.__all_tenant_time_zone_name )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -341,17 +332,16 @@ int ObInnerTableSchema::time_zone_name_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::time_zone_transition_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::time_zone_transition_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_MYSQL_SCHEMA_ID)); @@ -382,8 +372,7 @@ int ObInnerTableSchema::time_zone_transition_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT time_zone_id as Time_zone_id, transition_time as Transition_time, transition_type_id as Transition_type_id FROM oceanbase.__all_tenant_time_zone_transition )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT time_zone_id as Time_zone_id, transition_time as Transition_time, transition_type_id as Transition_type_id FROM oceanbase.__all_tenant_time_zone_transition )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -395,17 +384,16 @@ int ObInnerTableSchema::time_zone_transition_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::time_zone_transition_type_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::time_zone_transition_type_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_MYSQL_SCHEMA_ID)); @@ -436,8 +424,7 @@ int ObInnerTableSchema::time_zone_transition_type_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT time_zone_id as Time_zone_id, transition_type_id as Transition_type_id, offset as Offset, is_dst as Is_DST, abbreviation as Abbreviation FROM oceanbase.__all_tenant_time_zone_transition_type )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT time_zone_id as Time_zone_id, transition_type_id as Transition_type_id, offset as Offset, is_dst as Is_DST, abbreviation as Abbreviation FROM oceanbase.__all_tenant_time_zone_transition_type )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -449,17 +436,16 @@ int ObInnerTableSchema::time_zone_transition_type_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_session_longops_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_session_longops_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -490,8 +476,7 @@ int ObInnerTableSchema::gv_session_longops_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT sid as SID, op_name as OPNAME, target as TARGET, svr_ip as SVR_IP, svr_port as SVR_PORT, start_time as START_TIME, elapsed_time/1000000 as ELAPSED_SECONDS, remaining_time as TIME_REMAINING, last_update_time as LAST_UPDATE_TIME, message as MESSAGE FROM oceanbase.__all_virtual_long_ops_status WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT sid as SID, op_name as OPNAME, target as TARGET, svr_ip as SVR_IP, svr_port as SVR_PORT, start_time as START_TIME, elapsed_time/1000000 as ELAPSED_SECONDS, remaining_time as TIME_REMAINING, last_update_time as LAST_UPDATE_TIME, message as MESSAGE FROM oceanbase.__all_virtual_long_ops_status WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -503,17 +488,16 @@ int ObInnerTableSchema::gv_session_longops_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_session_longops_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_session_longops_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -544,8 +528,7 @@ int ObInnerTableSchema::v_session_longops_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * FROM oceanbase.gv$session_longops WHERE svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM oceanbase.gv$session_longops WHERE svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -557,17 +540,16 @@ int ObInnerTableSchema::v_session_longops_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_tenant_memstore_allocator_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_tenant_memstore_allocator_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -598,8 +580,7 @@ int ObInnerTableSchema::gv_tenant_memstore_allocator_info_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT svr_ip as SVR_IP, svr_port as SVR_PORT, tenant_id as TENANT_ID, table_id as TABLE_ID, partition_id as PARTITION_ID, mt_base_version as MT_BASE_VERSION, retire_clock as RETIRE_CLOCK, mt_is_frozen as MT_IS_FROZEN, mt_protection_clock as MT_PROTECTION_CLOCK, mt_snapshot_version as MT_SNAPSHOT_VERSION FROM oceanbase.__all_virtual_tenant_memstore_allocator_info WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() ORDER BY SVR_IP, SVR_PORT, TENANT_ID, TABLE_ID, PARTITION_ID, MT_BASE_VERSION )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT svr_ip as SVR_IP, svr_port as SVR_PORT, tenant_id as TENANT_ID, table_id as TABLE_ID, partition_id as PARTITION_ID, mt_base_version as MT_BASE_VERSION, retire_clock as RETIRE_CLOCK, mt_is_frozen as MT_IS_FROZEN, mt_protection_clock as MT_PROTECTION_CLOCK, mt_snapshot_version as MT_SNAPSHOT_VERSION FROM oceanbase.__all_virtual_tenant_memstore_allocator_info WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() ORDER BY SVR_IP, SVR_PORT, TENANT_ID, TABLE_ID, PARTITION_ID, MT_BASE_VERSION )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -611,17 +592,16 @@ int ObInnerTableSchema::gv_tenant_memstore_allocator_info_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_tenant_memstore_allocator_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_tenant_memstore_allocator_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -652,8 +632,7 @@ int ObInnerTableSchema::v_tenant_memstore_allocator_info_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * FROM oceanbase.gv$tenant_memstore_allocator_info WHERE svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM oceanbase.gv$tenant_memstore_allocator_info WHERE svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -665,17 +644,16 @@ int ObInnerTableSchema::v_tenant_memstore_allocator_info_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_tenant_sequence_object_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_tenant_sequence_object_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -706,8 +684,7 @@ int ObInnerTableSchema::gv_tenant_sequence_object_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * FROM oceanbase.__all_virtual_sequence_object WHERE tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM oceanbase.__all_virtual_sequence_object WHERE tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -719,17 +696,16 @@ int ObInnerTableSchema::gv_tenant_sequence_object_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(OB_INVALID_ID); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -793,17 +769,16 @@ int ObInnerTableSchema::columns_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_minor_merge_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_minor_merge_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -834,8 +809,7 @@ int ObInnerTableSchema::gv_minor_merge_info_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT A.SVR_IP AS SVR_IP, A.SVR_PORT AS SVR_PORT, A.VALUE1 AS TENANT_ID, A.VALUE2 AS FREEZE_SNAPSHOT, A.GMT_CREATE AS START_TIME, B.GMT_CREATE AS FINISH_TIME FROM (SELECT SVR_IP, SVR_PORT, VALUE1, VALUE2, GMT_CREATE FROM OCEANBASE.__ALL_SERVER_EVENT_HISTORY WHERE EVENT = 'minor merge start' AND (EFFECTIVE_TENANT_ID() = 1 OR VALUE1 = EFFECTIVE_TENANT_ID())) A LEFT JOIN (SELECT SVR_IP, SVR_PORT, VALUE1, VALUE2, GMT_CREATE FROM OCEANBASE.__ALL_SERVER_EVENT_HISTORY WHERE EVENT = 'minor merge finish' AND (EFFECTIVE_TENANT_ID() = 1 OR VALUE1 = EFFECTIVE_TENANT_ID())) B ON A.SVR_IP = B.SVR_IP AND A.SVR_PORT = B.SVR_PORT AND A.VALUE1 = B.VALUE1 AND A.VALUE2 = B.VALUE2 ORDER BY SVR_IP, SVR_PORT, TENANT_ID, FREEZE_SNAPSHOT )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT A.SVR_IP AS SVR_IP, A.SVR_PORT AS SVR_PORT, A.VALUE1 AS TENANT_ID, A.VALUE2 AS FREEZE_SNAPSHOT, A.GMT_CREATE AS START_TIME, B.GMT_CREATE AS FINISH_TIME FROM (SELECT SVR_IP, SVR_PORT, VALUE1, VALUE2, GMT_CREATE FROM OCEANBASE.__ALL_SERVER_EVENT_HISTORY WHERE EVENT = 'minor merge start' AND (EFFECTIVE_TENANT_ID() = 1 OR VALUE1 = EFFECTIVE_TENANT_ID())) A LEFT JOIN (SELECT SVR_IP, SVR_PORT, VALUE1, VALUE2, GMT_CREATE FROM OCEANBASE.__ALL_SERVER_EVENT_HISTORY WHERE EVENT = 'minor merge finish' AND (EFFECTIVE_TENANT_ID() = 1 OR VALUE1 = EFFECTIVE_TENANT_ID())) B ON A.SVR_IP = B.SVR_IP AND A.SVR_PORT = B.SVR_PORT AND A.VALUE1 = B.VALUE1 AND A.VALUE2 = B.VALUE2 ORDER BY SVR_IP, SVR_PORT, TENANT_ID, FREEZE_SNAPSHOT )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -847,17 +821,16 @@ int ObInnerTableSchema::gv_minor_merge_info_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_tenant_px_worker_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_tenant_px_worker_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -888,8 +861,7 @@ int ObInnerTableSchema::gv_tenant_px_worker_stat_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( select session_id, tenant_id, svr_ip, svr_port, trace_id, qc_id, sqc_id, worker_id, dfo_id, start_time from oceanbase.__all_virtual_px_worker_stat where effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() order by session_id, svr_ip, svr_port )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( select session_id, tenant_id, svr_ip, svr_port, trace_id, qc_id, sqc_id, worker_id, dfo_id, start_time from oceanbase.__all_virtual_px_worker_stat where effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() order by session_id, svr_ip, svr_port )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -901,17 +873,16 @@ int ObInnerTableSchema::gv_tenant_px_worker_stat_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_tenant_px_worker_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_tenant_px_worker_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -942,8 +913,7 @@ int ObInnerTableSchema::v_tenant_px_worker_stat_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( select session_id, tenant_id, svr_ip, svr_port, trace_id, qc_id, sqc_id, worker_id, dfo_id, start_time from oceanbase.gv$tenant_px_worker_stat where svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( select session_id, tenant_id, svr_ip, svr_port, trace_id, qc_id, sqc_id, worker_id, dfo_id, start_time from oceanbase.gv$tenant_px_worker_stat where svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -955,17 +925,16 @@ int ObInnerTableSchema::v_tenant_px_worker_stat_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_partition_audit_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_partition_audit_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -996,8 +965,7 @@ int ObInnerTableSchema::gv_partition_audit_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * FROM oceanbase.__all_virtual_partition_audit WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM oceanbase.__all_virtual_partition_audit WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1009,17 +977,16 @@ int ObInnerTableSchema::gv_partition_audit_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_partition_audit_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_partition_audit_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1050,8 +1017,7 @@ int ObInnerTableSchema::v_partition_audit_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * FROM oceanbase.gv$partition_audit WHERE svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM oceanbase.gv$partition_audit WHERE svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1063,17 +1029,16 @@ int ObInnerTableSchema::v_partition_audit_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_ob_cluster_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_ob_cluster_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1104,8 +1069,7 @@ int ObInnerTableSchema::v_ob_cluster_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT cluster_id, cluster_name, created, cluster_role, cluster_status, `switchover#`, switchover_status, switchover_info, current_scn, standby_became_primary_scn, primary_cluster_id, protection_mode, protection_level, redo_transport_options FROM oceanbase.__all_virtual_cluster )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT cluster_id, cluster_name, created, cluster_role, cluster_status, `switchover#`, switchover_status, switchover_info, current_scn, standby_became_primary_scn, primary_cluster_id, protection_mode, protection_level, redo_transport_options FROM oceanbase.__all_virtual_cluster )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1117,17 +1081,16 @@ int ObInnerTableSchema::v_ob_cluster_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_ps_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_ps_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1158,8 +1121,7 @@ int ObInnerTableSchema::gv_ps_stat_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT tenant_id, svr_ip, svr_port, stmt_count, hit_count, access_count, mem_hold FROM oceanbase.__all_virtual_ps_stat WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT tenant_id, svr_ip, svr_port, stmt_count, hit_count, access_count, mem_hold FROM oceanbase.__all_virtual_ps_stat WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1171,17 +1133,16 @@ int ObInnerTableSchema::gv_ps_stat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_ps_stat_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_ps_stat_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1212,8 +1173,7 @@ int ObInnerTableSchema::v_ps_stat_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT tenant_id, svr_ip, svr_port, stmt_count, hit_count, access_count, mem_hold FROM oceanbase.gv$ps_stat WHERE svr_ip=HOST_IP() AND svr_port=RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT tenant_id, svr_ip, svr_port, stmt_count, hit_count, access_count, mem_hold FROM oceanbase.gv$ps_stat WHERE svr_ip=HOST_IP() AND svr_port=RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1225,17 +1185,16 @@ int ObInnerTableSchema::v_ps_stat_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_ps_item_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_ps_item_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1266,8 +1225,7 @@ int ObInnerTableSchema::gv_ps_item_info_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT tenant_id, svr_ip, svr_port, stmt_id, db_id, ps_sql, param_count, stmt_item_ref_count, stmt_info_ref_count, mem_hold, stmt_type, checksum, expired FROM oceanbase.__all_virtual_ps_item_info WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT tenant_id, svr_ip, svr_port, stmt_id, db_id, ps_sql, param_count, stmt_item_ref_count, stmt_info_ref_count, mem_hold, stmt_type, checksum, expired FROM oceanbase.__all_virtual_ps_item_info WHERE is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1279,17 +1237,16 @@ int ObInnerTableSchema::gv_ps_item_info_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_ps_item_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_ps_item_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1320,8 +1277,7 @@ int ObInnerTableSchema::v_ps_item_info_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT tenant_id, svr_ip, svr_port, stmt_id, db_id, ps_sql, param_count, stmt_item_ref_count, stmt_info_ref_count, mem_hold, stmt_type, checksum, expired FROM oceanbase.gv$ps_item_info WHERE svr_ip=HOST_IP() AND svr_port=RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT tenant_id, svr_ip, svr_port, stmt_id, db_id, ps_sql, param_count, stmt_item_ref_count, stmt_info_ref_count, mem_hold, stmt_type, checksum, expired FROM oceanbase.gv$ps_item_info WHERE svr_ip=HOST_IP() AND svr_port=RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1333,17 +1289,16 @@ int ObInnerTableSchema::v_ps_item_info_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sql_workarea_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sql_workarea_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1374,8 +1329,7 @@ int ObInnerTableSchema::gv_sql_workarea_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( select cast(null as binary(8)) as address, cast(null as signed) as hash_value, sql_id, cast(null as signed) as child_number, cast(null as binary(8)) as workarea_address, operation_type, operation_id, policy, estimated_optimal_size, estimated_onepass_size, last_memory_used, last_execution, last_degree, total_executions, optimal_executions, onepass_executions, multipasses_executions, active_time, max_tempseg_size, last_tempseg_size, tenant_id as con_id from oceanbase.__all_virtual_sql_workarea_history_stat where effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( select cast(null as binary(8)) as address, cast(null as signed) as hash_value, sql_id, cast(null as signed) as child_number, cast(null as binary(8)) as workarea_address, operation_type, operation_id, policy, estimated_optimal_size, estimated_onepass_size, last_memory_used, last_execution, last_degree, total_executions, optimal_executions, onepass_executions, multipasses_executions, active_time, max_tempseg_size, last_tempseg_size, tenant_id as con_id from oceanbase.__all_virtual_sql_workarea_history_stat where effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1387,17 +1341,16 @@ int ObInnerTableSchema::gv_sql_workarea_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sql_workarea_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sql_workarea_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1428,8 +1381,7 @@ int ObInnerTableSchema::v_sql_workarea_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( select cast(null as binary(8)) as address, cast(null as signed) as hash_value, sql_id, cast(null as signed) as child_number, cast(null as binary(8)) as workarea_address, operation_type, operation_id, policy, estimated_optimal_size, estimated_onepass_size, last_memory_used, last_execution, last_degree, total_executions, optimal_executions, onepass_executions, multipasses_executions, active_time, max_tempseg_size, last_tempseg_size, tenant_id as con_id from oceanbase.__all_virtual_sql_workarea_history_stat where (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) and svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( select cast(null as binary(8)) as address, cast(null as signed) as hash_value, sql_id, cast(null as signed) as child_number, cast(null as binary(8)) as workarea_address, operation_type, operation_id, policy, estimated_optimal_size, estimated_onepass_size, last_memory_used, last_execution, last_degree, total_executions, optimal_executions, onepass_executions, multipasses_executions, active_time, max_tempseg_size, last_tempseg_size, tenant_id as con_id from oceanbase.__all_virtual_sql_workarea_history_stat where (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) and svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1441,17 +1393,16 @@ int ObInnerTableSchema::v_sql_workarea_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sql_workarea_active_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sql_workarea_active_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1482,8 +1433,7 @@ int ObInnerTableSchema::gv_sql_workarea_active_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( select cast(null as signed) as sql_hash_value, sql_id, cast(null as date) as sql_exec_start, sql_exec_id, cast(null as binary(8)) as workarea_address, operation_type, operation_id, policy, sid, cast(null as signed) as qcinst_id, cast(null as signed) as qcsid, active_time, work_area_size, expect_size, actual_mem_used, max_mem_used, number_passes, tempseg_size, cast(null as char(20)) as tablespace, cast(null as signed) as `segrfno#`, cast(null as signed) as `segblk#`, tenant_id as con_id from oceanbase.__all_virtual_sql_workarea_active where effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( select cast(null as signed) as sql_hash_value, sql_id, cast(null as date) as sql_exec_start, sql_exec_id, cast(null as binary(8)) as workarea_address, operation_type, operation_id, policy, sid, cast(null as signed) as qcinst_id, cast(null as signed) as qcsid, active_time, work_area_size, expect_size, actual_mem_used, max_mem_used, number_passes, tempseg_size, cast(null as char(20)) as tablespace, cast(null as signed) as `segrfno#`, cast(null as signed) as `segblk#`, tenant_id as con_id from oceanbase.__all_virtual_sql_workarea_active where effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1495,17 +1445,16 @@ int ObInnerTableSchema::gv_sql_workarea_active_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sql_workarea_active_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sql_workarea_active_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1536,8 +1485,7 @@ int ObInnerTableSchema::v_sql_workarea_active_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( select cast(null as signed) as sql_hash_value, sql_id, cast(null as date) as sql_exec_start, sql_exec_id, cast(null as binary(8)) as workarea_address, operation_type, operation_id, policy, sid, cast(null as signed) as qcinst_id, cast(null as signed) as qcsid, active_time, work_area_size, expect_size, actual_mem_used, max_mem_used, number_passes, tempseg_size, cast(null as char(20)) as tablespace, cast(null as signed) as `segrfno#`, cast(null as signed) as `segblk#`, tenant_id as con_id from oceanbase.__all_virtual_sql_workarea_active where (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) and svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( select cast(null as signed) as sql_hash_value, sql_id, cast(null as date) as sql_exec_start, sql_exec_id, cast(null as binary(8)) as workarea_address, operation_type, operation_id, policy, sid, cast(null as signed) as qcinst_id, cast(null as signed) as qcsid, active_time, work_area_size, expect_size, actual_mem_used, max_mem_used, number_passes, tempseg_size, cast(null as char(20)) as tablespace, cast(null as signed) as `segrfno#`, cast(null as signed) as `segblk#`, tenant_id as con_id from oceanbase.__all_virtual_sql_workarea_active where (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) and svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1549,17 +1497,16 @@ int ObInnerTableSchema::v_sql_workarea_active_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sql_workarea_histogram_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sql_workarea_histogram_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1590,8 +1537,7 @@ int ObInnerTableSchema::gv_sql_workarea_histogram_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( select low_optimal_size, high_optimal_size, optimal_executions, onepass_executions, multipasses_executions, total_executions, tenant_id as con_id from oceanbase.__all_virtual_sql_workarea_histogram where effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( select low_optimal_size, high_optimal_size, optimal_executions, onepass_executions, multipasses_executions, total_executions, tenant_id as con_id from oceanbase.__all_virtual_sql_workarea_histogram where effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1603,17 +1549,16 @@ int ObInnerTableSchema::gv_sql_workarea_histogram_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sql_workarea_histogram_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sql_workarea_histogram_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1644,8 +1589,7 @@ int ObInnerTableSchema::v_sql_workarea_histogram_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( select low_optimal_size, high_optimal_size, optimal_executions, onepass_executions, multipasses_executions, total_executions, tenant_id as con_id from oceanbase.__all_virtual_sql_workarea_histogram where (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) and svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( select low_optimal_size, high_optimal_size, optimal_executions, onepass_executions, multipasses_executions, total_executions, tenant_id as con_id from oceanbase.__all_virtual_sql_workarea_histogram where (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) and svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1657,17 +1601,16 @@ int ObInnerTableSchema::v_sql_workarea_histogram_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_ob_sql_workarea_memory_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_ob_sql_workarea_memory_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1698,8 +1641,7 @@ int ObInnerTableSchema::gv_ob_sql_workarea_memory_info_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( select max_workarea_size, workarea_hold_size, max_auto_workarea_size, mem_target, total_mem_used, global_mem_bound, drift_size, workarea_count, manual_calc_count from oceanbase.__all_virtual_sql_workarea_memory_info where effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( select max_workarea_size, workarea_hold_size, max_auto_workarea_size, mem_target, total_mem_used, global_mem_bound, drift_size, workarea_count, manual_calc_count from oceanbase.__all_virtual_sql_workarea_memory_info where effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1711,17 +1653,16 @@ int ObInnerTableSchema::gv_ob_sql_workarea_memory_info_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_ob_sql_workarea_memory_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_ob_sql_workarea_memory_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1752,8 +1693,7 @@ int ObInnerTableSchema::v_ob_sql_workarea_memory_info_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( select max_workarea_size, workarea_hold_size, max_auto_workarea_size, mem_target, total_mem_used, global_mem_bound, drift_size, workarea_count, manual_calc_count from oceanbase.__all_virtual_sql_workarea_memory_info where (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) and svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( select max_workarea_size, workarea_hold_size, max_auto_workarea_size, mem_target, total_mem_used, global_mem_bound, drift_size, workarea_count, manual_calc_count from oceanbase.__all_virtual_sql_workarea_memory_info where (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) and svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1765,17 +1705,16 @@ int ObInnerTableSchema::v_ob_sql_workarea_memory_info_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_plan_cache_reference_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_plan_cache_reference_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1806,8 +1745,7 @@ int ObInnerTableSchema::gv_plan_cache_reference_info_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SVR_IP, SVR_PORT, TENANT_ID, PC_REF_PLAN_LOCAL, PC_REF_PLAN_REMOTE, PC_REF_PLAN_DIST, PC_REF_PLAN_ARR, PC_REF_PL, PC_REF_PL_STAT, PLAN_GEN, CLI_QUERY, OUTLINE_EXEC, PLAN_EXPLAIN, ASYN_BASELINE, LOAD_BASELINE, PS_EXEC, GV_SQL, PL_ANON, PL_ROUTINE, PACKAGE_VAR, PACKAGE_TYPE, PACKAGE_SPEC, PACKAGE_BODY, PACKAGE_RESV, GET_PKG, INDEX_BUILDER, PCV_SET, PCV_RD, PCV_WR, PCV_GET_PLAN_KEY, PCV_GET_PL_KEY, PCV_EXPIRE_BY_USED, PCV_EXPIRE_BY_MEM FROM oceanbase.__all_virtual_plan_cache_stat WHERE IS_SERVING_TENANT(SVR_IP, SVR_PORT, EFFECTIVE_TENANT_ID()) AND (TENANT_ID = EFFECTIVE_TENANT_ID() OR EFFECTIVE_TENANT_ID() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SVR_IP, SVR_PORT, TENANT_ID, PC_REF_PLAN_LOCAL, PC_REF_PLAN_REMOTE, PC_REF_PLAN_DIST, PC_REF_PLAN_ARR, PC_REF_PL, PC_REF_PL_STAT, PLAN_GEN, CLI_QUERY, OUTLINE_EXEC, PLAN_EXPLAIN, ASYN_BASELINE, LOAD_BASELINE, PS_EXEC, GV_SQL, PL_ANON, PL_ROUTINE, PACKAGE_VAR, PACKAGE_TYPE, PACKAGE_SPEC, PACKAGE_BODY, PACKAGE_RESV, GET_PKG, INDEX_BUILDER, PCV_SET, PCV_RD, PCV_WR, PCV_GET_PLAN_KEY, PCV_GET_PL_KEY, PCV_EXPIRE_BY_USED, PCV_EXPIRE_BY_MEM FROM oceanbase.__all_virtual_plan_cache_stat WHERE IS_SERVING_TENANT(SVR_IP, SVR_PORT, EFFECTIVE_TENANT_ID()) AND (TENANT_ID = EFFECTIVE_TENANT_ID() OR EFFECTIVE_TENANT_ID() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1819,17 +1757,16 @@ int ObInnerTableSchema::gv_plan_cache_reference_info_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_plan_cache_reference_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_plan_cache_reference_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1875,17 +1812,16 @@ WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_ob_timestamp_service_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_ob_timestamp_service_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1916,8 +1852,7 @@ int ObInnerTableSchema::v_ob_timestamp_service_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT tenant_id as tenant_id, case when ts_type=0 then 'Local' when ts_type=1 then 'Global' when ts_type=2 then 'HA Global' ELSE NULL END as ts_type, ts_value as ts_value FROM oceanbase.__all_virtual_timestamp_service where (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT tenant_id as tenant_id, case when ts_type=0 then 'Local' when ts_type=1 then 'Global' when ts_type=2 then 'HA Global' ELSE NULL END as ts_type, ts_value as ts_value FROM oceanbase.__all_virtual_timestamp_service where (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1929,10 +1864,10 @@ int ObInnerTableSchema::v_ob_timestamp_service_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.21101_21150.cpp b/src/share/inner_table/ob_inner_table_schema.21101_21150.cpp index e0832318b..01f89e707 100644 --- a/src/share/inner_table/ob_inner_table_schema.21101_21150.cpp +++ b/src/share/inner_table/ob_inner_table_schema.21101_21150.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::gv_sstable_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sstable_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -58,8 +60,7 @@ int ObInnerTableSchema::gv_sstable_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT M.SVR_IP, M.SVR_PORT, M.TABLE_TYPE, M.TABLE_ID, T.TABLE_NAME, T.TENANT_ID, M.PARTITION_ID, M.INDEX_ID, M.BASE_VERSION, M.MULTI_VERSION_START, M.SNAPSHOT_VERSION, M.START_LOG_TS, M.END_LOG_TS, M.MAX_LOG_TS, M.VERSION, M.LOGICAL_DATA_VERSION, M.SIZE, M.IS_ACTIVE, M.REF, M.WRITE_REF, M.TRX_COUNT, M.PENDING_LOG_PERSISTING_ROW_CNT, M.UPPER_TRANS_VERSION, M.CONTAIN_UNCOMMITTED_ROW FROM oceanbase.__all_virtual_table_mgr M JOIN oceanbase.__all_virtual_table T ON M.TABLE_ID = T.TABLE_ID WHERE effective_tenant_id() = 1 OR T.tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT M.SVR_IP, M.SVR_PORT, M.TABLE_TYPE, M.TABLE_ID, T.TABLE_NAME, T.TENANT_ID, M.PARTITION_ID, M.INDEX_ID, M.BASE_VERSION, M.MULTI_VERSION_START, M.SNAPSHOT_VERSION, M.START_LOG_TS, M.END_LOG_TS, M.MAX_LOG_TS, M.VERSION, M.LOGICAL_DATA_VERSION, M.SIZE, M.IS_ACTIVE, M.REF, M.WRITE_REF, M.TRX_COUNT, M.PENDING_LOG_PERSISTING_ROW_CNT, M.UPPER_TRANS_VERSION, M.CONTAIN_UNCOMMITTED_ROW FROM oceanbase.__all_virtual_table_mgr M JOIN oceanbase.__all_virtual_table T ON M.TABLE_ID = T.TABLE_ID WHERE effective_tenant_id() = 1 OR T.tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -71,17 +72,16 @@ int ObInnerTableSchema::gv_sstable_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sstable_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sstable_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -112,8 +112,7 @@ int ObInnerTableSchema::v_sstable_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT M.TABLE_TYPE, M.TABLE_ID, T.TABLE_NAME, T.TENANT_ID, M.PARTITION_ID, M.INDEX_ID, M.BASE_VERSION, M.MULTI_VERSION_START, M.SNAPSHOT_VERSION, M.START_LOG_TS, M.END_LOG_TS, M.MAX_LOG_TS, M.VERSION, M.LOGICAL_DATA_VERSION, M.SIZE, M.IS_ACTIVE, M.REF, M.WRITE_REF, M.TRX_COUNT, M.PENDING_LOG_PERSISTING_ROW_CNT, M.UPPER_TRANS_VERSION, M.CONTAIN_UNCOMMITTED_ROW FROM oceanbase.__all_virtual_table_mgr M JOIN oceanbase.__all_virtual_table T ON M.TABLE_ID = T.TABLE_ID WHERE M.SVR_IP=HOST_IP() AND M.SVR_PORT=RPC_PORT() AND effective_tenant_id() = 1 OR T.tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT M.TABLE_TYPE, M.TABLE_ID, T.TABLE_NAME, T.TENANT_ID, M.PARTITION_ID, M.INDEX_ID, M.BASE_VERSION, M.MULTI_VERSION_START, M.SNAPSHOT_VERSION, M.START_LOG_TS, M.END_LOG_TS, M.MAX_LOG_TS, M.VERSION, M.LOGICAL_DATA_VERSION, M.SIZE, M.IS_ACTIVE, M.REF, M.WRITE_REF, M.TRX_COUNT, M.PENDING_LOG_PERSISTING_ROW_CNT, M.UPPER_TRANS_VERSION, M.CONTAIN_UNCOMMITTED_ROW FROM oceanbase.__all_virtual_table_mgr M JOIN oceanbase.__all_virtual_table T ON M.TABLE_ID = T.TABLE_ID WHERE M.SVR_IP=HOST_IP() AND M.SVR_PORT=RPC_PORT() AND effective_tenant_id() = 1 OR T.tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -125,17 +124,16 @@ int ObInnerTableSchema::v_sstable_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_archivelog_summary_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_archivelog_summary_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -166,8 +164,7 @@ int ObInnerTableSchema::cdb_ob_backup_archivelog_summary_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT INCARNATION, LOG_ARCHIVE_ROUND, TENANT_ID, STATUS, MIN_FIRST_TIME, MAX_NEXT_TIME, INPUT_BYTES, OUTPUT_BYTES, ROUND(OUTPUT_BYTES / INPUT_BYTES, 2) AS COMPRESSION_RATIO, CASE WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN INPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN INPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB') END AS INPUT_BYTES_DISPLAY, CASE WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN OUTPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN OUTPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB') END AS OUTPUT_BYTES_DISPLAY FROM ( select tenant_id, incarnation, log_archive_round, min_first_time, max_next_time, input_bytes, output_bytes, deleted_input_bytes, deleted_output_bytes, pg_count, 'STOP' as status from __all_backup_log_archive_status_history where effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() union select tenant_id, incarnation, log_archive_round, min_first_time, max_next_time, input_bytes, output_bytes, deleted_input_bytes, deleted_output_bytes, pg_count , status from __all_virtual_backup_log_archive_status where (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) and status != 'STOP'); )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT INCARNATION, LOG_ARCHIVE_ROUND, TENANT_ID, STATUS, MIN_FIRST_TIME, MAX_NEXT_TIME, INPUT_BYTES, OUTPUT_BYTES, ROUND(OUTPUT_BYTES / INPUT_BYTES, 2) AS COMPRESSION_RATIO, CASE WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN INPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN INPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB') END AS INPUT_BYTES_DISPLAY, CASE WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN OUTPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN OUTPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB') END AS OUTPUT_BYTES_DISPLAY FROM ( select tenant_id, incarnation, log_archive_round, min_first_time, max_next_time, input_bytes, output_bytes, deleted_input_bytes, deleted_output_bytes, pg_count, 'STOP' as status from __all_backup_log_archive_status_history where effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() union select tenant_id, incarnation, log_archive_round, min_first_time, max_next_time, input_bytes, output_bytes, deleted_input_bytes, deleted_output_bytes, pg_count , status from __all_virtual_backup_log_archive_status where (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) and status != 'STOP'); )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -179,17 +176,16 @@ int ObInnerTableSchema::cdb_ob_backup_archivelog_summary_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_job_details_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_job_details_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -220,8 +216,7 @@ int ObInnerTableSchema::cdb_ob_backup_job_details_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT INCARNATION, TENANT_ID, BACKUP_SET_ID AS BS_KEY, BACKUP_TYPE, ENCRYPTION_MODE, START_TIME, END_TIME, INPUT_BYTES, OUTPUT_BYTES, DEVICE_TYPE AS OUTPUT_DEVICE_TYPE, ROUND((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000,0) AS ELAPSED_SECONDES, ROUND(OUTPUT_BYTES / INPUT_BYTES, 2) AS COMPRESSION_RATIO, INPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) AS INPUT_BYTES_PER_SEC, OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) AS OUTPUT_BYTES_PER_SEC, CASE WHEN STATUS = 'FINISH' AND RESULT != 0 THEN 'FAILED' WHEN STATUS = 'FINISH' AND RESULT = 0 THEN 'COMPLETED' ELSE 'RUNNING' END AS STATUS, CASE WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN INPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN INPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB') END AS INPUT_BYTES_DISPLAY, CASE WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN OUTPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN OUTPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB') END AS OUTPUT_BYTES_DISPLAY, CASE WHEN INPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) >= 1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES / ((END_TIME - START_TIME)/1000/1000) /1024/1024/1024,2), 'GB/S') ELSE CONCAT(ROUND(INPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) /1024/1024,2), 'MB/S') END AS INPUT_BYTES_PER_SEC_DISPLAY, CASE WHEN OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000)/1024/1024/1024,2), 'GB/S') ELSE CONCAT(ROUND(OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000)/1024/1024,2), 'MB/S') END AS OUTPUT_BYTES_PER_SEC_DISPLAY, TIMEDIFF(END_TIME, START_TIME) AS TIME_TAKEN_DISPLAY FROM __all_virtual_backup_task WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT INCARNATION, TENANT_ID, BACKUP_SET_ID AS BS_KEY, BACKUP_TYPE, ENCRYPTION_MODE, START_TIME, END_TIME, INPUT_BYTES, OUTPUT_BYTES, DEVICE_TYPE AS OUTPUT_DEVICE_TYPE, ROUND((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000,0) AS ELAPSED_SECONDES, ROUND(OUTPUT_BYTES / INPUT_BYTES, 2) AS COMPRESSION_RATIO, INPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) AS INPUT_BYTES_PER_SEC, OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) AS OUTPUT_BYTES_PER_SEC, CASE WHEN STATUS = 'FINISH' AND RESULT != 0 THEN 'FAILED' WHEN STATUS = 'FINISH' AND RESULT = 0 THEN 'COMPLETED' ELSE 'RUNNING' END AS STATUS, CASE WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN INPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN INPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB') END AS INPUT_BYTES_DISPLAY, CASE WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN OUTPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN OUTPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB') END AS OUTPUT_BYTES_DISPLAY, CASE WHEN INPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) >= 1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES / ((END_TIME - START_TIME)/1000/1000) /1024/1024/1024,2), 'GB/S') ELSE CONCAT(ROUND(INPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) /1024/1024,2), 'MB/S') END AS INPUT_BYTES_PER_SEC_DISPLAY, CASE WHEN OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000)/1024/1024/1024,2), 'GB/S') ELSE CONCAT(ROUND(OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000)/1024/1024,2), 'MB/S') END AS OUTPUT_BYTES_PER_SEC_DISPLAY, TIMEDIFF(END_TIME, START_TIME) AS TIME_TAKEN_DISPLAY FROM __all_virtual_backup_task WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -233,17 +228,16 @@ int ObInnerTableSchema::cdb_ob_backup_job_details_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_set_details_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_set_details_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -274,8 +268,7 @@ int ObInnerTableSchema::cdb_ob_backup_set_details_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT INCARNATION, TENANT_ID, BACKUP_SET_ID AS BS_KEY, BACKUP_TYPE, ENCRYPTION_MODE, START_TIME, END_TIME AS COMPLETION_TIME, ROUND((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000,0) AS ELAPSED_SECONDES, 'NO' AS KEEP, '' AS KEEP_UNTIL, DEVICE_TYPE, 'NO' AS COMPRESSED, OUTPUT_BYTES, OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) AS OUTPUT_RATE_BYTES, ROUND(OUTPUT_BYTES / INPUT_BYTES, 2) AS COMPRESSION_RATIO, CASE WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN OUTPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN OUTPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB') END AS OUTPUT_BYTES_DISPLAY, CASE WHEN OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000)/1024/1024/1024,2), 'GB/S') ELSE CONCAT(ROUND(OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000)/1024/1024,2), 'MB/S') END AS OUTPUT_RATE_BYTES_DISPLAY, TIMEDIFF(END_TIME, START_TIME) AS TIME_TAKEN_DISPLAY, CASE WHEN IS_MARK_DELETED = 1 THEN 'DELETING' WHEN RESULT != 0 THEN 'FAILED' ELSE 'COMPLETED' END AS STATUS FROM __all_backup_task_history WHERE status = 'FINISH' and (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT INCARNATION, TENANT_ID, BACKUP_SET_ID AS BS_KEY, BACKUP_TYPE, ENCRYPTION_MODE, START_TIME, END_TIME AS COMPLETION_TIME, ROUND((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000,0) AS ELAPSED_SECONDES, 'NO' AS KEEP, '' AS KEEP_UNTIL, DEVICE_TYPE, 'NO' AS COMPRESSED, OUTPUT_BYTES, OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) AS OUTPUT_RATE_BYTES, ROUND(OUTPUT_BYTES / INPUT_BYTES, 2) AS COMPRESSION_RATIO, CASE WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN OUTPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN OUTPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB') END AS OUTPUT_BYTES_DISPLAY, CASE WHEN OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000)/1024/1024/1024,2), 'GB/S') ELSE CONCAT(ROUND(OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000)/1024/1024,2), 'MB/S') END AS OUTPUT_RATE_BYTES_DISPLAY, TIMEDIFF(END_TIME, START_TIME) AS TIME_TAKEN_DISPLAY, CASE WHEN IS_MARK_DELETED = 1 THEN 'DELETING' WHEN RESULT != 0 THEN 'FAILED' ELSE 'COMPLETED' END AS STATUS FROM __all_backup_task_history WHERE status = 'FINISH' and (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -287,17 +280,16 @@ int ObInnerTableSchema::cdb_ob_backup_set_details_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_set_expired_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_set_expired_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -328,8 +320,7 @@ int ObInnerTableSchema::cdb_ob_backup_set_expired_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT INCARNATION, TENANT_ID, BACKUP_SET_ID AS BS_KEY, BACKUP_TYPE, ENCRYPTION_MODE, START_TIME, END_TIME AS COMPLETION_TIME, ROUND((END_TIME - START_TIME)/1000/1000,0) AS ELAPSED_SECONDES, 'NO' AS KEEP, '' AS KEEP_UNTIL, DEVICE_TYPE, 'NO' AS COMPRESSED, OUTPUT_BYTES, OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) AS OUTPUT_RATE_BYTES, ROUND(OUTPUT_BYTES / INPUT_BYTES, 2) AS COMPRESSION_RATIO, CASE WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN OUTPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN OUTPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB') END AS OUTPUT_BYTES_DISPLAY, CASE WHEN OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000)/1024/1024/1024,2), 'GB/S') ELSE CONCAT(ROUND(OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000)/1024/1024,2), 'MB/S') END AS OUTPUT_RATE_BYTES_DISPLAY, TIMEDIFF(END_TIME, START_TIME) AS TIME_TAKEN_DISPLAY FROM __all_backup_task_history, (select CONVERT(value, SIGNED INTEGER) as days from __all_virtual_sys_parameter_stat where name = 'backup_recovery_window' and SVR_IP=host_ip() and SVR_PORT=rpc_port() limit 1) WHERE status = 'COMPLETED' and (days = 0 or TIMESTAMPDIFF(DAY, END_TIME, now()) > days) and (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT INCARNATION, TENANT_ID, BACKUP_SET_ID AS BS_KEY, BACKUP_TYPE, ENCRYPTION_MODE, START_TIME, END_TIME AS COMPLETION_TIME, ROUND((END_TIME - START_TIME)/1000/1000,0) AS ELAPSED_SECONDES, 'NO' AS KEEP, '' AS KEEP_UNTIL, DEVICE_TYPE, 'NO' AS COMPRESSED, OUTPUT_BYTES, OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) AS OUTPUT_RATE_BYTES, ROUND(OUTPUT_BYTES / INPUT_BYTES, 2) AS COMPRESSION_RATIO, CASE WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN OUTPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN OUTPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB') END AS OUTPUT_BYTES_DISPLAY, CASE WHEN OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000) >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000)/1024/1024/1024,2), 'GB/S') ELSE CONCAT(ROUND(OUTPUT_BYTES / ((TIME_TO_USEC(END_TIME) - TIME_TO_USEC(START_TIME))/1000/1000)/1024/1024,2), 'MB/S') END AS OUTPUT_RATE_BYTES_DISPLAY, TIMEDIFF(END_TIME, START_TIME) AS TIME_TAKEN_DISPLAY FROM __all_backup_task_history, (select CONVERT(value, SIGNED INTEGER) as days from __all_virtual_sys_parameter_stat where name = 'backup_recovery_window' and SVR_IP=host_ip() and SVR_PORT=rpc_port() limit 1) WHERE status = 'COMPLETED' and (days = 0 or TIMESTAMPDIFF(DAY, END_TIME, now()) > days) and (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -341,17 +332,16 @@ int ObInnerTableSchema::cdb_ob_backup_set_expired_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_progress_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_progress_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -382,8 +372,7 @@ int ObInnerTableSchema::cdb_ob_backup_progress_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT INCARNATION, BACKUP_SET_ID AS BS_KEY, BACKUP_TYPE, TENANT_ID, PARTITION_COUNT, MACRO_BLOCK_COUNT, FINISH_PARTITION_COUNT, FINISH_MACRO_BLOCK_COUNT, INPUT_BYTES, OUTPUT_BYTES, START_TIME, END_TIME AS COMPLETION_TIME, CASE WHEN STATUS = 'FINISH' AND RESULT != 0 THEN 'FAILED' WHEN STATUS = 'FINISH' AND RESULT = 0 THEN 'COMPLETED' ELSE 'RUNNING' END AS STATUS FROM __all_virtual_backup_task WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT INCARNATION, BACKUP_SET_ID AS BS_KEY, BACKUP_TYPE, TENANT_ID, PARTITION_COUNT, MACRO_BLOCK_COUNT, FINISH_PARTITION_COUNT, FINISH_MACRO_BLOCK_COUNT, INPUT_BYTES, OUTPUT_BYTES, START_TIME, END_TIME AS COMPLETION_TIME, CASE WHEN STATUS = 'FINISH' AND RESULT != 0 THEN 'FAILED' WHEN STATUS = 'FINISH' AND RESULT = 0 THEN 'COMPLETED' ELSE 'RUNNING' END AS STATUS FROM __all_virtual_backup_task WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -395,17 +384,16 @@ int ObInnerTableSchema::cdb_ob_backup_progress_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_archivelog_progress_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_archivelog_progress_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -436,8 +424,7 @@ int ObInnerTableSchema::cdb_ob_backup_archivelog_progress_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT INCARNATION, TENANT_ID, LOG_ARCHIVE_ROUND, SVR_IP, SVR_PORT, TABLE_ID, PARTITION_ID, usec_to_time(log_archive_start_ts) as MIN_FIRST_TIME, usec_to_time(log_archive_cur_ts) as MAX_NEXT_TIME, CASE WHEN log_archive_status = 1 THEN 'STOP' WHEN log_archive_status = 2 THEN 'BEGINNING' WHEN log_archive_status = 3 THEN 'DOING' WHEN log_archive_status = 4 THEN 'STOPPING' WHEN log_archive_status = 5 THEN 'INTERRUPTED' WHEN log_archive_status = 6 THEN 'MIXED' ELSE 'INVALID' END as STATUS FROM __all_virtual_pg_backup_log_archive_status WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT INCARNATION, TENANT_ID, LOG_ARCHIVE_ROUND, SVR_IP, SVR_PORT, TABLE_ID, PARTITION_ID, usec_to_time(log_archive_start_ts) as MIN_FIRST_TIME, usec_to_time(log_archive_cur_ts) as MAX_NEXT_TIME, CASE WHEN log_archive_status = 1 THEN 'STOP' WHEN log_archive_status = 2 THEN 'BEGINNING' WHEN log_archive_status = 3 THEN 'DOING' WHEN log_archive_status = 4 THEN 'STOPPING' WHEN log_archive_status = 5 THEN 'INTERRUPTED' WHEN log_archive_status = 6 THEN 'MIXED' ELSE 'INVALID' END as STATUS FROM __all_virtual_pg_backup_log_archive_status WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -449,17 +436,16 @@ int ObInnerTableSchema::cdb_ob_backup_archivelog_progress_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_clean_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_clean_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -490,8 +476,7 @@ int ObInnerTableSchema::cdb_ob_backup_clean_history_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID, JOB_ID AS BS_KEY, START_TIME, END_TIME, INCARNATION, TYPE, STATUS, PARAMETER, ERROR_MSG, COMMENT FROM __all_backup_clean_info_history WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, JOB_ID AS BS_KEY, START_TIME, END_TIME, INCARNATION, TYPE, STATUS, PARAMETER, ERROR_MSG, COMMENT FROM __all_backup_clean_info_history WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -503,17 +488,16 @@ int ObInnerTableSchema::cdb_ob_backup_clean_history_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_task_clean_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_task_clean_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -544,8 +528,7 @@ int ObInnerTableSchema::cdb_ob_backup_task_clean_history_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID, INCARNATION, BACKUP_SET_ID AS BS_KEY, BACKUP_TYPE, PARTITION_COUNT, MACRO_BLOCK_COUNT, FINISH_PARTITION_COUNT, FINISH_MACRO_BLOCK_COUNT, INPUT_BYTES, OUTPUT_BYTES, START_TIME, END_TIME AS COMPLETION_TIME, STATUS FROM __all_backup_task_clean_history WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, INCARNATION, BACKUP_SET_ID AS BS_KEY, BACKUP_TYPE, PARTITION_COUNT, MACRO_BLOCK_COUNT, FINISH_PARTITION_COUNT, FINISH_MACRO_BLOCK_COUNT, INPUT_BYTES, OUTPUT_BYTES, START_TIME, END_TIME AS COMPLETION_TIME, STATUS FROM __all_backup_task_clean_history WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -557,17 +540,16 @@ int ObInnerTableSchema::cdb_ob_backup_task_clean_history_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_restore_progress_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_restore_progress_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -598,8 +580,7 @@ int ObInnerTableSchema::cdb_ob_restore_progress_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT JOB_ID, EXTERNAL_JOB_ID, TENANT_ID, TENANT_NAME, BACKUP_TENANT_ID, BACKUP_TENANT_NAME, BACKUP_CLUSTER_ID, BACKUP_CLUSTER_NAME, STATUS, START_TIME, COMPLETION_TIME, PARTITION_COUNT, MACRO_BLOCK_COUNT, FINISH_PARTITION_COUNT, FINISH_MACRO_BLOCK_COUNT, RESTORE_START_TIMESTAMP, RESTORE_FINISH_TIMESTAMP, RESTORE_CURRENT_TIMESTAMP, INFO FROM __all_restore_progress )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT JOB_ID, EXTERNAL_JOB_ID, TENANT_ID, TENANT_NAME, BACKUP_TENANT_ID, BACKUP_TENANT_NAME, BACKUP_CLUSTER_ID, BACKUP_CLUSTER_NAME, STATUS, START_TIME, COMPLETION_TIME, PARTITION_COUNT, MACRO_BLOCK_COUNT, FINISH_PARTITION_COUNT, FINISH_MACRO_BLOCK_COUNT, RESTORE_START_TIMESTAMP, RESTORE_FINISH_TIMESTAMP, RESTORE_CURRENT_TIMESTAMP, INFO FROM __all_restore_progress )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -611,17 +592,16 @@ int ObInnerTableSchema::cdb_ob_restore_progress_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_restore_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_restore_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -652,8 +632,7 @@ int ObInnerTableSchema::cdb_ob_restore_history_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT JOB_ID, EXTERNAL_JOB_ID, TENANT_ID, TENANT_NAME, BACKUP_TENANT_ID, BACKUP_TENANT_NAME, BACKUP_CLUSTER_ID, BACKUP_CLUSTER_NAME, STATUS, START_TIME, COMPLETION_TIME, PARTITION_COUNT, MACRO_BLOCK_COUNT, FINISH_PARTITION_COUNT, FINISH_MACRO_BLOCK_COUNT, RESTORE_START_TIMESTAMP, RESTORE_FINISH_TIMESTAMP, RESTORE_CURRENT_TIMESTAMP, INFO FROM __all_restore_history )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT JOB_ID, EXTERNAL_JOB_ID, TENANT_ID, TENANT_NAME, BACKUP_TENANT_ID, BACKUP_TENANT_NAME, BACKUP_CLUSTER_ID, BACKUP_CLUSTER_NAME, STATUS, START_TIME, COMPLETION_TIME, PARTITION_COUNT, MACRO_BLOCK_COUNT, FINISH_PARTITION_COUNT, FINISH_MACRO_BLOCK_COUNT, RESTORE_START_TIMESTAMP, RESTORE_FINISH_TIMESTAMP, RESTORE_CURRENT_TIMESTAMP, INFO FROM __all_restore_history )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -665,17 +644,16 @@ int ObInnerTableSchema::cdb_ob_restore_history_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_server_schema_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_server_schema_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -706,8 +684,7 @@ int ObInnerTableSchema::gv_server_schema_info_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SVR_IP, SVR_PORT, TENANT_ID, REFRESHED_SCHEMA_VERSION, RECEIVED_SCHEMA_VERSION, SCHEMA_COUNT, SCHEMA_SIZE, MIN_SSTABLE_SCHEMA_VERSION FROM oceanbase.__all_virtual_server_schema_info WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SVR_IP, SVR_PORT, TENANT_ID, REFRESHED_SCHEMA_VERSION, RECEIVED_SCHEMA_VERSION, SCHEMA_COUNT, SCHEMA_SIZE, MIN_SSTABLE_SCHEMA_VERSION FROM oceanbase.__all_virtual_server_schema_info WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -719,17 +696,16 @@ int ObInnerTableSchema::gv_server_schema_info_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_server_schema_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_server_schema_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -760,8 +736,7 @@ int ObInnerTableSchema::v_server_schema_info_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID, REFRESHED_SCHEMA_VERSION, RECEIVED_SCHEMA_VERSION, SCHEMA_COUNT, SCHEMA_SIZE, MIN_SSTABLE_SCHEMA_VERSION FROM oceanbase.__all_virtual_server_schema_info WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() AND effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, REFRESHED_SCHEMA_VERSION, RECEIVED_SCHEMA_VERSION, SCHEMA_COUNT, SCHEMA_SIZE, MIN_SSTABLE_SCHEMA_VERSION FROM oceanbase.__all_virtual_server_schema_info WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() AND effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -773,17 +748,16 @@ int ObInnerTableSchema::v_server_schema_info_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ckpt_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ckpt_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -814,8 +788,7 @@ int ObInnerTableSchema::cdb_ckpt_history_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT A.SVR_IP AS SVR_IP, A.SVR_PORT AS SVR_PORT, A.VALUE1 AS TENANT_ID, A.VALUE2 AS CHECKPOINT_SNAPSHOT, A.VALUE3 AS CHECKPOINT_TYPE, A.VALUE4 AS CHECKPOINT_CLUSTER_VERSION, A.GMT_CREATE AS START_TIME, B.GMT_CREATE AS FINISH_TIME FROM (SELECT SVR_IP, SVR_PORT, EVENT, VALUE1, VALUE2, VALUE3, VALUE4, GMT_CREATE FROM OCEANBASE.__ALL_SERVER_EVENT_HISTORY WHERE (EVENT = 'minor merge start' OR EVENT = 'write checkpoint start') AND (EFFECTIVE_TENANT_ID() = 1 OR VALUE1 = EFFECTIVE_TENANT_ID())) A LEFT JOIN (SELECT SVR_IP, SVR_PORT, EVENT, VALUE1, VALUE2, GMT_CREATE FROM OCEANBASE.__ALL_SERVER_EVENT_HISTORY WHERE (EVENT = 'minor merge finish' OR EVENT = 'write checkpoint finish') AND (EFFECTIVE_TENANT_ID() = 1 OR VALUE1 = EFFECTIVE_TENANT_ID())) B ON A.SVR_IP = B.SVR_IP AND A.SVR_PORT = B.SVR_PORT AND A.VALUE1 = B.VALUE1 AND A.VALUE2 = B.VALUE2 AND ((A.EVENT = 'minor merge start' AND B.EVENT = 'minor merge finish') OR (A.EVENT = 'write checkpoint start' AND B.EVENT = 'write checkpoint finish')) ORDER BY SVR_IP, SVR_PORT, TENANT_ID, CHECKPOINT_SNAPSHOT )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT A.SVR_IP AS SVR_IP, A.SVR_PORT AS SVR_PORT, A.VALUE1 AS TENANT_ID, A.VALUE2 AS CHECKPOINT_SNAPSHOT, A.VALUE3 AS CHECKPOINT_TYPE, A.VALUE4 AS CHECKPOINT_CLUSTER_VERSION, A.GMT_CREATE AS START_TIME, B.GMT_CREATE AS FINISH_TIME FROM (SELECT SVR_IP, SVR_PORT, EVENT, VALUE1, VALUE2, VALUE3, VALUE4, GMT_CREATE FROM OCEANBASE.__ALL_SERVER_EVENT_HISTORY WHERE (EVENT = 'minor merge start' OR EVENT = 'write checkpoint start') AND (EFFECTIVE_TENANT_ID() = 1 OR VALUE1 = EFFECTIVE_TENANT_ID())) A LEFT JOIN (SELECT SVR_IP, SVR_PORT, EVENT, VALUE1, VALUE2, GMT_CREATE FROM OCEANBASE.__ALL_SERVER_EVENT_HISTORY WHERE (EVENT = 'minor merge finish' OR EVENT = 'write checkpoint finish') AND (EFFECTIVE_TENANT_ID() = 1 OR VALUE1 = EFFECTIVE_TENANT_ID())) B ON A.SVR_IP = B.SVR_IP AND A.SVR_PORT = B.SVR_PORT AND A.VALUE1 = B.VALUE1 AND A.VALUE2 = B.VALUE2 AND ((A.EVENT = 'minor merge start' AND B.EVENT = 'minor merge finish') OR (A.EVENT = 'write checkpoint start' AND B.EVENT = 'write checkpoint finish')) ORDER BY SVR_IP, SVR_PORT, TENANT_ID, CHECKPOINT_SNAPSHOT )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -827,17 +800,16 @@ int ObInnerTableSchema::cdb_ckpt_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_ob_trans_table_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_ob_trans_table_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -868,8 +840,7 @@ int ObInnerTableSchema::gv_ob_trans_table_status_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SVR_IP, SVR_PORT, TENANT_ID, TABLE_ID, PARTITION_ID, END_LOG_ID, TRANS_CNT FROM oceanbase.__all_virtual_trans_table_status WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SVR_IP, SVR_PORT, TENANT_ID, TABLE_ID, PARTITION_ID, END_LOG_ID, TRANS_CNT FROM oceanbase.__all_virtual_trans_table_status WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -881,17 +852,16 @@ int ObInnerTableSchema::gv_ob_trans_table_status_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_ob_trans_table_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_ob_trans_table_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -922,8 +892,7 @@ int ObInnerTableSchema::v_ob_trans_table_status_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TABLE_ID, PARTITION_ID, END_LOG_ID, TRANS_CNT FROM oceanbase.__all_virtual_trans_table_status WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() AND effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TABLE_ID, PARTITION_ID, END_LOG_ID, TRANS_CNT FROM oceanbase.__all_virtual_trans_table_status WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() AND effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -935,17 +904,16 @@ int ObInnerTableSchema::v_ob_trans_table_status_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sql_monitor_statname_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sql_monitor_statname_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -976,8 +944,7 @@ int ObInnerTableSchema::v_sql_monitor_statname_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT NULL CON_ID, ID, GROUP_ID, NAME, DESCRIPTION, 0 TYPE, 0 FLAGS FROM oceanbase.__all_virtual_sql_monitor_statname )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT NULL CON_ID, ID, GROUP_ID, NAME, DESCRIPTION, 0 TYPE, 0 FLAGS FROM oceanbase.__all_virtual_sql_monitor_statname )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -989,17 +956,16 @@ int ObInnerTableSchema::v_sql_monitor_statname_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_merge_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_merge_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1030,8 +996,7 @@ int ObInnerTableSchema::gv_merge_info_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SVR_IP, SVR_PORT, TENANT_ID, TABLE_ID, PARTITION_ID, CASE MERGE_TYPE WHEN 'MAJOR MERGE' THEN 'major' ELSE 'minor' END AS TYPE, MERGE_TYPE AS ACTION, CASE MERGE_TYPE WHEN 'MAJOR MERGE' THEN VERSION ELSE SNAPSHOT_VERSION END AS VERSION, USEC_TO_TIME(MERGE_START_TIME) AS START_TIME, USEC_TO_TIME(MERGE_FINISH_TIME) AS END_TIME, MACRO_BLOCK_COUNT, CASE MACRO_BLOCK_COUNT WHEN 0 THEN 0.00 ELSE ROUND(USE_OLD_MACRO_BLOCK_COUNT/MACRO_BLOCK_COUNT*100, 2) END AS REUSE_PCT, TOTAL_CHILD_TASK AS PARALLEL_DEGREE FROM __ALL_VIRTUAL_PARTITION_SSTABLE_MERGE_INFO WHERE EFFECTIVE_TENANT_ID() = 1 OR tenant_id = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SVR_IP, SVR_PORT, TENANT_ID, TABLE_ID, PARTITION_ID, CASE MERGE_TYPE WHEN 'MAJOR MERGE' THEN 'major' ELSE 'minor' END AS TYPE, MERGE_TYPE AS ACTION, CASE MERGE_TYPE WHEN 'MAJOR MERGE' THEN VERSION ELSE SNAPSHOT_VERSION END AS VERSION, USEC_TO_TIME(MERGE_START_TIME) AS START_TIME, USEC_TO_TIME(MERGE_FINISH_TIME) AS END_TIME, MACRO_BLOCK_COUNT, CASE MACRO_BLOCK_COUNT WHEN 0 THEN 0.00 ELSE ROUND(USE_OLD_MACRO_BLOCK_COUNT/MACRO_BLOCK_COUNT*100, 2) END AS REUSE_PCT, TOTAL_CHILD_TASK AS PARALLEL_DEGREE FROM __ALL_VIRTUAL_PARTITION_SSTABLE_MERGE_INFO WHERE EFFECTIVE_TENANT_ID() = 1 OR tenant_id = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1043,17 +1008,16 @@ int ObInnerTableSchema::gv_merge_info_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_merge_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_merge_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1084,8 +1048,7 @@ int ObInnerTableSchema::v_merge_info_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * FROM OCEANBASE.gv$merge_info WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM OCEANBASE.gv$merge_info WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1097,17 +1060,16 @@ int ObInnerTableSchema::v_merge_info_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_lock_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_lock_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1138,8 +1100,7 @@ int ObInnerTableSchema::gv_lock_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT distinct a.svr_ip AS SVR_IP, a.svr_port AS SVR_PORT, a.table_id AS TABLE_ID, a.rowkey AS ADDR, b.row_lock_addr AS KADDR, b.session_id AS SID, a.type AS TYPE, a.lock_mode AS LMODE, CAST(NULL AS SIGNED) AS REQUEST, a.time_after_recv AS CTIME, a.block_session_id AS BLOCK, (a.table_id >> 40) AS CON_ID FROM __all_virtual_lock_wait_stat a JOIN __all_virtual_trans_lock_stat b ON a.svr_ip = b.svr_ip and a.svr_port = b.svr_port and a.table_id = b.table_id and substr(a.rowkey, 1, 512) = substr(b.rowkey, 1, 512) where ((a.table_id >> 40) = effective_tenant_id() or effective_tenant_id() = 1) and a.session_id = a.block_session_id )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT distinct a.svr_ip AS SVR_IP, a.svr_port AS SVR_PORT, a.table_id AS TABLE_ID, a.rowkey AS ADDR, b.row_lock_addr AS KADDR, b.session_id AS SID, a.type AS TYPE, a.lock_mode AS LMODE, CAST(NULL AS SIGNED) AS REQUEST, a.time_after_recv AS CTIME, a.block_session_id AS BLOCK, (a.table_id >> 40) AS CON_ID FROM __all_virtual_lock_wait_stat a JOIN __all_virtual_trans_lock_stat b ON a.svr_ip = b.svr_ip and a.svr_port = b.svr_port and a.table_id = b.table_id and substr(a.rowkey, 1, 512) = substr(b.rowkey, 1, 512) where ((a.table_id >> 40) = effective_tenant_id() or effective_tenant_id() = 1) and a.session_id = a.block_session_id )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1151,17 +1112,16 @@ int ObInnerTableSchema::gv_lock_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_lock_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_lock_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1192,8 +1152,7 @@ int ObInnerTableSchema::v_lock_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TABLE_ID, ADDR, KADDR, SID, TYPE, LMODE, REQUEST, CTIME, BLOCK, CON_ID FROM gv$lock WHERE svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TABLE_ID, ADDR, KADDR, SID, TYPE, LMODE, REQUEST, CTIME, BLOCK, CON_ID FROM gv$lock WHERE svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1205,17 +1164,16 @@ int ObInnerTableSchema::v_lock_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_validation_job_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_validation_job_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1246,8 +1204,7 @@ int ObInnerTableSchema::cdb_ob_backup_validation_job_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT JOB_ID, TENANT_ID, TENANT_NAME, INCARNATION, BACKUP_SET_ID, PROGRESS_PERCENT, STATUS FROM __all_backup_validation_job )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT JOB_ID, TENANT_ID, TENANT_NAME, INCARNATION, BACKUP_SET_ID, PROGRESS_PERCENT, STATUS FROM __all_backup_validation_job )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1259,17 +1216,16 @@ int ObInnerTableSchema::cdb_ob_backup_validation_job_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_validation_job_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_validation_job_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1300,8 +1256,7 @@ int ObInnerTableSchema::cdb_ob_backup_validation_job_history_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT JOB_ID, TENANT_ID, TENANT_NAME, INCARNATION, BACKUP_SET_ID, PROGRESS_PERCENT, STATUS FROM __all_backup_validation_job_history )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT JOB_ID, TENANT_ID, TENANT_NAME, INCARNATION, BACKUP_SET_ID, PROGRESS_PERCENT, STATUS FROM __all_backup_validation_job_history )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1313,17 +1268,16 @@ int ObInnerTableSchema::cdb_ob_backup_validation_job_history_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_tenant_backup_validation_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_tenant_backup_validation_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1354,8 +1308,7 @@ int ObInnerTableSchema::cdb_ob_tenant_backup_validation_task_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT JOB_ID, TASK_ID, TENANT_ID, INCARNATION, BACKUP_SET_ID, STATUS, BACKUP_DEST, START_TIME, END_TIME, TOTAL_PG_COUNT, FINISH_PG_COUNT, TOTAL_PARTITION_COUNT, FINISH_PARTITION_COUNT, TOTAL_MACRO_BLOCK_COUNT, FINISH_MACRO_BLOCK_COUNT, LOG_SIZE FROM __all_virtual_backup_validation_task WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT JOB_ID, TASK_ID, TENANT_ID, INCARNATION, BACKUP_SET_ID, STATUS, BACKUP_DEST, START_TIME, END_TIME, TOTAL_PG_COUNT, FINISH_PG_COUNT, TOTAL_PARTITION_COUNT, FINISH_PARTITION_COUNT, TOTAL_MACRO_BLOCK_COUNT, FINISH_MACRO_BLOCK_COUNT, LOG_SIZE FROM __all_virtual_backup_validation_task WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1367,17 +1320,16 @@ int ObInnerTableSchema::cdb_ob_tenant_backup_validation_task_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_validation_task_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_validation_task_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1408,8 +1360,7 @@ int ObInnerTableSchema::cdb_ob_backup_validation_task_history_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT JOB_ID, TASK_ID, TENANT_ID, INCARNATION, BACKUP_SET_ID, STATUS, BACKUP_DEST, START_TIME, END_TIME, TOTAL_PG_COUNT, FINISH_PG_COUNT, TOTAL_PARTITION_COUNT, FINISH_PARTITION_COUNT, TOTAL_MACRO_BLOCK_COUNT, FINISH_MACRO_BLOCK_COUNT, LOG_SIZE FROM __all_backup_validation_task_history )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT JOB_ID, TASK_ID, TENANT_ID, INCARNATION, BACKUP_SET_ID, STATUS, BACKUP_DEST, START_TIME, END_TIME, TOTAL_PG_COUNT, FINISH_PG_COUNT, TOTAL_PARTITION_COUNT, FINISH_PARTITION_COUNT, TOTAL_MACRO_BLOCK_COUNT, FINISH_MACRO_BLOCK_COUNT, LOG_SIZE FROM __all_backup_validation_task_history )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1421,17 +1372,16 @@ int ObInnerTableSchema::cdb_ob_backup_validation_task_history_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_restore_point_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_restore_point_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1462,8 +1412,7 @@ int ObInnerTableSchema::v_restore_point_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID, SNAPSHOT_TS as SNAPSHOT, GMT_CREATE as TIME, EXTRA_INFO as NAME FROM oceanbase.__all_acquired_snapshot WHERE snapshot_type = 3 and (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, SNAPSHOT_TS as SNAPSHOT, GMT_CREATE as TIME, EXTRA_INFO as NAME FROM oceanbase.__all_acquired_snapshot WHERE snapshot_type = 3 and (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1475,17 +1424,16 @@ int ObInnerTableSchema::v_restore_point_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_set_obsolete_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_set_obsolete_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1516,8 +1464,7 @@ int ObInnerTableSchema::cdb_ob_backup_set_obsolete_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL( - table_schema.set_view_definition(R"__( SELECT INCARNATION, TENANT_ID, BACKUP_SET_ID AS BS_KEY, BACKUP_TYPE, ENCRYPTION_MODE, START_TIME, END_TIME AS COMPLETION_TIME, ROUND((END_TIME - START_TIME)/1000/1000,0) AS ELAPSED_SECONDES, 'NO' AS KEEP, '' AS KEEP_UNTIL, DEVICE_TYPE, 'NO' AS COMPRESSED, OUTPUT_BYTES, OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000) AS OUTPUT_RATE_BYTES, ROUND(OUTPUT_BYTES / INPUT_BYTES, 2) AS COMPRESSION_RATIO, CASE WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN OUTPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN OUTPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB') END AS OUTPUT_BYTES_DISPLAY, CASE WHEN OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000) >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000)/1024/1024/1024,2), 'GB/S') ELSE CONCAT(ROUND(OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000)/1024/1024,2), 'MB/S') END AS OUTPUT_RATE_BYTES_DISPLAY, TIMEDIFF(END_TIME, START_TIME) AS TIME_TAKEN_DISPLAY, CASE WHEN IS_MARK_DELETED = 1 THEN 'DELETING' WHEN RESULT != 0 THEN 'FAILED' ELSE 'COMPLETED' END AS STATUS FROM __all_virtual_backupset_history_mgr WHERE backup_recovery_window > 0 and (backup_recovery_window + snapshot_version <= time_to_usec(now(6))) and (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT INCARNATION, TENANT_ID, BACKUP_SET_ID AS BS_KEY, BACKUP_TYPE, ENCRYPTION_MODE, START_TIME, END_TIME AS COMPLETION_TIME, ROUND((END_TIME - START_TIME)/1000/1000,0) AS ELAPSED_SECONDES, 'NO' AS KEEP, '' AS KEEP_UNTIL, DEVICE_TYPE, 'NO' AS COMPRESSED, OUTPUT_BYTES, OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000) AS OUTPUT_RATE_BYTES, ROUND(OUTPUT_BYTES / INPUT_BYTES, 2) AS COMPRESSION_RATIO, CASE WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN OUTPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN OUTPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB') END AS OUTPUT_BYTES_DISPLAY, CASE WHEN OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000) >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000)/1024/1024/1024,2), 'GB/S') ELSE CONCAT(ROUND(OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000)/1024/1024,2), 'MB/S') END AS OUTPUT_RATE_BYTES_DISPLAY, TIMEDIFF(END_TIME, START_TIME) AS TIME_TAKEN_DISPLAY, CASE WHEN IS_MARK_DELETED = 1 THEN 'DELETING' WHEN RESULT != 0 THEN 'FAILED' ELSE 'COMPLETED' END AS STATUS FROM __all_virtual_backupset_history_mgr WHERE backup_recovery_window > 0 and (backup_recovery_window + snapshot_version <= time_to_usec(now(6))) and (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1529,17 +1476,16 @@ int ObInnerTableSchema::cdb_ob_backup_set_obsolete_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_backupset_job_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_backupset_job_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1570,8 +1516,7 @@ int ObInnerTableSchema::cdb_ob_backup_backupset_job_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT JOB_ID, TENANT_ID, INCARNATION, BACKUP_SET_ID, CASE WHEN BACKUP_BACKUPSET_TYPE = 'A' THEN 'ALL_BACKUP_SET' WHEN BACKUP_BACKUPSET_TYPE = 'S' THEN 'SINGLE_BACKUP_SET' ELSE 'UNKNOWN' END AS TYPE, TENANT_NAME, STATUS FROM __all_backup_backupset_job )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT JOB_ID, TENANT_ID, INCARNATION, BACKUP_SET_ID, CASE WHEN BACKUP_BACKUPSET_TYPE = 'A' THEN 'ALL_BACKUP_SET' WHEN BACKUP_BACKUPSET_TYPE = 'S' THEN 'SINGLE_BACKUP_SET' ELSE 'UNKNOWN' END AS TYPE, TENANT_NAME, STATUS FROM __all_backup_backupset_job )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1583,17 +1528,16 @@ int ObInnerTableSchema::cdb_ob_backup_backupset_job_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_backupset_job_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_backupset_job_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1624,8 +1568,7 @@ int ObInnerTableSchema::cdb_ob_backup_backupset_job_history_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT JOB_ID, TENANT_ID, INCARNATION, BACKUP_SET_ID, CASE WHEN BACKUP_BACKUPSET_TYPE = 'A' THEN 'ALL_BACKUP_SET' WHEN BACKUP_BACKUPSET_TYPE = 'S' THEN 'SINGLE_BACKUP_SET' ELSE 'UNKNOWN' END AS TYPE, TENANT_NAME, STATUS FROM __all_backup_backupset_job_history )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT JOB_ID, TENANT_ID, INCARNATION, BACKUP_SET_ID, CASE WHEN BACKUP_BACKUPSET_TYPE = 'A' THEN 'ALL_BACKUP_SET' WHEN BACKUP_BACKUPSET_TYPE = 'S' THEN 'SINGLE_BACKUP_SET' ELSE 'UNKNOWN' END AS TYPE, TENANT_NAME, STATUS FROM __all_backup_backupset_job_history )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1637,17 +1580,16 @@ int ObInnerTableSchema::cdb_ob_backup_backupset_job_history_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_backupset_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_backupset_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1678,8 +1620,7 @@ int ObInnerTableSchema::cdb_ob_backup_backupset_task_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT INCARNATION, BACKUP_SET_ID AS BS_KEY, COPY_ID, BACKUP_TYPE, TENANT_ID, TOTAL_PG_COUNT, FINISH_PG_COUNT, TOTAL_PARTITION_COUNT, TOTAL_MACRO_BLOCK_COUNT, FINISH_PARTITION_COUNT, FINISH_MACRO_BLOCK_COUNT, INPUT_BYTES, OUTPUT_BYTES, START_TIME, END_TIME AS COMPLETION_TIME, CASE WHEN STATUS = 'FINISH' AND RESULT != 0 THEN 'FAILED' WHEN STATUS = 'FINISH' AND RESULT = 0 THEN 'COMPLETED' ELSE 'RUNNING' END AS STATUS FROM __all_virtual_backup_backupset_task WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT INCARNATION, BACKUP_SET_ID AS BS_KEY, COPY_ID, BACKUP_TYPE, TENANT_ID, TOTAL_PG_COUNT, FINISH_PG_COUNT, TOTAL_PARTITION_COUNT, TOTAL_MACRO_BLOCK_COUNT, FINISH_PARTITION_COUNT, FINISH_MACRO_BLOCK_COUNT, INPUT_BYTES, OUTPUT_BYTES, START_TIME, END_TIME AS COMPLETION_TIME, CASE WHEN STATUS = 'FINISH' AND RESULT != 0 THEN 'FAILED' WHEN STATUS = 'FINISH' AND RESULT = 0 THEN 'COMPLETED' ELSE 'RUNNING' END AS STATUS FROM __all_virtual_backup_backupset_task WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1691,17 +1632,16 @@ int ObInnerTableSchema::cdb_ob_backup_backupset_task_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_backupset_task_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_backupset_task_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1732,8 +1672,7 @@ int ObInnerTableSchema::cdb_ob_backup_backupset_task_history_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT INCARNATION, TENANT_ID, BACKUP_SET_ID AS BS_KEY, COPY_ID, BACKUP_TYPE, ENCRYPTION_MODE, START_TIME, END_TIME AS COMPLETION_TIME, ROUND((END_TIME - START_TIME)/1000/1000,0) AS ELAPSED_SECONDES, 'NO' AS KEEP, '' AS KEEP_UNTIL, SRC_DEVICE_TYPE, DST_DEVICE_TYPE, 'NO' AS COMPRESSED, OUTPUT_BYTES, OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000) AS OUTPUT_RATE_BYTES, ROUND(OUTPUT_BYTES / INPUT_BYTES, 2) AS COMPRESSION_RATIO, CASE WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN OUTPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN OUTPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB') END AS OUTPUT_BYTES_DISPLAY, CASE WHEN OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000) >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000)/1024/1024/1024,2), 'GB/S') ELSE CONCAT(ROUND(OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000)/1024/1024,2), 'MB/S') END AS OUTPUT_RATE_BYTES_DISPLAY, TIMEDIFF(END_TIME, START_TIME) AS TIME_TAKEN_DISPLAY, CASE WHEN IS_MARK_DELETED = 1 THEN 'DELETING' WHEN RESULT != 0 THEN 'FAILED' ELSE 'COMPLETED' END AS STATUS FROM __all_backup_backupset_task_history WHERE status = 'FINISH' and (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT INCARNATION, TENANT_ID, BACKUP_SET_ID AS BS_KEY, COPY_ID, BACKUP_TYPE, ENCRYPTION_MODE, START_TIME, END_TIME AS COMPLETION_TIME, ROUND((END_TIME - START_TIME)/1000/1000,0) AS ELAPSED_SECONDES, 'NO' AS KEEP, '' AS KEEP_UNTIL, SRC_DEVICE_TYPE, DST_DEVICE_TYPE, 'NO' AS COMPRESSED, OUTPUT_BYTES, OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000) AS OUTPUT_RATE_BYTES, ROUND(OUTPUT_BYTES / INPUT_BYTES, 2) AS COMPRESSION_RATIO, CASE WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN OUTPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN OUTPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB') END AS OUTPUT_BYTES_DISPLAY, CASE WHEN OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000) >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000)/1024/1024/1024,2), 'GB/S') ELSE CONCAT(ROUND(OUTPUT_BYTES / ((END_TIME - START_TIME)/1000/1000)/1024/1024,2), 'MB/S') END AS OUTPUT_RATE_BYTES_DISPLAY, TIMEDIFF(END_TIME, START_TIME) AS TIME_TAKEN_DISPLAY, CASE WHEN IS_MARK_DELETED = 1 THEN 'DELETING' WHEN RESULT != 0 THEN 'FAILED' ELSE 'COMPLETED' END AS STATUS FROM __all_backup_backupset_task_history WHERE status = 'FINISH' and (effective_tenant_id() = 1 OR tenant_id = effective_tenant_id()) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1745,17 +1684,16 @@ int ObInnerTableSchema::cdb_ob_backup_backupset_task_history_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::cdb_ob_backup_backup_archivelog_summary_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::cdb_ob_backup_backup_archivelog_summary_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1786,8 +1724,7 @@ int ObInnerTableSchema::cdb_ob_backup_backup_archivelog_summary_schema(ObTableSc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT INCARNATION, LOG_ARCHIVE_ROUND, COPY_ID, TENANT_ID, STATUS, MIN_FIRST_TIME, MAX_NEXT_TIME, INPUT_BYTES, OUTPUT_BYTES, ROUND(OUTPUT_BYTES / INPUT_BYTES, 2) AS COMPRESSION_RATIO, CASE WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN INPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN INPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB') END AS INPUT_BYTES_DISPLAY, CASE WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN OUTPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN OUTPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB') END AS OUTPUT_BYTES_DISPLAY FROM ( select tenant_id, incarnation, log_archive_round, copy_id, min_first_time, max_next_time, input_bytes, output_bytes, deleted_input_bytes, deleted_output_bytes, pg_count, 'STOP' as status from __all_backup_backup_log_archive_status_history where effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() union select tenant_id, incarnation, log_archive_round, copy_id, min_first_time, max_next_time, input_bytes, output_bytes, deleted_input_bytes, deleted_output_bytes, pg_count, status from __all_virtual_backup_backup_log_archive_status where effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() and status != 'STOP'); )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT INCARNATION, LOG_ARCHIVE_ROUND, COPY_ID, TENANT_ID, STATUS, MIN_FIRST_TIME, MAX_NEXT_TIME, INPUT_BYTES, OUTPUT_BYTES, ROUND(OUTPUT_BYTES / INPUT_BYTES, 2) AS COMPRESSION_RATIO, CASE WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN INPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN INPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB') END AS INPUT_BYTES_DISPLAY, CASE WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB') WHEN OUTPUT_BYTES >= 1024*1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB') WHEN OUTPUT_BYTES >= 1024*1024*1024 THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB') ELSE CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB') END AS OUTPUT_BYTES_DISPLAY FROM ( select tenant_id, incarnation, log_archive_round, copy_id, min_first_time, max_next_time, input_bytes, output_bytes, deleted_input_bytes, deleted_output_bytes, pg_count, 'STOP' as status from __all_backup_backup_log_archive_status_history where effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() union select tenant_id, incarnation, log_archive_round, copy_id, min_first_time, max_next_time, input_bytes, output_bytes, deleted_input_bytes, deleted_output_bytes, pg_count, status from __all_virtual_backup_backup_log_archive_status where effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() and status != 'STOP'); )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1799,10 +1736,10 @@ int ObInnerTableSchema::cdb_ob_backup_backup_archivelog_summary_schema(ObTableSc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.25001_25050.cpp b/src/share/inner_table/ob_inner_table_schema.25001_25050.cpp index 6fba68dac..437539aa9 100644 --- a/src/share/inner_table/ob_inner_table_schema.25001_25050.cpp +++ b/src/share/inner_table/ob_inner_table_schema.25001_25050.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::dba_synonyms_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_synonyms_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -58,8 +60,7 @@ int ObInnerTableSchema::dba_synonyms_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CASE WHEN A.DATABASE_NAME = '__public' THEN 'PUBLIC' ELSE A.DATABASE_NAME END AS OWNER, A.SYNONYM_NAME AS SYNONYM_NAME, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN B.DATABASE_NAME ELSE SUBSTR(A.OBJECT_NAME, 1, INSTR(A.OBJECT_NAME, '.') -1) END AS VARCHAR2(128)) AS TABLE_OWNER, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN A.OBJECT_NAME ELSE SUBSTR(A.OBJECT_NAME, INSTR(A.OBJECT_NAME, '.') + 1, INSTR(A.OBJECT_NAME, '@') - INSTR(A.OBJECT_NAME, '.') -1) END AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN NULL ELSE SUBSTR(A.OBJECT_NAME, INSTR(A.OBJECT_NAME, '@')+1) END AS VARCHAR2(128)) AS DB_LINK FROM (SELECT BB.DATABASE_NAME, AA.SYNONYM_NAME, AA.OBJECT_NAME, AA.SYNONYM_ID FROM SYS.ALL_VIRTUAL_SYNONYM_REAL_AGENT AA, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT BB WHERE AA.DATABASE_ID = BB.DATABASE_ID AND AA.TENANT_ID = EFFECTIVE_TENANT_ID() AND BB.TENANT_ID = EFFECTIVE_TENANT_ID()) A, (SELECT BB.DATABASE_NAME, AA.SYNONYM_ID FROM SYS.ALL_VIRTUAL_SYNONYM_REAL_AGENT AA, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT BB WHERE AA.OBJECT_DATABASE_ID = BB.DATABASE_ID AND AA.TENANT_ID = EFFECTIVE_TENANT_ID() AND BB.TENANT_ID = EFFECTIVE_TENANT_ID()) B WHERE A.SYNONYM_ID = B.SYNONYM_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CASE WHEN A.DATABASE_NAME = '__public' THEN 'PUBLIC' ELSE A.DATABASE_NAME END AS OWNER, A.SYNONYM_NAME AS SYNONYM_NAME, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN B.DATABASE_NAME ELSE SUBSTR(A.OBJECT_NAME, 1, INSTR(A.OBJECT_NAME, '.') -1) END AS VARCHAR2(128)) AS TABLE_OWNER, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN A.OBJECT_NAME ELSE SUBSTR(A.OBJECT_NAME, INSTR(A.OBJECT_NAME, '.') + 1, INSTR(A.OBJECT_NAME, '@') - INSTR(A.OBJECT_NAME, '.') -1) END AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN NULL ELSE SUBSTR(A.OBJECT_NAME, INSTR(A.OBJECT_NAME, '@')+1) END AS VARCHAR2(128)) AS DB_LINK FROM (SELECT BB.DATABASE_NAME, AA.SYNONYM_NAME, AA.OBJECT_NAME, AA.SYNONYM_ID FROM SYS.ALL_VIRTUAL_SYNONYM_REAL_AGENT AA, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT BB WHERE AA.DATABASE_ID = BB.DATABASE_ID AND AA.TENANT_ID = EFFECTIVE_TENANT_ID() AND BB.TENANT_ID = EFFECTIVE_TENANT_ID()) A, (SELECT BB.DATABASE_NAME, AA.SYNONYM_ID FROM SYS.ALL_VIRTUAL_SYNONYM_REAL_AGENT AA, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT BB WHERE AA.OBJECT_DATABASE_ID = BB.DATABASE_ID AND AA.TENANT_ID = EFFECTIVE_TENANT_ID() AND BB.TENANT_ID = EFFECTIVE_TENANT_ID()) B WHERE A.SYNONYM_ID = B.SYNONYM_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -71,17 +72,16 @@ int ObInnerTableSchema::dba_synonyms_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_objects_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_objects_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -112,8 +112,7 @@ int ObInnerTableSchema::dba_objects_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT B.DATABASE_NAME AS OWNER ,CAST((CASE WHEN B.DATABASE_NAME = '__recyclebin' THEN A.OBJECT_NAME WHEN A.OBJECT_TYPE = 'INDEX' THEN SUBSTR(A.OBJECT_NAME, 7 + INSTR(SUBSTR(A.OBJECT_NAME, 7), '_')) ELSE A.OBJECT_NAME END) AS VARCHAR2(128)) AS OBJECT_NAME ,CAST(A.SUBOBJECT_NAME AS VARCHAR2(128)) AS SUBOBJECT_NAME ,A.OBJECT_ID AS OBJECT_ID ,CAST(A.DATA_OBJECT_ID AS NUMBER) AS DATA_OBJECT_ID ,CAST(A.OBJECT_TYPE AS VARCHAR2(23)) AS OBJECT_TYPE ,CAST(A.GMT_CREATE AS DATE) AS CREATED ,CAST(A.GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(A.GMT_CREATE) AS TIMESTAMP ,CAST(A.STATUS AS VARCHAR2(7)) AS STATUS ,CAST(A.TEMPORARY AS VARCHAR2(1)) AS TEMPORARY ,CAST("GENERATED" AS VARCHAR2(1)) AS "GENERATED" ,CAST(A.SECONDARY AS VARCHAR2(1)) AS SECONDARY ,CAST(A.NAMESPACE AS NUMBER) AS NAMESPACE ,CAST(A.EDITION_NAME AS VARCHAR2(128)) AS EDITION_NAME FROM ( SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,TABLE_NAME OBJECT_NAME ,NULL SUBOBJECT_NAME ,TABLE_ID OBJECT_ID ,NULL DATA_OBJECT_ID ,CASE WHEN TABLE_TYPE IN (0,2,3,6,8,9,10) THEN 'TABLE' WHEN TABLE_TYPE IN (1,4) THEN 'VIEW' WHEN TABLE_TYPE IN (5) THEN 'INDEX' WHEN TABLE_TYPE IN (7) THEN 'MATERIALIZED VIEW' ELSE NULL END AS OBJECT_TYPE ,CAST(CASE WHEN TABLE_TYPE IN (5) THEN CASE WHEN INDEX_STATUS = 2 THEN 'VALID' WHEN INDEX_STATUS = 3 THEN 'CHECKING' WHEN INDEX_STATUS = 4 THEN 'INELEGIBLE' WHEN INDEX_STATUS = 5 THEN 'ERROR' ELSE 'UNUSABLE' END ELSE 'VALID' END AS VARCHAR2(10)) AS STATUS ,CASE WHEN TABLE_TYPE IN (6,8,9,10) THEN 'Y' ELSE 'N' END AS TEMPORARY ,CASE WHEN TABLE_TYPE IN (0,1) THEN 'Y' ELSE 'N' END AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT P.GMT_CREATE ,P.GMT_MODIFIED ,T.DATABASE_ID ,T.TABLE_NAME OBJECT_NAME ,P.PART_NAME SUBOBJECT_NAME ,P.PART_ID OBJECT_ID ,CASE WHEN P.PART_IDX != -1 THEN P.PART_ID ELSE NULL END AS DATA_OBJECT_ID ,'TABLE PARTITION' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,CASE WHEN P.PART_IDX != -1 THEN 'Y' ELSE 'N' END AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT P ON T.TABLE_ID = P.TABLE_ID WHERE T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT SUBP.GMT_CREATE ,SUBP.GMT_MODIFIED ,T.DATABASE_ID ,T.TABLE_NAME OBJECT_NAME ,SUBP.SUB_PART_NAME SUBOBJECT_NAME ,SUBP.PART_ID OBJECT_ID ,SUBP.PART_ID AS DATA_OBJECT_ID ,'TABLE SUBPARTITION' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'Y' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_PART_REAL_AGENT P,SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT SUBP WHERE T.TABLE_ID =P.TABLE_ID AND P.TABLE_ID=SUBP.TABLE_ID AND P.PART_ID =SUBP.PART_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() AND SUBP.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT P.GMT_CREATE ,P.GMT_MODIFIED ,P.DATABASE_ID ,P.PACKAGE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,P.PACKAGE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN TYPE = 1 THEN 'PACKAGE' WHEN TYPE = 2 THEN 'PACKAGE BODY' ELSE NULL END AS OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT E WHERE P.TENANT_ID = E.TENANT_ID AND P.PACKAGE_ID = E.OBJ_ID AND (E.OBJ_TYPE = 3 OR E.OBJ_TYPE = 5)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P WHERE P.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT R.GMT_CREATE ,R.GMT_MODIFIED ,R.DATABASE_ID ,R.ROUTINE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,R.ROUTINE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN ROUTINE_TYPE = 1 THEN 'PROCEDURE' WHEN ROUTINE_TYPE = 2 THEN 'FUNCTION' ELSE NULL END AS OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT E WHERE R.TENANT_ID = E.TENANT_ID AND R.ROUTINE_ID = E.OBJ_ID AND (E.OBJ_TYPE = 9 OR E.OBJ_TYPE = 12)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT R WHERE (ROUTINE_TYPE = 1 OR ROUTINE_TYPE = 2) AND R.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT T.GMT_CREATE ,T.GMT_MODIFIED ,T.DATABASE_ID ,T.TRIGGER_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,T.TRIGGER_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TRIGGER' OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_ERROR_AGENT E WHERE T.TENANT_ID = E.TENANT_ID AND T.TRIGGER_ID = E.OBJ_ID AND (E.OBJ_TYPE = 7)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TRIGGER_AGENT T WHERE T.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,SYNONYM_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,SYNONYM_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'SYNONYM' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_SYNONYM_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,SEQUENCE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,SEQUENCE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'SEQUENCE' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,TYPE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,TYPE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TYPE' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,OBJECT_TYPE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TYPE BODY' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_OBJECT_TYPE_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() and TYPE = 2 )A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND B.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT 'SYS' AS OWNER ,TS.TYPE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,TS.TYPE_ID AS OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TYPE' AS OBJECT_TYPE ,CAST(TS.GMT_CREATE AS DATE) AS CREATED ,CAST(TS.GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(TS.GMT_CREATE) AS TIMESTAMP ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY ,0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS UNION ALL SELECT 'SYS' AS OWNER ,PACKAGE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,PACKAGE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN TYPE = 1 THEN 'PACKAGE' WHEN TYPE = 2 THEN 'PACKAGE BODY' ELSE NULL END AS OBJECT_TYPE ,CAST(GMT_CREATE AS DATE) AS CREATED ,CAST(GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(GMT_CREATE) AS TIMESTAMP ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY ,0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_PACKAGE_SYS_AGENT UNION ALL SELECT 'SYS' AS OWNER ,ROUTINE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,ROUTINE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN ROUTINE_TYPE = 1 THEN 'PROCEDURE' WHEN ROUTINE_TYPE = 2 THEN 'FUNCTION' ELSE NULL END AS OBJECT_TYPE ,CAST(GMT_CREATE AS DATE) AS CREATED ,CAST(GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(GMT_CREATE) AS TIMESTAMP ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY ,0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_ROUTINE_SYS_AGENT UNION ALL SELECT 'SYS' AS OWNER ,TRIGGER_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,TRIGGER_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TRIGGER' AS OBJECT_TYPE ,CAST(GMT_CREATE AS DATE) AS CREATED ,CAST(GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(GMT_CREATE) AS TIMESTAMP ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY ,0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT B.DATABASE_NAME AS OWNER ,CAST((CASE WHEN B.DATABASE_NAME = '__recyclebin' THEN A.OBJECT_NAME WHEN A.OBJECT_TYPE = 'INDEX' THEN SUBSTR(A.OBJECT_NAME, 7 + INSTR(SUBSTR(A.OBJECT_NAME, 7), '_')) ELSE A.OBJECT_NAME END) AS VARCHAR2(128)) AS OBJECT_NAME ,CAST(A.SUBOBJECT_NAME AS VARCHAR2(128)) AS SUBOBJECT_NAME ,A.OBJECT_ID AS OBJECT_ID ,CAST(A.DATA_OBJECT_ID AS NUMBER) AS DATA_OBJECT_ID ,CAST(A.OBJECT_TYPE AS VARCHAR2(23)) AS OBJECT_TYPE ,CAST(A.GMT_CREATE AS DATE) AS CREATED ,CAST(A.GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(A.GMT_CREATE) AS TIMESTAMP ,CAST(A.STATUS AS VARCHAR2(7)) AS STATUS ,CAST(A.TEMPORARY AS VARCHAR2(1)) AS TEMPORARY ,CAST("GENERATED" AS VARCHAR2(1)) AS "GENERATED" ,CAST(A.SECONDARY AS VARCHAR2(1)) AS SECONDARY ,CAST(A.NAMESPACE AS NUMBER) AS NAMESPACE ,CAST(A.EDITION_NAME AS VARCHAR2(128)) AS EDITION_NAME FROM ( SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,TABLE_NAME OBJECT_NAME ,NULL SUBOBJECT_NAME ,TABLE_ID OBJECT_ID ,NULL DATA_OBJECT_ID ,CASE WHEN TABLE_TYPE IN (0,2,3,6,8,9,10) THEN 'TABLE' WHEN TABLE_TYPE IN (1,4) THEN 'VIEW' WHEN TABLE_TYPE IN (5) THEN 'INDEX' WHEN TABLE_TYPE IN (7) THEN 'MATERIALIZED VIEW' ELSE NULL END AS OBJECT_TYPE ,CAST(CASE WHEN TABLE_TYPE IN (5) THEN CASE WHEN INDEX_STATUS = 2 THEN 'VALID' WHEN INDEX_STATUS = 3 THEN 'CHECKING' WHEN INDEX_STATUS = 4 THEN 'INELEGIBLE' WHEN INDEX_STATUS = 5 THEN 'ERROR' ELSE 'UNUSABLE' END ELSE 'VALID' END AS VARCHAR2(10)) AS STATUS ,CASE WHEN TABLE_TYPE IN (6,8,9,10) THEN 'Y' ELSE 'N' END AS TEMPORARY ,CASE WHEN TABLE_TYPE IN (0,1) THEN 'Y' ELSE 'N' END AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT P.GMT_CREATE ,P.GMT_MODIFIED ,T.DATABASE_ID ,T.TABLE_NAME OBJECT_NAME ,P.PART_NAME SUBOBJECT_NAME ,P.PART_ID OBJECT_ID ,CASE WHEN P.PART_IDX != -1 THEN P.PART_ID ELSE NULL END AS DATA_OBJECT_ID ,'TABLE PARTITION' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,CASE WHEN P.PART_IDX != -1 THEN 'Y' ELSE 'N' END AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT P ON T.TABLE_ID = P.TABLE_ID WHERE T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT SUBP.GMT_CREATE ,SUBP.GMT_MODIFIED ,T.DATABASE_ID ,T.TABLE_NAME OBJECT_NAME ,SUBP.SUB_PART_NAME SUBOBJECT_NAME ,SUBP.PART_ID OBJECT_ID ,SUBP.PART_ID AS DATA_OBJECT_ID ,'TABLE SUBPARTITION' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'Y' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_PART_REAL_AGENT P,SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT SUBP WHERE T.TABLE_ID =P.TABLE_ID AND P.TABLE_ID=SUBP.TABLE_ID AND P.PART_ID =SUBP.PART_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() AND SUBP.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT P.GMT_CREATE ,P.GMT_MODIFIED ,P.DATABASE_ID ,P.PACKAGE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,P.PACKAGE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN TYPE = 1 THEN 'PACKAGE' WHEN TYPE = 2 THEN 'PACKAGE BODY' ELSE NULL END AS OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT E WHERE P.TENANT_ID = E.TENANT_ID AND P.PACKAGE_ID = E.OBJ_ID AND (E.OBJ_TYPE = 3 OR E.OBJ_TYPE = 5)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P WHERE P.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT R.GMT_CREATE ,R.GMT_MODIFIED ,R.DATABASE_ID ,R.ROUTINE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,R.ROUTINE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN ROUTINE_TYPE = 1 THEN 'PROCEDURE' WHEN ROUTINE_TYPE = 2 THEN 'FUNCTION' ELSE NULL END AS OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT E WHERE R.TENANT_ID = E.TENANT_ID AND R.ROUTINE_ID = E.OBJ_ID AND (E.OBJ_TYPE = 9 OR E.OBJ_TYPE = 12)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT R WHERE (ROUTINE_TYPE = 1 OR ROUTINE_TYPE = 2) AND R.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT T.GMT_CREATE ,T.GMT_MODIFIED ,T.DATABASE_ID ,T.TRIGGER_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,T.TRIGGER_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TRIGGER' OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_ERROR_AGENT E WHERE T.TENANT_ID = E.TENANT_ID AND T.TRIGGER_ID = E.OBJ_ID AND (E.OBJ_TYPE = 7)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TRIGGER_AGENT T WHERE T.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,SYNONYM_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,SYNONYM_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'SYNONYM' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_SYNONYM_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,SEQUENCE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,SEQUENCE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'SEQUENCE' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,TYPE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,TYPE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TYPE' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,OBJECT_TYPE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TYPE BODY' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_OBJECT_TYPE_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() and TYPE = 2 )A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND B.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT 'SYS' AS OWNER ,TS.TYPE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,TS.TYPE_ID AS OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TYPE' AS OBJECT_TYPE ,CAST(TS.GMT_CREATE AS DATE) AS CREATED ,CAST(TS.GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(TS.GMT_CREATE) AS TIMESTAMP ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY ,0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS UNION ALL SELECT 'SYS' AS OWNER ,PACKAGE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,PACKAGE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN TYPE = 1 THEN 'PACKAGE' WHEN TYPE = 2 THEN 'PACKAGE BODY' ELSE NULL END AS OBJECT_TYPE ,CAST(GMT_CREATE AS DATE) AS CREATED ,CAST(GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(GMT_CREATE) AS TIMESTAMP ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY ,0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_PACKAGE_SYS_AGENT UNION ALL SELECT 'SYS' AS OWNER ,ROUTINE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,ROUTINE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN ROUTINE_TYPE = 1 THEN 'PROCEDURE' WHEN ROUTINE_TYPE = 2 THEN 'FUNCTION' ELSE NULL END AS OBJECT_TYPE ,CAST(GMT_CREATE AS DATE) AS CREATED ,CAST(GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(GMT_CREATE) AS TIMESTAMP ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY ,0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_ROUTINE_SYS_AGENT UNION ALL SELECT 'SYS' AS OWNER ,TRIGGER_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,TRIGGER_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TRIGGER' AS OBJECT_TYPE ,CAST(GMT_CREATE AS DATE) AS CREATED ,CAST(GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(GMT_CREATE) AS TIMESTAMP ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY ,0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -125,17 +124,16 @@ int ObInnerTableSchema::dba_objects_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_objects_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_objects_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -166,8 +164,7 @@ int ObInnerTableSchema::all_objects_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT B.DATABASE_NAME AS OWNER ,CAST((CASE WHEN B.DATABASE_NAME = '__recyclebin' THEN A.OBJECT_NAME WHEN A.OBJECT_TYPE = 'INDEX' THEN SUBSTR(A.OBJECT_NAME, 7 + INSTR(SUBSTR(A.OBJECT_NAME, 7), '_')) ELSE A.OBJECT_NAME END) AS VARCHAR2(128)) AS OBJECT_NAME ,CAST(A.SUBOBJECT_NAME AS VARCHAR2(128)) AS SUBOBJECT_NAME ,A.OBJECT_ID AS OBJECT_ID ,CAST(A.DATA_OBJECT_ID AS NUMBER) AS DATA_OBJECT_ID ,CAST(A.OBJECT_TYPE AS VARCHAR2(23)) AS OBJECT_TYPE ,CAST(A.GMT_CREATE AS DATE) AS CREATED ,CAST(A.GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(A.GMT_CREATE) AS TIMESTAMP ,CAST(A.STATUS AS VARCHAR2(7)) AS STATUS ,CAST(A.TEMPORARY AS VARCHAR2(1)) AS TEMPORARY ,CAST("GENERATED" AS VARCHAR2(1)) AS "GENERATED" ,CAST(A.SECONDARY AS VARCHAR2(1)) AS SECONDARY ,CAST(A.NAMESPACE AS NUMBER) AS NAMESPACE ,CAST(A.EDITION_NAME AS VARCHAR2(128)) AS EDITION_NAME FROM ( SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,TABLE_NAME OBJECT_NAME ,NULL SUBOBJECT_NAME ,TABLE_ID OBJECT_ID ,NULL DATA_OBJECT_ID ,CASE WHEN TABLE_TYPE IN (0,2,3,6,8,9,10) THEN 'TABLE' WHEN TABLE_TYPE IN (1,4) THEN 'VIEW' WHEN TABLE_TYPE IN (5) THEN 'INDEX' WHEN TABLE_TYPE IN (7) THEN 'MATERIALIZED VIEW' ELSE NULL END AS OBJECT_TYPE ,CAST(CASE WHEN TABLE_TYPE IN (5) THEN CASE WHEN INDEX_STATUS = 2 THEN 'VALID' WHEN INDEX_STATUS = 3 THEN 'CHECKING' WHEN INDEX_STATUS = 4 THEN 'INELEGIBLE' WHEN INDEX_STATUS = 5 THEN 'ERROR' ELSE 'UNUSABLE' END ELSE 'VALID' END AS VARCHAR2(10)) AS STATUS ,CASE WHEN TABLE_TYPE IN (6,8,9,10) THEN 'Y' ELSE 'N' END AS TEMPORARY ,CASE WHEN TABLE_TYPE IN (0,1) THEN 'Y' ELSE 'N' END AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME , CASE WHEN TABLE_TYPE IN (5) THEN DATA_TABLE_ID ELSE TABLE_ID END AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT P.GMT_CREATE ,P.GMT_MODIFIED ,T.DATABASE_ID ,T.TABLE_NAME OBJECT_NAME ,P.PART_NAME SUBOBJECT_NAME ,P.PART_ID OBJECT_ID ,CASE WHEN P.PART_IDX != -1 THEN P.PART_ID ELSE NULL END AS DATA_OBJECT_ID ,'TABLE PARTITION' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,CASE WHEN P.PART_IDX != -1 THEN 'Y' ELSE 'N' END AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,T.TABLE_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT P ON T.TABLE_ID = P.TABLE_ID WHERE T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT SUBP.GMT_CREATE ,SUBP.GMT_MODIFIED ,T.DATABASE_ID ,T.TABLE_NAME OBJECT_NAME ,SUBP.SUB_PART_NAME SUBOBJECT_NAME ,SUBP.PART_ID OBJECT_ID ,SUBP.PART_ID AS DATA_OBJECT_ID ,'TABLE SUBPARTITION' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'Y' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,T.TABLE_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_PART_REAL_AGENT P,SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT SUBP WHERE T.TABLE_ID =P.TABLE_ID AND P.TABLE_ID=SUBP.TABLE_ID AND P.PART_ID =SUBP.PART_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() AND SUBP.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT P.GMT_CREATE ,P.GMT_MODIFIED ,P.DATABASE_ID ,P.PACKAGE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,P.PACKAGE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN TYPE = 1 THEN 'PACKAGE' WHEN TYPE = 2 THEN 'PACKAGE BODY' ELSE NULL END AS OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT E WHERE P.TENANT_ID = E.TENANT_ID AND P.PACKAGE_ID = E.OBJ_ID AND (E.OBJ_TYPE = 3 OR E.OBJ_TYPE = 5)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,P.PACKAGE_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P WHERE P.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT R.GMT_CREATE ,R.GMT_MODIFIED ,R.DATABASE_ID ,R.ROUTINE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,ROUTINE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN ROUTINE_TYPE = 1 THEN 'PROCEDURE' WHEN ROUTINE_TYPE = 2 THEN 'FUNCTION' ELSE NULL END AS OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT E WHERE R.TENANT_ID = E.TENANT_ID AND R.ROUTINE_ID = E.OBJ_ID AND (E.OBJ_TYPE = 9 OR E.OBJ_TYPE = 12)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,ROUTINE_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT R WHERE (ROUTINE_TYPE = 1 OR ROUTINE_TYPE = 2) AND R.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT T.GMT_CREATE ,T.GMT_MODIFIED ,T.DATABASE_ID ,T.TRIGGER_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,T.TRIGGER_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TRIGGER' OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_ERROR_AGENT E WHERE T.TENANT_ID = E.TENANT_ID AND T.TRIGGER_ID = E.OBJ_ID AND (E.OBJ_TYPE = 7)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,T.TRIGGER_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_TRIGGER_AGENT T WHERE T.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,SYNONYM_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,SYNONYM_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'SYNONYM' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,SYNONYM_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_SYNONYM_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,SEQUENCE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,SEQUENCE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'SEQUENCE' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,SEQUENCE_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,TYPE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,TYPE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TYPE' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,TYPE_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,OBJECT_TYPE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TYPE BODY' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,OBJECT_TYPE_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_OBJECT_TYPE_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() and TYPE = 2 )A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND (A.DATABASE_ID = USERENV('SCHEMAID') or USER_CAN_ACCESS_OBJ(DECODE(OBJECT_TYPE, 'TABLE', 1, 'VIEW', 1, 'INDEX', 1, 'MATERIALIZED VIEW',9, 'TABLE PARTITION',1, 'TABLE SUBPARTITION', 1, 'PACKAGE', 3, 'PACKAGE BODY', 3, 'PROCEDURE', 12, 'FUNCTION', 9, 'SYNONYM', 13, 'SEQUENCE', 2, 'TYPE', 4, 1), A.PRIV_OBJECT_ID, A.DATABASE_ID) =1 ) UNION ALL SELECT 'SYS' AS OWNER ,TS.TYPE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,TS.TYPE_ID AS OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TYPE' AS OBJECT_TYPE ,CAST(TS.GMT_CREATE AS DATE) AS CREATED ,CAST(TS.GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(TS.GMT_CREATE) AS TIMESTAMP ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY ,0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS UNION ALL SELECT 'SYS' AS OWNER ,PACKAGE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,PACKAGE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN TYPE = 1 THEN 'PACKAGE' WHEN TYPE = 2 THEN 'PACKAGE BODY' ELSE NULL END AS OBJECT_TYPE ,CAST(GMT_CREATE AS DATE) AS CREATED ,CAST(GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(GMT_CREATE) AS TIMESTAMP ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY ,0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_PACKAGE_SYS_AGENT UNION ALL SELECT 'SYS' AS OWNER ,ROUTINE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,ROUTINE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN ROUTINE_TYPE = 1 THEN 'PROCEDURE' WHEN ROUTINE_TYPE = 2 THEN 'FUNCTION' ELSE NULL END AS OBJECT_TYPE ,CAST(GMT_CREATE AS DATE) AS CREATED ,CAST(GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(GMT_CREATE) AS TIMESTAMP ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY ,0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_ROUTINE_SYS_AGENT UNION ALL SELECT 'SYS' AS OWNER ,TRIGGER_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,TRIGGER_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TRIGGER' AS OBJECT_TYPE ,CAST(GMT_CREATE AS DATE) AS CREATED ,CAST(GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(GMT_CREATE) AS TIMESTAMP ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY ,0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT B.DATABASE_NAME AS OWNER ,CAST((CASE WHEN B.DATABASE_NAME = '__recyclebin' THEN A.OBJECT_NAME WHEN A.OBJECT_TYPE = 'INDEX' THEN SUBSTR(A.OBJECT_NAME, 7 + INSTR(SUBSTR(A.OBJECT_NAME, 7), '_')) ELSE A.OBJECT_NAME END) AS VARCHAR2(128)) AS OBJECT_NAME ,CAST(A.SUBOBJECT_NAME AS VARCHAR2(128)) AS SUBOBJECT_NAME ,A.OBJECT_ID AS OBJECT_ID ,CAST(A.DATA_OBJECT_ID AS NUMBER) AS DATA_OBJECT_ID ,CAST(A.OBJECT_TYPE AS VARCHAR2(23)) AS OBJECT_TYPE ,CAST(A.GMT_CREATE AS DATE) AS CREATED ,CAST(A.GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(A.GMT_CREATE) AS TIMESTAMP ,CAST(A.STATUS AS VARCHAR2(7)) AS STATUS ,CAST(A.TEMPORARY AS VARCHAR2(1)) AS TEMPORARY ,CAST("GENERATED" AS VARCHAR2(1)) AS "GENERATED" ,CAST(A.SECONDARY AS VARCHAR2(1)) AS SECONDARY ,CAST(A.NAMESPACE AS NUMBER) AS NAMESPACE ,CAST(A.EDITION_NAME AS VARCHAR2(128)) AS EDITION_NAME FROM ( SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,TABLE_NAME OBJECT_NAME ,NULL SUBOBJECT_NAME ,TABLE_ID OBJECT_ID ,NULL DATA_OBJECT_ID ,CASE WHEN TABLE_TYPE IN (0,2,3,6,8,9,10) THEN 'TABLE' WHEN TABLE_TYPE IN (1,4) THEN 'VIEW' WHEN TABLE_TYPE IN (5) THEN 'INDEX' WHEN TABLE_TYPE IN (7) THEN 'MATERIALIZED VIEW' ELSE NULL END AS OBJECT_TYPE ,CAST(CASE WHEN TABLE_TYPE IN (5) THEN CASE WHEN INDEX_STATUS = 2 THEN 'VALID' WHEN INDEX_STATUS = 3 THEN 'CHECKING' WHEN INDEX_STATUS = 4 THEN 'INELEGIBLE' WHEN INDEX_STATUS = 5 THEN 'ERROR' ELSE 'UNUSABLE' END ELSE 'VALID' END AS VARCHAR2(10)) AS STATUS ,CASE WHEN TABLE_TYPE IN (6,8,9,10) THEN 'Y' ELSE 'N' END AS TEMPORARY ,CASE WHEN TABLE_TYPE IN (0,1) THEN 'Y' ELSE 'N' END AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME , CASE WHEN TABLE_TYPE IN (5) THEN DATA_TABLE_ID ELSE TABLE_ID END AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT P.GMT_CREATE ,P.GMT_MODIFIED ,T.DATABASE_ID ,T.TABLE_NAME OBJECT_NAME ,P.PART_NAME SUBOBJECT_NAME ,P.PART_ID OBJECT_ID ,CASE WHEN P.PART_IDX != -1 THEN P.PART_ID ELSE NULL END AS DATA_OBJECT_ID ,'TABLE PARTITION' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,CASE WHEN P.PART_IDX != -1 THEN 'Y' ELSE 'N' END AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,T.TABLE_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT P ON T.TABLE_ID = P.TABLE_ID WHERE T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT SUBP.GMT_CREATE ,SUBP.GMT_MODIFIED ,T.DATABASE_ID ,T.TABLE_NAME OBJECT_NAME ,SUBP.SUB_PART_NAME SUBOBJECT_NAME ,SUBP.PART_ID OBJECT_ID ,SUBP.PART_ID AS DATA_OBJECT_ID ,'TABLE SUBPARTITION' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'Y' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,T.TABLE_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_PART_REAL_AGENT P,SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT SUBP WHERE T.TABLE_ID =P.TABLE_ID AND P.TABLE_ID=SUBP.TABLE_ID AND P.PART_ID =SUBP.PART_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() AND SUBP.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT P.GMT_CREATE ,P.GMT_MODIFIED ,P.DATABASE_ID ,P.PACKAGE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,P.PACKAGE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN TYPE = 1 THEN 'PACKAGE' WHEN TYPE = 2 THEN 'PACKAGE BODY' ELSE NULL END AS OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT E WHERE P.TENANT_ID = E.TENANT_ID AND P.PACKAGE_ID = E.OBJ_ID AND (E.OBJ_TYPE = 3 OR E.OBJ_TYPE = 5)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,P.PACKAGE_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P WHERE P.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT R.GMT_CREATE ,R.GMT_MODIFIED ,R.DATABASE_ID ,R.ROUTINE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,ROUTINE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN ROUTINE_TYPE = 1 THEN 'PROCEDURE' WHEN ROUTINE_TYPE = 2 THEN 'FUNCTION' ELSE NULL END AS OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT E WHERE R.TENANT_ID = E.TENANT_ID AND R.ROUTINE_ID = E.OBJ_ID AND (E.OBJ_TYPE = 9 OR E.OBJ_TYPE = 12)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,ROUTINE_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT R WHERE (ROUTINE_TYPE = 1 OR ROUTINE_TYPE = 2) AND R.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT T.GMT_CREATE ,T.GMT_MODIFIED ,T.DATABASE_ID ,T.TRIGGER_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,T.TRIGGER_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TRIGGER' OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_ERROR_AGENT E WHERE T.TENANT_ID = E.TENANT_ID AND T.TRIGGER_ID = E.OBJ_ID AND (E.OBJ_TYPE = 7)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,T.TRIGGER_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_TRIGGER_AGENT T WHERE T.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,SYNONYM_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,SYNONYM_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'SYNONYM' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,SYNONYM_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_SYNONYM_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,SEQUENCE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,SEQUENCE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'SEQUENCE' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,SEQUENCE_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,TYPE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,TYPE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TYPE' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,TYPE_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,OBJECT_TYPE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TYPE BODY' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME ,OBJECT_TYPE_ID AS PRIV_OBJECT_ID FROM SYS.ALL_VIRTUAL_OBJECT_TYPE_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() and TYPE = 2 )A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND (A.DATABASE_ID = USERENV('SCHEMAID') or USER_CAN_ACCESS_OBJ(DECODE(OBJECT_TYPE, 'TABLE', 1, 'VIEW', 1, 'INDEX', 1, 'MATERIALIZED VIEW',9, 'TABLE PARTITION',1, 'TABLE SUBPARTITION', 1, 'PACKAGE', 3, 'PACKAGE BODY', 3, 'PROCEDURE', 12, 'FUNCTION', 9, 'SYNONYM', 13, 'SEQUENCE', 2, 'TYPE', 4, 1), A.PRIV_OBJECT_ID, A.DATABASE_ID) =1 ) UNION ALL SELECT 'SYS' AS OWNER ,TS.TYPE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,TS.TYPE_ID AS OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TYPE' AS OBJECT_TYPE ,CAST(TS.GMT_CREATE AS DATE) AS CREATED ,CAST(TS.GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(TS.GMT_CREATE) AS TIMESTAMP ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY ,0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS UNION ALL SELECT 'SYS' AS OWNER ,PACKAGE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,PACKAGE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN TYPE = 1 THEN 'PACKAGE' WHEN TYPE = 2 THEN 'PACKAGE BODY' ELSE NULL END AS OBJECT_TYPE ,CAST(GMT_CREATE AS DATE) AS CREATED ,CAST(GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(GMT_CREATE) AS TIMESTAMP ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY ,0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_PACKAGE_SYS_AGENT UNION ALL SELECT 'SYS' AS OWNER ,ROUTINE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,ROUTINE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN ROUTINE_TYPE = 1 THEN 'PROCEDURE' WHEN ROUTINE_TYPE = 2 THEN 'FUNCTION' ELSE NULL END AS OBJECT_TYPE ,CAST(GMT_CREATE AS DATE) AS CREATED ,CAST(GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(GMT_CREATE) AS TIMESTAMP ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY ,0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_ROUTINE_SYS_AGENT UNION ALL SELECT 'SYS' AS OWNER ,TRIGGER_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,TRIGGER_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TRIGGER' AS OBJECT_TYPE ,CAST(GMT_CREATE AS DATE) AS CREATED ,CAST(GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(GMT_CREATE) AS TIMESTAMP ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY ,0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -179,17 +176,16 @@ int ObInnerTableSchema::all_objects_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_objects_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_objects_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -220,8 +216,7 @@ int ObInnerTableSchema::user_objects_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST((CASE WHEN A.OBJECT_TYPE = 'INDEX' THEN SUBSTR(A.OBJECT_NAME, 7 + INSTR(SUBSTR(A.OBJECT_NAME, 7), '_')) ELSE A.OBJECT_NAME END) AS VARCHAR2(128)) AS OBJECT_NAME ,CAST(A.SUBOBJECT_NAME AS VARCHAR2(128)) AS SUBOBJECT_NAME ,A.OBJECT_ID AS OBJECT_ID ,CAST(A.DATA_OBJECT_ID AS NUMBER) AS DATA_OBJECT_ID ,CAST(A.OBJECT_TYPE AS VARCHAR2(23)) AS OBJECT_TYPE ,CAST(A.GMT_CREATE AS DATE) AS CREATED ,CAST(A.GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(A.GMT_CREATE) AS TIMESTAMP ,CAST(A.STATUS AS VARCHAR2(7)) AS STATUS ,CAST(A.TEMPORARY AS VARCHAR2(1)) AS TEMPORARY ,CAST("GENERATED" AS VARCHAR2(1)) AS "GENERATED" ,CAST(A.SECONDARY AS VARCHAR2(1)) AS SECONDARY ,CAST(A.NAMESPACE AS NUMBER) AS NAMESPACE ,CAST(A.EDITION_NAME AS VARCHAR2(128)) AS EDITION_NAME FROM ( SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,TABLE_NAME OBJECT_NAME ,NULL SUBOBJECT_NAME ,TABLE_ID OBJECT_ID ,NULL DATA_OBJECT_ID ,CASE WHEN TABLE_TYPE IN (0,2,3,6,8,9,10) THEN 'TABLE' WHEN TABLE_TYPE IN (1,4) THEN 'VIEW' WHEN TABLE_TYPE IN (5) THEN 'INDEX' WHEN TABLE_TYPE IN (7) THEN 'MATERIALIZED VIEW' ELSE NULL END AS OBJECT_TYPE ,CAST(CASE WHEN TABLE_TYPE IN (5) THEN CASE WHEN INDEX_STATUS = 2 THEN 'VALID' WHEN INDEX_STATUS = 3 THEN 'CHECKING' WHEN INDEX_STATUS = 4 THEN 'INELEGIBLE' WHEN INDEX_STATUS = 5 THEN 'ERROR' ELSE 'UNUSABLE' END ELSE 'VALID' END AS VARCHAR2(10)) AS STATUS ,CASE WHEN TABLE_TYPE IN (6,8,9,10) THEN 'Y' ELSE 'N' END AS TEMPORARY ,CASE WHEN TABLE_TYPE IN (0,1) THEN 'Y' ELSE 'N' END AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT P.GMT_CREATE ,P.GMT_MODIFIED ,T.DATABASE_ID ,T.TABLE_NAME OBJECT_NAME ,P.PART_NAME SUBOBJECT_NAME ,P.PART_ID OBJECT_ID ,CASE WHEN P.PART_IDX != -1 THEN P.PART_ID ELSE NULL END AS DATA_OBJECT_ID ,'TABLE PARTITION' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,CASE WHEN P.PART_IDX != -1 THEN 'Y' ELSE 'N' END AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT P ON T.TABLE_ID = P.TABLE_ID WHERE T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT SUBP.GMT_CREATE ,SUBP.GMT_MODIFIED ,T.DATABASE_ID ,T.TABLE_NAME OBJECT_NAME ,SUBP.SUB_PART_NAME SUBOBJECT_NAME ,SUBP.PART_ID OBJECT_ID ,SUBP.PART_ID AS DATA_OBJECT_ID ,'TABLE SUBPARTITION' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'Y' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_PART_REAL_AGENT P,SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT SUBP WHERE T.TABLE_ID =P.TABLE_ID AND P.TABLE_ID=SUBP.TABLE_ID AND P.PART_ID =SUBP.PART_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() AND SUBP.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT P.GMT_CREATE ,P.GMT_MODIFIED ,P.DATABASE_ID ,P.PACKAGE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,P.PACKAGE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN TYPE = 1 THEN 'PACKAGE' WHEN TYPE = 2 THEN 'PACKAGE BODY' ELSE NULL END AS OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT E WHERE P.TENANT_ID = E.TENANT_ID AND P.PACKAGE_ID = E.OBJ_ID AND (E.OBJ_TYPE = 3 OR E.OBJ_TYPE = 5)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P WHERE P.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT R.GMT_CREATE ,R.GMT_MODIFIED ,R.DATABASE_ID ,R.ROUTINE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,R.ROUTINE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN ROUTINE_TYPE = 1 THEN 'PROCEDURE' WHEN ROUTINE_TYPE = 2 THEN 'FUNCTION' ELSE NULL END AS OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT E WHERE R.TENANT_ID = E.TENANT_ID AND R.ROUTINE_ID = E.OBJ_ID AND (E.OBJ_TYPE = 12 OR E.OBJ_TYPE = 9)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT R WHERE (ROUTINE_TYPE = 1 OR ROUTINE_TYPE = 2) AND R.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT T.GMT_CREATE ,T.GMT_MODIFIED ,T.DATABASE_ID ,T.TRIGGER_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,T.TRIGGER_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TRIGGER' OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT E WHERE T.TENANT_ID = E.TENANT_ID AND T.TRIGGER_ID = E.OBJ_ID AND (E.OBJ_TYPE = 7)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TRIGGER_AGENT T WHERE T.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,SYNONYM_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,SYNONYM_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'SYNONYM' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_SYNONYM_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,SEQUENCE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,SEQUENCE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'SEQUENCE' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,TYPE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,TYPE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TYPE' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,OBJECT_TYPE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TYPE BODY' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_OBJECT_TYPE_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() and TYPE = 2 )A WHERE DATABASE_ID=USERENV('SCHEMAID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST((CASE WHEN A.OBJECT_TYPE = 'INDEX' THEN SUBSTR(A.OBJECT_NAME, 7 + INSTR(SUBSTR(A.OBJECT_NAME, 7), '_')) ELSE A.OBJECT_NAME END) AS VARCHAR2(128)) AS OBJECT_NAME ,CAST(A.SUBOBJECT_NAME AS VARCHAR2(128)) AS SUBOBJECT_NAME ,A.OBJECT_ID AS OBJECT_ID ,CAST(A.DATA_OBJECT_ID AS NUMBER) AS DATA_OBJECT_ID ,CAST(A.OBJECT_TYPE AS VARCHAR2(23)) AS OBJECT_TYPE ,CAST(A.GMT_CREATE AS DATE) AS CREATED ,CAST(A.GMT_MODIFIED AS DATE) AS LAST_DDL_TIME ,TO_CHAR(A.GMT_CREATE) AS TIMESTAMP ,CAST(A.STATUS AS VARCHAR2(7)) AS STATUS ,CAST(A.TEMPORARY AS VARCHAR2(1)) AS TEMPORARY ,CAST("GENERATED" AS VARCHAR2(1)) AS "GENERATED" ,CAST(A.SECONDARY AS VARCHAR2(1)) AS SECONDARY ,CAST(A.NAMESPACE AS NUMBER) AS NAMESPACE ,CAST(A.EDITION_NAME AS VARCHAR2(128)) AS EDITION_NAME FROM ( SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,TABLE_NAME OBJECT_NAME ,NULL SUBOBJECT_NAME ,TABLE_ID OBJECT_ID ,NULL DATA_OBJECT_ID ,CASE WHEN TABLE_TYPE IN (0,2,3,6,8,9,10) THEN 'TABLE' WHEN TABLE_TYPE IN (1,4) THEN 'VIEW' WHEN TABLE_TYPE IN (5) THEN 'INDEX' WHEN TABLE_TYPE IN (7) THEN 'MATERIALIZED VIEW' ELSE NULL END AS OBJECT_TYPE ,CAST(CASE WHEN TABLE_TYPE IN (5) THEN CASE WHEN INDEX_STATUS = 2 THEN 'VALID' WHEN INDEX_STATUS = 3 THEN 'CHECKING' WHEN INDEX_STATUS = 4 THEN 'INELEGIBLE' WHEN INDEX_STATUS = 5 THEN 'ERROR' ELSE 'UNUSABLE' END ELSE 'VALID' END AS VARCHAR2(10)) AS STATUS ,CASE WHEN TABLE_TYPE IN (6,8,9,10) THEN 'Y' ELSE 'N' END AS TEMPORARY ,CASE WHEN TABLE_TYPE IN (0,1) THEN 'Y' ELSE 'N' END AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT P.GMT_CREATE ,P.GMT_MODIFIED ,T.DATABASE_ID ,T.TABLE_NAME OBJECT_NAME ,P.PART_NAME SUBOBJECT_NAME ,P.PART_ID OBJECT_ID ,CASE WHEN P.PART_IDX != -1 THEN P.PART_ID ELSE NULL END AS DATA_OBJECT_ID ,'TABLE PARTITION' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,CASE WHEN P.PART_IDX != -1 THEN 'Y' ELSE 'N' END AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT P ON T.TABLE_ID = P.TABLE_ID WHERE T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT SUBP.GMT_CREATE ,SUBP.GMT_MODIFIED ,T.DATABASE_ID ,T.TABLE_NAME OBJECT_NAME ,SUBP.SUB_PART_NAME SUBOBJECT_NAME ,SUBP.PART_ID OBJECT_ID ,SUBP.PART_ID AS DATA_OBJECT_ID ,'TABLE SUBPARTITION' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'Y' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_PART_REAL_AGENT P,SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT SUBP WHERE T.TABLE_ID =P.TABLE_ID AND P.TABLE_ID=SUBP.TABLE_ID AND P.PART_ID =SUBP.PART_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() AND SUBP.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT P.GMT_CREATE ,P.GMT_MODIFIED ,P.DATABASE_ID ,P.PACKAGE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,P.PACKAGE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN TYPE = 1 THEN 'PACKAGE' WHEN TYPE = 2 THEN 'PACKAGE BODY' ELSE NULL END AS OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT E WHERE P.TENANT_ID = E.TENANT_ID AND P.PACKAGE_ID = E.OBJ_ID AND (E.OBJ_TYPE = 3 OR E.OBJ_TYPE = 5)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P WHERE P.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT R.GMT_CREATE ,R.GMT_MODIFIED ,R.DATABASE_ID ,R.ROUTINE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,R.ROUTINE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,CASE WHEN ROUTINE_TYPE = 1 THEN 'PROCEDURE' WHEN ROUTINE_TYPE = 2 THEN 'FUNCTION' ELSE NULL END AS OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT E WHERE R.TENANT_ID = E.TENANT_ID AND R.ROUTINE_ID = E.OBJ_ID AND (E.OBJ_TYPE = 12 OR E.OBJ_TYPE = 9)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT R WHERE (ROUTINE_TYPE = 1 OR ROUTINE_TYPE = 2) AND R.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT T.GMT_CREATE ,T.GMT_MODIFIED ,T.DATABASE_ID ,T.TRIGGER_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,T.TRIGGER_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TRIGGER' OBJECT_TYPE ,CASE WHEN EXISTS (SELECT OBJ_ID FROM SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT E WHERE T.TENANT_ID = E.TENANT_ID AND T.TRIGGER_ID = E.OBJ_ID AND (E.OBJ_TYPE = 7)) THEN 'INVALID' ELSE 'VALID' END AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TRIGGER_AGENT T WHERE T.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,SYNONYM_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,SYNONYM_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'SYNONYM' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_SYNONYM_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,SEQUENCE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,SEQUENCE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'SEQUENCE' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,TYPE_NAME AS OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,TYPE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TYPE' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT GMT_CREATE ,GMT_MODIFIED ,DATABASE_ID ,OBJECT_NAME ,NULL AS SUBOBJECT_NAME ,OBJECT_TYPE_ID OBJECT_ID ,NULL AS DATA_OBJECT_ID ,'TYPE BODY' AS OBJECT_TYPE ,'VALID' AS STATUS ,'N' AS TEMPORARY ,'N' AS "GENERATED" ,'N' AS SECONDARY , 0 AS NAMESPACE ,NULL AS EDITION_NAME FROM SYS.ALL_VIRTUAL_OBJECT_TYPE_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() and TYPE = 2 )A WHERE DATABASE_ID=USERENV('SCHEMAID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -233,17 +228,16 @@ int ObInnerTableSchema::user_objects_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_sequences_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_sequences_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -274,8 +268,7 @@ int ObInnerTableSchema::dba_sequences_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT C.DATABASE_NAME AS SEQUENCE_OWNER ,A.SEQUENCE_NAME AS SEQUENCE_NAME ,A.MIN_VALUE AS MIN_VALUE ,A.MAX_VALUE AS MAX_VALUE ,A.INCREMENT_BY AS INCREMENT_BY ,CASE A.CYCLE_FLAG WHEN 1 THEN 'Y' WHEN 0 THEN 'N' ELSE NULL END AS CYCLE_FLAG ,CASE A.ORDER_FLAG WHEN 1 THEN 'Y' WHEN 0 THEN 'N' ELSE NULL END AS ORDER_FLAG ,A.CACHE_SIZE AS CACHE_SIZE ,CAST(COALESCE(B.NEXT_VALUE,A.START_WITH) AS NUMBER(38,0)) AS LAST_NUMBER FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT A INNER JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C ON A.DATABASE_ID = C.DATABASE_ID AND A.TENANT_ID = C.TENANT_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT B ON B.SEQUENCE_ID = A.SEQUENCE_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT C.DATABASE_NAME AS SEQUENCE_OWNER ,A.SEQUENCE_NAME AS SEQUENCE_NAME ,A.MIN_VALUE AS MIN_VALUE ,A.MAX_VALUE AS MAX_VALUE ,A.INCREMENT_BY AS INCREMENT_BY ,CASE A.CYCLE_FLAG WHEN 1 THEN 'Y' WHEN 0 THEN 'N' ELSE NULL END AS CYCLE_FLAG ,CASE A.ORDER_FLAG WHEN 1 THEN 'Y' WHEN 0 THEN 'N' ELSE NULL END AS ORDER_FLAG ,A.CACHE_SIZE AS CACHE_SIZE ,CAST(COALESCE(B.NEXT_VALUE,A.START_WITH) AS NUMBER(38,0)) AS LAST_NUMBER FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT A INNER JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C ON A.DATABASE_ID = C.DATABASE_ID AND A.TENANT_ID = C.TENANT_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT B ON B.SEQUENCE_ID = A.SEQUENCE_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -287,17 +280,16 @@ int ObInnerTableSchema::dba_sequences_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_sequences_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_sequences_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -328,8 +320,7 @@ int ObInnerTableSchema::all_sequences_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT C.DATABASE_NAME AS SEQUENCE_OWNER ,A.SEQUENCE_NAME AS SEQUENCE_NAME ,A.MIN_VALUE AS MIN_VALUE ,A.MAX_VALUE AS MAX_VALUE ,A.INCREMENT_BY AS INCREMENT_BY ,CASE A.CYCLE_FLAG WHEN 1 THEN 'Y' WHEN 0 THEN 'N' ELSE NULL END AS CYCLE_FLAG ,CASE A.ORDER_FLAG WHEN 1 THEN 'Y' WHEN 0 THEN 'N' ELSE NULL END AS ORDER_FLAG ,A.CACHE_SIZE AS CACHE_SIZE ,CAST(COALESCE(B.NEXT_VALUE,A.START_WITH) AS NUMBER(38,0)) AS LAST_NUMBER FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT A INNER JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C ON A.DATABASE_ID = C.DATABASE_ID AND A.TENANT_ID = C.TENANT_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(2, A.SEQUENCE_ID, A.DATABASE_ID) = 1) LEFT JOIN SYS.ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT B ON B.SEQUENCE_ID = A.SEQUENCE_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT C.DATABASE_NAME AS SEQUENCE_OWNER ,A.SEQUENCE_NAME AS SEQUENCE_NAME ,A.MIN_VALUE AS MIN_VALUE ,A.MAX_VALUE AS MAX_VALUE ,A.INCREMENT_BY AS INCREMENT_BY ,CASE A.CYCLE_FLAG WHEN 1 THEN 'Y' WHEN 0 THEN 'N' ELSE NULL END AS CYCLE_FLAG ,CASE A.ORDER_FLAG WHEN 1 THEN 'Y' WHEN 0 THEN 'N' ELSE NULL END AS ORDER_FLAG ,A.CACHE_SIZE AS CACHE_SIZE ,CAST(COALESCE(B.NEXT_VALUE,A.START_WITH) AS NUMBER(38,0)) AS LAST_NUMBER FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT A INNER JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C ON A.DATABASE_ID = C.DATABASE_ID AND A.TENANT_ID = C.TENANT_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(2, A.SEQUENCE_ID, A.DATABASE_ID) = 1) LEFT JOIN SYS.ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT B ON B.SEQUENCE_ID = A.SEQUENCE_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -341,17 +332,16 @@ int ObInnerTableSchema::all_sequences_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_sequences_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_sequences_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -382,8 +372,7 @@ int ObInnerTableSchema::user_sequences_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT A.SEQUENCE_NAME AS SEQUENCE_NAME ,A.MIN_VALUE AS MIN_VALUE ,A.MAX_VALUE AS MAX_VALUE ,A.INCREMENT_BY AS INCREMENT_BY ,CASE A.CYCLE_FLAG WHEN 1 THEN 'Y' WHEN 0 THEN 'N' ELSE NULL END AS CYCLE_FLAG ,CASE A.ORDER_FLAG WHEN 1 THEN 'Y' WHEN 0 THEN 'N' ELSE NULL END AS ORDER_FLAG ,A.CACHE_SIZE AS CACHE_SIZE ,CAST(COALESCE(B.NEXT_VALUE,A.START_WITH) AS NUMBER(38,0)) AS LAST_NUMBER FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT A LEFT JOIN SYS.ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT B ON B.SEQUENCE_ID = A.SEQUENCE_ID WHERE A.DATABASE_ID = USERENV('SCHEMAID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT A.SEQUENCE_NAME AS SEQUENCE_NAME ,A.MIN_VALUE AS MIN_VALUE ,A.MAX_VALUE AS MAX_VALUE ,A.INCREMENT_BY AS INCREMENT_BY ,CASE A.CYCLE_FLAG WHEN 1 THEN 'Y' WHEN 0 THEN 'N' ELSE NULL END AS CYCLE_FLAG ,CASE A.ORDER_FLAG WHEN 1 THEN 'Y' WHEN 0 THEN 'N' ELSE NULL END AS ORDER_FLAG ,A.CACHE_SIZE AS CACHE_SIZE ,CAST(COALESCE(B.NEXT_VALUE,A.START_WITH) AS NUMBER(38,0)) AS LAST_NUMBER FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT A LEFT JOIN SYS.ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT B ON B.SEQUENCE_ID = A.SEQUENCE_ID WHERE A.DATABASE_ID = USERENV('SCHEMAID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -395,17 +384,16 @@ int ObInnerTableSchema::user_sequences_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_users_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_users_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -436,8 +424,7 @@ int ObInnerTableSchema::dba_users_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT A.DATABASE_NAME AS USERNAME, A.DATABASE_ID AS USERID, B.PASSWD AS PASSWORD, CAST(NULL as VARCHAR2(30)) AS ACCOUNT_STATUS, CAST(NULL as DATE) AS LOCK_DATE, CAST(NULL as DATE) AS EXPIRY_DATE, CAST(NULL as VARCHAR2(30)) AS DEFAULT_TABLESPACE, CAST(NULL as VARCHAR2(30)) AS TEMPORARY_TABLESPACE, CAST(A.GMT_CREATE AS DATE) AS CREATED, CAST(NULL as VARCHAR2(30)) AS INITIAL_RSRC_CONSUMER_GROUP, CAST(NULL as VARCHAR2(4000)) AS EXTERNAL_NAME FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A, SYS.ALL_VIRTUAL_USER_REAL_AGENT B WHERE A.DATABASE_NAME = B.USER_NAME AND A.TENANT_ID = B.TENANT_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT A.DATABASE_NAME AS USERNAME, A.DATABASE_ID AS USERID, B.PASSWD AS PASSWORD, CAST(NULL as VARCHAR2(30)) AS ACCOUNT_STATUS, CAST(NULL as DATE) AS LOCK_DATE, CAST(NULL as DATE) AS EXPIRY_DATE, CAST(NULL as VARCHAR2(30)) AS DEFAULT_TABLESPACE, CAST(NULL as VARCHAR2(30)) AS TEMPORARY_TABLESPACE, CAST(A.GMT_CREATE AS DATE) AS CREATED, CAST(NULL as VARCHAR2(30)) AS INITIAL_RSRC_CONSUMER_GROUP, CAST(NULL as VARCHAR2(4000)) AS EXTERNAL_NAME FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A, SYS.ALL_VIRTUAL_USER_REAL_AGENT B WHERE A.DATABASE_NAME = B.USER_NAME AND A.TENANT_ID = B.TENANT_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -449,17 +436,16 @@ int ObInnerTableSchema::dba_users_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_users_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_users_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -490,8 +476,7 @@ int ObInnerTableSchema::all_users_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT A.DATABASE_NAME AS USERNAME, A.DATABASE_ID AS USERID, CAST(A.GMT_CREATE AS DATE) AS CREATED FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A, SYS.ALL_VIRTUAL_USER_REAL_AGENT B WHERE A.DATABASE_NAME = B.USER_NAME AND A.TENANT_ID = B.TENANT_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT A.DATABASE_NAME AS USERNAME, A.DATABASE_ID AS USERID, CAST(A.GMT_CREATE AS DATE) AS CREATED FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A, SYS.ALL_VIRTUAL_USER_REAL_AGENT B WHERE A.DATABASE_NAME = B.USER_NAME AND A.TENANT_ID = B.TENANT_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -503,17 +488,16 @@ int ObInnerTableSchema::all_users_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_synonyms_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_synonyms_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -544,8 +528,7 @@ int ObInnerTableSchema::all_synonyms_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CASE WHEN A.DATABASE_NAME = '__public' THEN 'PUBLIC' ELSE A.DATABASE_NAME END AS OWNER, A.SYNONYM_NAME AS SYNONYM_NAME, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN B.DATABASE_NAME ELSE SUBSTR(A.OBJECT_NAME, 1, INSTR(A.OBJECT_NAME, '.') -1) END AS VARCHAR2(128)) AS TABLE_OWNER, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN A.OBJECT_NAME ELSE SUBSTR(A.OBJECT_NAME, INSTR(A.OBJECT_NAME, '.') + 1, INSTR(A.OBJECT_NAME, '@') - INSTR(A.OBJECT_NAME, '.') -1) END AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN NULL ELSE SUBSTR(A.OBJECT_NAME, INSTR(A.OBJECT_NAME, '@')+1) END AS VARCHAR2(128)) AS DB_LINK FROM (SELECT BB.DATABASE_NAME, AA.SYNONYM_NAME, AA.OBJECT_NAME, AA.SYNONYM_ID FROM SYS.ALL_VIRTUAL_SYNONYM_REAL_AGENT AA, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT BB WHERE AA.DATABASE_ID = BB.DATABASE_ID AND AA.TENANT_ID = BB.TENANT_ID AND AA.TENANT_ID = EFFECTIVE_TENANT_ID() AND (AA.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(13, AA.SYNONYM_ID, AA.DATABASE_ID) = 1)) A, (SELECT BB.DATABASE_NAME, AA.SYNONYM_ID FROM SYS.ALL_VIRTUAL_SYNONYM_REAL_AGENT AA, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT BB WHERE AA.OBJECT_DATABASE_ID = BB.DATABASE_ID AND AA.TENANT_ID = BB.TENANT_ID AND AA.TENANT_ID = EFFECTIVE_TENANT_ID() AND (AA.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(13, AA.SYNONYM_ID, AA.DATABASE_ID) = 1)) B WHERE A.SYNONYM_ID = B.SYNONYM_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CASE WHEN A.DATABASE_NAME = '__public' THEN 'PUBLIC' ELSE A.DATABASE_NAME END AS OWNER, A.SYNONYM_NAME AS SYNONYM_NAME, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN B.DATABASE_NAME ELSE SUBSTR(A.OBJECT_NAME, 1, INSTR(A.OBJECT_NAME, '.') -1) END AS VARCHAR2(128)) AS TABLE_OWNER, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN A.OBJECT_NAME ELSE SUBSTR(A.OBJECT_NAME, INSTR(A.OBJECT_NAME, '.') + 1, INSTR(A.OBJECT_NAME, '@') - INSTR(A.OBJECT_NAME, '.') -1) END AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN NULL ELSE SUBSTR(A.OBJECT_NAME, INSTR(A.OBJECT_NAME, '@')+1) END AS VARCHAR2(128)) AS DB_LINK FROM (SELECT BB.DATABASE_NAME, AA.SYNONYM_NAME, AA.OBJECT_NAME, AA.SYNONYM_ID FROM SYS.ALL_VIRTUAL_SYNONYM_REAL_AGENT AA, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT BB WHERE AA.DATABASE_ID = BB.DATABASE_ID AND AA.TENANT_ID = BB.TENANT_ID AND AA.TENANT_ID = EFFECTIVE_TENANT_ID() AND (AA.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(13, AA.SYNONYM_ID, AA.DATABASE_ID) = 1)) A, (SELECT BB.DATABASE_NAME, AA.SYNONYM_ID FROM SYS.ALL_VIRTUAL_SYNONYM_REAL_AGENT AA, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT BB WHERE AA.OBJECT_DATABASE_ID = BB.DATABASE_ID AND AA.TENANT_ID = BB.TENANT_ID AND AA.TENANT_ID = EFFECTIVE_TENANT_ID() AND (AA.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(13, AA.SYNONYM_ID, AA.DATABASE_ID) = 1)) B WHERE A.SYNONYM_ID = B.SYNONYM_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -557,17 +540,16 @@ int ObInnerTableSchema::all_synonyms_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_synonyms_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_synonyms_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -598,8 +580,7 @@ int ObInnerTableSchema::user_synonyms_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT A.SYNONYM_NAME AS SYNONYM_NAME, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN B.DATABASE_NAME ELSE SUBSTR(A.OBJECT_NAME, 1, INSTR(A.OBJECT_NAME, '.') -1) END AS VARCHAR2(128)) AS TABLE_OWNER, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN A.OBJECT_NAME ELSE SUBSTR(A.OBJECT_NAME, INSTR(A.OBJECT_NAME, '.') + 1, INSTR(A.OBJECT_NAME, '@') - INSTR(A.OBJECT_NAME, '.') -1) END AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN NULL ELSE SUBSTR(A.OBJECT_NAME, INSTR(A.OBJECT_NAME, '@')+1) END AS VARCHAR2(128)) AS DB_LINK, CAST (0 AS number) AS ORIGIN_CON_ID FROM (SELECT BB.DATABASE_NAME, AA.SYNONYM_NAME, AA.OBJECT_NAME, AA.SYNONYM_ID FROM SYS.ALL_VIRTUAL_SYNONYM_AGENT AA, SYS.ALL_VIRTUAL_DATABASE_AGENT BB WHERE AA.DATABASE_ID = BB.DATABASE_ID AND (AA.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(13, AA.SYNONYM_ID, AA.DATABASE_ID) = 1)) A, (SELECT BB.DATABASE_NAME, AA.SYNONYM_ID FROM SYS.ALL_VIRTUAL_SYNONYM_AGENT AA, SYS.ALL_VIRTUAL_DATABASE_AGENT BB WHERE AA.OBJECT_DATABASE_ID = BB.DATABASE_ID AND (AA.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(13, AA.SYNONYM_ID, AA.DATABASE_ID) = 1)) B WHERE A.SYNONYM_ID = B.SYNONYM_ID AND A.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT A.SYNONYM_NAME AS SYNONYM_NAME, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN B.DATABASE_NAME ELSE SUBSTR(A.OBJECT_NAME, 1, INSTR(A.OBJECT_NAME, '.') -1) END AS VARCHAR2(128)) AS TABLE_OWNER, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN A.OBJECT_NAME ELSE SUBSTR(A.OBJECT_NAME, INSTR(A.OBJECT_NAME, '.') + 1, INSTR(A.OBJECT_NAME, '@') - INSTR(A.OBJECT_NAME, '.') -1) END AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE WHEN INSTR(A.OBJECT_NAME, '@') = 0 THEN NULL ELSE SUBSTR(A.OBJECT_NAME, INSTR(A.OBJECT_NAME, '@')+1) END AS VARCHAR2(128)) AS DB_LINK, CAST (0 AS number) AS ORIGIN_CON_ID FROM (SELECT BB.DATABASE_NAME, AA.SYNONYM_NAME, AA.OBJECT_NAME, AA.SYNONYM_ID FROM SYS.ALL_VIRTUAL_SYNONYM_AGENT AA, SYS.ALL_VIRTUAL_DATABASE_AGENT BB WHERE AA.DATABASE_ID = BB.DATABASE_ID AND (AA.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(13, AA.SYNONYM_ID, AA.DATABASE_ID) = 1)) A, (SELECT BB.DATABASE_NAME, AA.SYNONYM_ID FROM SYS.ALL_VIRTUAL_SYNONYM_AGENT AA, SYS.ALL_VIRTUAL_DATABASE_AGENT BB WHERE AA.OBJECT_DATABASE_ID = BB.DATABASE_ID AND (AA.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(13, AA.SYNONYM_ID, AA.DATABASE_ID) = 1)) B WHERE A.SYNONYM_ID = B.SYNONYM_ID AND A.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -611,17 +592,16 @@ int ObInnerTableSchema::user_synonyms_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_ind_columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_ind_columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -652,8 +632,7 @@ int ObInnerTableSchema::dba_ind_columns_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(INDEX_OWNER AS VARCHAR2(128)) AS INDEX_OWNER, CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(TABLE_OWNER AS VARCHAR2(128)) AS TABLE_OWNER, CAST(TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(ROWKEY_POSITION AS NUMBER) AS COLUMN_POSITION, CASE WHEN DATA_TYPE >= 1 AND DATA_TYPE <= 16 THEN CAST(22 AS NUMBER) WHEN DATA_TYPE = 17 THEN CAST(7 AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 2 THEN CAST(DATA_LENGTH AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 1 AND F.COLLATION_TYPE IN (45, 46, 224, 54, 55, 101) THEN CAST(DATA_LENGTH * 4 AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 1 AND F.COLLATION_TYPE IN (28, 87) THEN CAST(DATA_LENGTH * 2 AS NUMBER) WHEN DATA_TYPE = 36 THEN CAST(12 AS NUMBER) WHEN DATA_TYPE IN (37, 38) THEN CAST(11 AS NUMBER) WHEN DATA_TYPE = 39 THEN CAST(DATA_LENGTH AS NUMBER) WHEN DATA_TYPE = 40 THEN CAST(5 AS NUMBER) WHEN DATA_TYPE = 41 THEN CAST(11 AS NUMBER) ELSE CAST(0 AS NUMBER) END AS COLUMN_LENGTH, CASE WHEN DATA_TYPE IN (22, 23) THEN CAST(DATA_LENGTH AS NUMBER) ELSE CAST(0 AS NUMBER) END AS CHAR_LENGTH, CAST('ASC' AS VARCHAR2(4)) AS DESCEND FROM (SELECT INDEX_OWNER, INDEX_NAME, TABLE_OWNER, TABLE_NAME, INDEX_ID, IDX_TYPE FROM (SELECT DATABASE_NAME AS INDEX_OWNER, CASE WHEN (TABLE_TYPE = 5) THEN SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) ELSE (CONS_TAB.CONSTRAINT_NAME) END AS INDEX_NAME, DATABASE_NAME AS TABLE_OWNER, CASE WHEN (TABLE_TYPE = 3) THEN A.TABLE_ID ELSE A.DATA_TABLE_ID END AS TABLE_ID, A.TABLE_ID AS INDEX_ID, TABLE_TYPE AS IDX_TYPE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND TABLE_TYPE IN (5, 3) AND B.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = B.TENANT_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT CONS_TAB ON (CONS_TAB.TABLE_ID = A.TABLE_ID AND A.TENANT_ID = CONS_TAB.TENANT_ID AND CONS_TAB.TENANT_ID = EFFECTIVE_TENANT_ID()) WHERE NOT( TABLE_TYPE = 3 AND CONSTRAINT_NAME IS NULL ) ) C JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D ON C.TABLE_ID = D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() ) E JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT F ON E.INDEX_ID = F.TABLE_ID AND F.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE F.ROWKEY_POSITION != 0 AND (CASE WHEN IDX_TYPE = 5 THEN INDEX_POSITION ELSE 1 END) != 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(INDEX_OWNER AS VARCHAR2(128)) AS INDEX_OWNER, CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(TABLE_OWNER AS VARCHAR2(128)) AS TABLE_OWNER, CAST(TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(ROWKEY_POSITION AS NUMBER) AS COLUMN_POSITION, CASE WHEN DATA_TYPE >= 1 AND DATA_TYPE <= 16 THEN CAST(22 AS NUMBER) WHEN DATA_TYPE = 17 THEN CAST(7 AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 2 THEN CAST(DATA_LENGTH AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 1 AND F.COLLATION_TYPE IN (45, 46, 224, 54, 55, 101) THEN CAST(DATA_LENGTH * 4 AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 1 AND F.COLLATION_TYPE IN (28, 87) THEN CAST(DATA_LENGTH * 2 AS NUMBER) WHEN DATA_TYPE = 36 THEN CAST(12 AS NUMBER) WHEN DATA_TYPE IN (37, 38) THEN CAST(11 AS NUMBER) WHEN DATA_TYPE = 39 THEN CAST(DATA_LENGTH AS NUMBER) WHEN DATA_TYPE = 40 THEN CAST(5 AS NUMBER) WHEN DATA_TYPE = 41 THEN CAST(11 AS NUMBER) ELSE CAST(0 AS NUMBER) END AS COLUMN_LENGTH, CASE WHEN DATA_TYPE IN (22, 23) THEN CAST(DATA_LENGTH AS NUMBER) ELSE CAST(0 AS NUMBER) END AS CHAR_LENGTH, CAST('ASC' AS VARCHAR2(4)) AS DESCEND FROM (SELECT INDEX_OWNER, INDEX_NAME, TABLE_OWNER, TABLE_NAME, INDEX_ID, IDX_TYPE FROM (SELECT DATABASE_NAME AS INDEX_OWNER, CASE WHEN (TABLE_TYPE = 5) THEN SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) ELSE (CONS_TAB.CONSTRAINT_NAME) END AS INDEX_NAME, DATABASE_NAME AS TABLE_OWNER, CASE WHEN (TABLE_TYPE = 3) THEN A.TABLE_ID ELSE A.DATA_TABLE_ID END AS TABLE_ID, A.TABLE_ID AS INDEX_ID, TABLE_TYPE AS IDX_TYPE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND TABLE_TYPE IN (5, 3) AND B.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = B.TENANT_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT CONS_TAB ON (CONS_TAB.TABLE_ID = A.TABLE_ID AND A.TENANT_ID = CONS_TAB.TENANT_ID AND CONS_TAB.TENANT_ID = EFFECTIVE_TENANT_ID()) WHERE NOT( TABLE_TYPE = 3 AND CONSTRAINT_NAME IS NULL ) ) C JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D ON C.TABLE_ID = D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() ) E JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT F ON E.INDEX_ID = F.TABLE_ID AND F.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE F.ROWKEY_POSITION != 0 AND (CASE WHEN IDX_TYPE = 5 THEN INDEX_POSITION ELSE 1 END) != 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -665,17 +644,16 @@ int ObInnerTableSchema::dba_ind_columns_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_ind_columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_ind_columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -706,8 +684,7 @@ int ObInnerTableSchema::all_ind_columns_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(INDEX_OWNER AS VARCHAR2(128)) AS INDEX_OWNER, CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(TABLE_OWNER AS VARCHAR2(128)) AS TABLE_OWNER, CAST(TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(ROWKEY_POSITION AS NUMBER) AS COLUMN_POSITION, CASE WHEN DATA_TYPE >= 1 AND DATA_TYPE <= 16 THEN CAST(22 AS NUMBER) WHEN DATA_TYPE = 17 THEN CAST(7 AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 2 THEN CAST(DATA_LENGTH AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 1 AND F.COLLATION_TYPE IN (45, 46, 224, 54, 55, 101) THEN CAST(DATA_LENGTH * 4 AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 1 AND F.COLLATION_TYPE IN (28, 87) THEN CAST(DATA_LENGTH * 2 AS NUMBER) WHEN DATA_TYPE = 36 THEN CAST(12 AS NUMBER) WHEN DATA_TYPE IN (37, 38) THEN CAST(11 AS NUMBER) WHEN DATA_TYPE = 39 THEN CAST(DATA_LENGTH AS NUMBER) WHEN DATA_TYPE = 40 THEN CAST(5 AS NUMBER) WHEN DATA_TYPE = 41 THEN CAST(11 AS NUMBER) ELSE CAST(0 AS NUMBER) END AS COLUMN_LENGTH, CASE WHEN DATA_TYPE IN (22, 23) THEN CAST(DATA_LENGTH AS NUMBER) ELSE CAST(0 AS NUMBER) END AS CHAR_LENGTH, CAST('ASC' AS VARCHAR2(4)) AS DESCEND FROM (SELECT INDEX_OWNER, INDEX_NAME, TABLE_OWNER, TABLE_NAME, INDEX_ID, IDX_TYPE FROM (SELECT DATABASE_NAME AS INDEX_OWNER, CASE WHEN (TABLE_TYPE = 5) THEN SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) ELSE (CONS_TAB.CONSTRAINT_NAME) END AS INDEX_NAME, DATABASE_NAME AS TABLE_OWNER, CASE WHEN (TABLE_TYPE = 3) THEN A.TABLE_ID ELSE A.DATA_TABLE_ID END AS TABLE_ID, A.TABLE_ID AS INDEX_ID, TABLE_TYPE AS IDX_TYPE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND TABLE_TYPE IN (5, 3) AND B.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, DECODE(TABLE_TYPE, 3, TABLE_ID, 5, DATA_TABLE_ID), A.DATABASE_ID) = 1) LEFT JOIN SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT CONS_TAB ON (CONS_TAB.TABLE_ID = A.TABLE_ID AND CONS_TAB.TENANT_ID = EFFECTIVE_TENANT_ID()) WHERE NOT( TABLE_TYPE = 3 AND CONSTRAINT_NAME IS NULL ) ) C JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D ON C.TABLE_ID = D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() ) E JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT F ON E.INDEX_ID = F.TABLE_ID AND F.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE F.ROWKEY_POSITION != 0 AND (CASE WHEN IDX_TYPE = 5 THEN INDEX_POSITION ELSE 1 END) != 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(INDEX_OWNER AS VARCHAR2(128)) AS INDEX_OWNER, CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(TABLE_OWNER AS VARCHAR2(128)) AS TABLE_OWNER, CAST(TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(ROWKEY_POSITION AS NUMBER) AS COLUMN_POSITION, CASE WHEN DATA_TYPE >= 1 AND DATA_TYPE <= 16 THEN CAST(22 AS NUMBER) WHEN DATA_TYPE = 17 THEN CAST(7 AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 2 THEN CAST(DATA_LENGTH AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 1 AND F.COLLATION_TYPE IN (45, 46, 224, 54, 55, 101) THEN CAST(DATA_LENGTH * 4 AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 1 AND F.COLLATION_TYPE IN (28, 87) THEN CAST(DATA_LENGTH * 2 AS NUMBER) WHEN DATA_TYPE = 36 THEN CAST(12 AS NUMBER) WHEN DATA_TYPE IN (37, 38) THEN CAST(11 AS NUMBER) WHEN DATA_TYPE = 39 THEN CAST(DATA_LENGTH AS NUMBER) WHEN DATA_TYPE = 40 THEN CAST(5 AS NUMBER) WHEN DATA_TYPE = 41 THEN CAST(11 AS NUMBER) ELSE CAST(0 AS NUMBER) END AS COLUMN_LENGTH, CASE WHEN DATA_TYPE IN (22, 23) THEN CAST(DATA_LENGTH AS NUMBER) ELSE CAST(0 AS NUMBER) END AS CHAR_LENGTH, CAST('ASC' AS VARCHAR2(4)) AS DESCEND FROM (SELECT INDEX_OWNER, INDEX_NAME, TABLE_OWNER, TABLE_NAME, INDEX_ID, IDX_TYPE FROM (SELECT DATABASE_NAME AS INDEX_OWNER, CASE WHEN (TABLE_TYPE = 5) THEN SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) ELSE (CONS_TAB.CONSTRAINT_NAME) END AS INDEX_NAME, DATABASE_NAME AS TABLE_OWNER, CASE WHEN (TABLE_TYPE = 3) THEN A.TABLE_ID ELSE A.DATA_TABLE_ID END AS TABLE_ID, A.TABLE_ID AS INDEX_ID, TABLE_TYPE AS IDX_TYPE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND TABLE_TYPE IN (5, 3) AND B.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, DECODE(TABLE_TYPE, 3, TABLE_ID, 5, DATA_TABLE_ID), A.DATABASE_ID) = 1) LEFT JOIN SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT CONS_TAB ON (CONS_TAB.TABLE_ID = A.TABLE_ID AND CONS_TAB.TENANT_ID = EFFECTIVE_TENANT_ID()) WHERE NOT( TABLE_TYPE = 3 AND CONSTRAINT_NAME IS NULL ) ) C JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D ON C.TABLE_ID = D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() ) E JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT F ON E.INDEX_ID = F.TABLE_ID AND F.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE F.ROWKEY_POSITION != 0 AND (CASE WHEN IDX_TYPE = 5 THEN INDEX_POSITION ELSE 1 END) != 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -719,17 +696,16 @@ int ObInnerTableSchema::all_ind_columns_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_ind_columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_ind_columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -760,8 +736,7 @@ int ObInnerTableSchema::user_ind_columns_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(ROWKEY_POSITION AS NUMBER) AS COLUMN_POSITION, CASE WHEN DATA_TYPE >= 1 AND DATA_TYPE <= 16 THEN CAST(22 AS NUMBER) WHEN DATA_TYPE = 17 THEN CAST(7 AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 2 THEN CAST(DATA_LENGTH AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 1 AND F.COLLATION_TYPE IN (45, 46, 224, 54, 55, 101) THEN CAST(DATA_LENGTH * 4 AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 1 AND F.COLLATION_TYPE IN (28, 87) THEN CAST(DATA_LENGTH * 2 AS NUMBER) WHEN DATA_TYPE = 36 THEN CAST(12 AS NUMBER) WHEN DATA_TYPE IN (37, 38) THEN CAST(11 AS NUMBER) WHEN DATA_TYPE = 39 THEN CAST(DATA_LENGTH AS NUMBER) WHEN DATA_TYPE = 40 THEN CAST(5 AS NUMBER) WHEN DATA_TYPE = 41 THEN CAST(11 AS NUMBER) ELSE CAST(0 AS NUMBER) END AS COLUMN_LENGTH, CASE WHEN DATA_TYPE IN (22, 23) THEN CAST(DATA_LENGTH AS NUMBER) ELSE CAST(0 AS NUMBER) END AS CHAR_LENGTH, CAST('ASC' AS VARCHAR2(4)) AS DESCEND FROM (SELECT INDEX_OWNER, INDEX_NAME, TABLE_OWNER, TABLE_NAME, INDEX_ID, IDX_TYPE FROM (SELECT DATABASE_NAME AS INDEX_OWNER, CASE WHEN (TABLE_TYPE = 5) THEN SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) ELSE (CONS_TAB.CONSTRAINT_NAME) END AS INDEX_NAME, DATABASE_NAME AS TABLE_OWNER, CASE WHEN (TABLE_TYPE = 3) THEN A.TABLE_ID ELSE A.DATA_TABLE_ID END AS TABLE_ID, A.TABLE_ID AS INDEX_ID, TABLE_TYPE AS IDX_TYPE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND TABLE_TYPE IN (5, 3) AND A.DATABASE_ID = USERENV('SCHEMAID') AND B.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT CONS_TAB ON (CONS_TAB.TABLE_ID = A.TABLE_ID AND CONS_TAB.TENANT_ID = EFFECTIVE_TENANT_ID()) WHERE NOT( TABLE_TYPE = 3 AND CONSTRAINT_NAME IS NULL ) ) C JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D ON C.TABLE_ID = D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() ) E JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT F ON E.INDEX_ID = F.TABLE_ID AND F.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE F.ROWKEY_POSITION != 0 AND (CASE WHEN IDX_TYPE = 5 THEN INDEX_POSITION ELSE 1 END) != 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(ROWKEY_POSITION AS NUMBER) AS COLUMN_POSITION, CASE WHEN DATA_TYPE >= 1 AND DATA_TYPE <= 16 THEN CAST(22 AS NUMBER) WHEN DATA_TYPE = 17 THEN CAST(7 AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 2 THEN CAST(DATA_LENGTH AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 1 AND F.COLLATION_TYPE IN (45, 46, 224, 54, 55, 101) THEN CAST(DATA_LENGTH * 4 AS NUMBER) WHEN DATA_TYPE IN (22, 23) AND F.DATA_PRECISION = 1 AND F.COLLATION_TYPE IN (28, 87) THEN CAST(DATA_LENGTH * 2 AS NUMBER) WHEN DATA_TYPE = 36 THEN CAST(12 AS NUMBER) WHEN DATA_TYPE IN (37, 38) THEN CAST(11 AS NUMBER) WHEN DATA_TYPE = 39 THEN CAST(DATA_LENGTH AS NUMBER) WHEN DATA_TYPE = 40 THEN CAST(5 AS NUMBER) WHEN DATA_TYPE = 41 THEN CAST(11 AS NUMBER) ELSE CAST(0 AS NUMBER) END AS COLUMN_LENGTH, CASE WHEN DATA_TYPE IN (22, 23) THEN CAST(DATA_LENGTH AS NUMBER) ELSE CAST(0 AS NUMBER) END AS CHAR_LENGTH, CAST('ASC' AS VARCHAR2(4)) AS DESCEND FROM (SELECT INDEX_OWNER, INDEX_NAME, TABLE_OWNER, TABLE_NAME, INDEX_ID, IDX_TYPE FROM (SELECT DATABASE_NAME AS INDEX_OWNER, CASE WHEN (TABLE_TYPE = 5) THEN SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) ELSE (CONS_TAB.CONSTRAINT_NAME) END AS INDEX_NAME, DATABASE_NAME AS TABLE_OWNER, CASE WHEN (TABLE_TYPE = 3) THEN A.TABLE_ID ELSE A.DATA_TABLE_ID END AS TABLE_ID, A.TABLE_ID AS INDEX_ID, TABLE_TYPE AS IDX_TYPE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND TABLE_TYPE IN (5, 3) AND A.DATABASE_ID = USERENV('SCHEMAID') AND B.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT CONS_TAB ON (CONS_TAB.TABLE_ID = A.TABLE_ID AND CONS_TAB.TENANT_ID = EFFECTIVE_TENANT_ID()) WHERE NOT( TABLE_TYPE = 3 AND CONSTRAINT_NAME IS NULL ) ) C JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D ON C.TABLE_ID = D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() ) E JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT F ON E.INDEX_ID = F.TABLE_ID AND F.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE F.ROWKEY_POSITION != 0 AND (CASE WHEN IDX_TYPE = 5 THEN INDEX_POSITION ELSE 1 END) != 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -773,17 +748,16 @@ int ObInnerTableSchema::user_ind_columns_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_constraints_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_constraints_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -814,8 +788,7 @@ int ObInnerTableSchema::dba_constraints_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('U' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(NULL AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(9)) AS DELETE_RULE, CAST('ENABLED' AS VARCHAR2(8)) AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CAST('VALIDATED' AS VARCHAR2(13)) AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CAST(NULL AS VARCHAR2(4)) AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS INDEX_OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE A.DATA_TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND A.INDEX_TYPE IN (2, 4, 8) AND C.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.REF_CST_TYPE = 0 AND A.REF_CST_ID = -1 AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(E.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(CASE WHEN A.REF_CST_TYPE = 2 THEN SUBSTR(F.TABLE_NAME, 7 + INSTR(SUBSTR(F.TABLE_NAME, 7), '_')) ELSE NULL END AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT F WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.PARENT_TABLE_ID = D.TABLE_ID AND D.DATABASE_ID = E.DATABASE_ID AND (A.REF_CST_ID = F.TABLE_ID AND A.REF_CST_TYPE = 2) AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(E.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(CASE WHEN A.REF_CST_TYPE = 1 THEN F.CONSTRAINT_NAME ELSE NULL END AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E, SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT F WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.PARENT_TABLE_ID = D.TABLE_ID AND D.DATABASE_ID = E.DATABASE_ID AND (A.PARENT_TABLE_ID = F.TABLE_ID AND A.REF_CST_TYPE = 1 AND F.CONSTRAINT_TYPE = 1 AND A.REF_CST_ID = F.CONSTRAINT_ID) AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(CONSTRAINT_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST('P' AS VARCHAR2(1)) ELSE CAST('C' AS VARCHAR2(1)) END AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST(NULL AS VARCHAR2(4000)) ELSE CAST(A.CHECK_EXPR AS VARCHAR2(4000)) END AS SEARCH_CONDITION, CAST(NULL AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS INDEX_OWNER, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST(A.CONSTRAINT_NAME AS VARCHAR2(128)) ELSE CAST(NULL AS VARCHAR2(128)) END AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE A.TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND C.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('U' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(NULL AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(9)) AS DELETE_RULE, CAST('ENABLED' AS VARCHAR2(8)) AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CAST('VALIDATED' AS VARCHAR2(13)) AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CAST(NULL AS VARCHAR2(4)) AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS INDEX_OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE A.DATA_TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND A.INDEX_TYPE IN (2, 4, 8) AND C.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.REF_CST_TYPE = 0 AND A.REF_CST_ID = -1 AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(E.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(CASE WHEN A.REF_CST_TYPE = 2 THEN SUBSTR(F.TABLE_NAME, 7 + INSTR(SUBSTR(F.TABLE_NAME, 7), '_')) ELSE NULL END AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT F WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.PARENT_TABLE_ID = D.TABLE_ID AND D.DATABASE_ID = E.DATABASE_ID AND (A.REF_CST_ID = F.TABLE_ID AND A.REF_CST_TYPE = 2) AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(E.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(CASE WHEN A.REF_CST_TYPE = 1 THEN F.CONSTRAINT_NAME ELSE NULL END AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E, SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT F WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.PARENT_TABLE_ID = D.TABLE_ID AND D.DATABASE_ID = E.DATABASE_ID AND (A.PARENT_TABLE_ID = F.TABLE_ID AND A.REF_CST_TYPE = 1 AND F.CONSTRAINT_TYPE = 1 AND A.REF_CST_ID = F.CONSTRAINT_ID) AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(CONSTRAINT_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST('P' AS VARCHAR2(1)) ELSE CAST('C' AS VARCHAR2(1)) END AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST(NULL AS VARCHAR2(4000)) ELSE CAST(A.CHECK_EXPR AS VARCHAR2(4000)) END AS SEARCH_CONDITION, CAST(NULL AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS INDEX_OWNER, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST(A.CONSTRAINT_NAME AS VARCHAR2(128)) ELSE CAST(NULL AS VARCHAR2(128)) END AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE A.TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND C.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -827,17 +800,16 @@ int ObInnerTableSchema::dba_constraints_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_constraints_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_constraints_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -868,8 +840,7 @@ int ObInnerTableSchema::all_constraints_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('U' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(NULL AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(9)) AS DELETE_RULE, CAST('ENABLED' AS VARCHAR2(8)) AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CAST('VALIDATED' AS VARCHAR2(13)) AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CAST(NULL AS VARCHAR2(4)) AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS INDEX_OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE A.DATA_TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, A.DATA_TABLE_ID, A.DATABASE_ID) = 1) AND A.INDEX_TYPE IN (2, 4, 8) AND C.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.REF_CST_TYPE = 0 AND A.REF_CST_ID = -1 AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND (B.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, B.TABLE_ID, B.DATABASE_ID) = 1) UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(E.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(CASE WHEN A.REF_CST_TYPE = 2 THEN SUBSTR(F.TABLE_NAME, 7 + INSTR(SUBSTR(F.TABLE_NAME, 7), '_')) ELSE NULL END AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT F WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.PARENT_TABLE_ID = D.TABLE_ID AND D.DATABASE_ID = E.DATABASE_ID AND (D.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, D.TABLE_ID, D.DATABASE_ID) = 1) AND (A.REF_CST_ID = F.TABLE_ID AND A.REF_CST_TYPE = 2) AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(E.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(CASE WHEN A.REF_CST_TYPE = 1 THEN F.CONSTRAINT_NAME ELSE NULL END AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E, SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT F WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.PARENT_TABLE_ID = D.TABLE_ID AND D.DATABASE_ID = E.DATABASE_ID AND (D.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, D.TABLE_ID, D.DATABASE_ID) = 1) AND (A.PARENT_TABLE_ID = F.TABLE_ID AND A.REF_CST_TYPE = 1 AND F.CONSTRAINT_TYPE = 1 AND A.REF_CST_ID = F.CONSTRAINT_ID) AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(CONSTRAINT_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST('P' AS VARCHAR2(1)) ELSE CAST('C' AS VARCHAR2(1)) END AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST(NULL AS VARCHAR2(4000)) ELSE CAST(A.CHECK_EXPR AS VARCHAR2(4000)) END AS SEARCH_CONDITION, CAST(NULL AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS INDEX_OWNER, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST(A.CONSTRAINT_NAME AS VARCHAR2(128)) ELSE CAST(NULL AS VARCHAR2(128)) END AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE A.TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND (B.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, B.TABLE_ID, B.DATABASE_ID) = 1) AND C.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('U' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(NULL AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(9)) AS DELETE_RULE, CAST('ENABLED' AS VARCHAR2(8)) AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CAST('VALIDATED' AS VARCHAR2(13)) AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CAST(NULL AS VARCHAR2(4)) AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS INDEX_OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE A.DATA_TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, A.DATA_TABLE_ID, A.DATABASE_ID) = 1) AND A.INDEX_TYPE IN (2, 4, 8) AND C.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.REF_CST_TYPE = 0 AND A.REF_CST_ID = -1 AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND (B.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, B.TABLE_ID, B.DATABASE_ID) = 1) UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(E.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(CASE WHEN A.REF_CST_TYPE = 2 THEN SUBSTR(F.TABLE_NAME, 7 + INSTR(SUBSTR(F.TABLE_NAME, 7), '_')) ELSE NULL END AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT F WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.PARENT_TABLE_ID = D.TABLE_ID AND D.DATABASE_ID = E.DATABASE_ID AND (D.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, D.TABLE_ID, D.DATABASE_ID) = 1) AND (A.REF_CST_ID = F.TABLE_ID AND A.REF_CST_TYPE = 2) AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(E.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(CASE WHEN A.REF_CST_TYPE = 1 THEN F.CONSTRAINT_NAME ELSE NULL END AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E, SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT F WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.PARENT_TABLE_ID = D.TABLE_ID AND D.DATABASE_ID = E.DATABASE_ID AND (D.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, D.TABLE_ID, D.DATABASE_ID) = 1) AND (A.PARENT_TABLE_ID = F.TABLE_ID AND A.REF_CST_TYPE = 1 AND F.CONSTRAINT_TYPE = 1 AND A.REF_CST_ID = F.CONSTRAINT_ID) AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(CONSTRAINT_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST('P' AS VARCHAR2(1)) ELSE CAST('C' AS VARCHAR2(1)) END AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST(NULL AS VARCHAR2(4000)) ELSE CAST(A.CHECK_EXPR AS VARCHAR2(4000)) END AS SEARCH_CONDITION, CAST(NULL AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS INDEX_OWNER, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST(A.CONSTRAINT_NAME AS VARCHAR2(128)) ELSE CAST(NULL AS VARCHAR2(128)) END AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE A.TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND (B.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, B.TABLE_ID, B.DATABASE_ID) = 1) AND C.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -881,17 +852,16 @@ int ObInnerTableSchema::all_constraints_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_constraints_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_constraints_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -922,8 +892,7 @@ int ObInnerTableSchema::user_constraints_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('U' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(NULL AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(9)) AS DELETE_RULE, CAST('ENABLED' AS VARCHAR2(8)) AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CAST('VALIDATED' AS VARCHAR2(13)) AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CAST(NULL AS VARCHAR2(4)) AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS INDEX_OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE A.DATA_TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND A.DATABASE_ID = USERENV('SCHEMAID') AND A.INDEX_TYPE IN (2, 4, 8) AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CAST(NULL AS VARCHAR2(4)) AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.REF_CST_TYPE = 0 AND A.REF_CST_ID = -1 AND B.DATABASE_ID = USERENV('SCHEMAID') AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(E.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(CASE WHEN A.REF_CST_TYPE = 2 THEN SUBSTR(F.TABLE_NAME, 7 + INSTR(SUBSTR(F.TABLE_NAME, 7), '_')) ELSE NULL END AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT F WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.PARENT_TABLE_ID = D.TABLE_ID AND D.DATABASE_ID = E.DATABASE_ID AND (A.REF_CST_ID = F.TABLE_ID AND A.REF_CST_TYPE = 2) AND B.DATABASE_ID = USERENV('SCHEMAID') AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(E.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(CASE WHEN A.REF_CST_TYPE = 1 THEN F.CONSTRAINT_NAME ELSE NULL END AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E, SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT F WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.PARENT_TABLE_ID = D.TABLE_ID AND D.DATABASE_ID = E.DATABASE_ID AND (A.PARENT_TABLE_ID = F.TABLE_ID AND A.REF_CST_TYPE = 1 AND F.CONSTRAINT_TYPE = 1 AND A.REF_CST_ID = F.CONSTRAINT_ID) AND B.DATABASE_ID = USERENV('SCHEMAID') AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(CONSTRAINT_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST('P' AS VARCHAR2(1)) ELSE CAST('C' AS VARCHAR2(1)) END AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST(NULL AS VARCHAR2(4000)) ELSE CAST(A.CHECK_EXPR AS VARCHAR2(4000)) END AS SEARCH_CONDITION, CAST(NULL AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS INDEX_OWNER, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST(A.CONSTRAINT_NAME AS VARCHAR2(128)) ELSE CAST(NULL AS VARCHAR2(128)) END AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE C.DATABASE_ID = USERENV('SCHEMAID') AND A.TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND C.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('U' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(NULL AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(9)) AS DELETE_RULE, CAST('ENABLED' AS VARCHAR2(8)) AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CAST('VALIDATED' AS VARCHAR2(13)) AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CAST(NULL AS VARCHAR2(4)) AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS INDEX_OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE A.DATA_TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND A.DATABASE_ID = USERENV('SCHEMAID') AND A.INDEX_TYPE IN (2, 4, 8) AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CAST(NULL AS VARCHAR2(4)) AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.REF_CST_TYPE = 0 AND A.REF_CST_ID = -1 AND B.DATABASE_ID = USERENV('SCHEMAID') AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(E.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(CASE WHEN A.REF_CST_TYPE = 2 THEN SUBSTR(F.TABLE_NAME, 7 + INSTR(SUBSTR(F.TABLE_NAME, 7), '_')) ELSE NULL END AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT F WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.PARENT_TABLE_ID = D.TABLE_ID AND D.DATABASE_ID = E.DATABASE_ID AND (A.REF_CST_ID = F.TABLE_ID AND A.REF_CST_TYPE = 2) AND B.DATABASE_ID = USERENV('SCHEMAID') AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST('R' AS VARCHAR2(1)) AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS SEARCH_CONDITION, CAST(E.DATABASE_NAME AS VARCHAR2(128)) AS R_OWNER, CAST(CASE WHEN A.REF_CST_TYPE = 1 THEN F.CONSTRAINT_NAME ELSE NULL END AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(CASE WHEN DELETE_ACTION = 1 THEN 'NO ACTION' WHEN DELETE_ACTION = 2 THEN 'CASCADE' ELSE 'SET NULL' END AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(NULL AS VARCHAR2(128)) AS INDEX_OWNER, CAST(NULL AS VARCHAR2(128)) AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E, SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT F WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.PARENT_TABLE_ID = D.TABLE_ID AND D.DATABASE_ID = E.DATABASE_ID AND (A.PARENT_TABLE_ID = F.TABLE_ID AND A.REF_CST_TYPE = 1 AND F.CONSTRAINT_TYPE = 1 AND A.REF_CST_ID = F.CONSTRAINT_ID) AND B.DATABASE_ID = USERENV('SCHEMAID') AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(CONSTRAINT_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST('P' AS VARCHAR2(1)) ELSE CAST('C' AS VARCHAR2(1)) END AS CONSTRAINT_TYPE, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST(NULL AS VARCHAR2(4000)) ELSE CAST(A.CHECK_EXPR AS VARCHAR2(4000)) END AS SEARCH_CONDITION, CAST(NULL AS VARCHAR2(128)) AS R_OWNER, CAST(NULL AS VARCHAR2(128)) AS R_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(9)) AS DELETE_RULE, CASE WHEN A.ENABLE_FLAG = 1 THEN CAST('ENABLED' AS VARCHAR2(8)) ELSE CAST('DISABLED' AS VARCHAR2(8)) END AS STATUS, CAST('NOT DEFERRABLE' AS VARCHAR2(14)) AS DEFERRABLE, CAST('IMMEDIATE' AS VARCHAR2(9)) AS DEFERRED, CASE WHEN A.VALIDATE_FLAG = 1 THEN CAST('VALIDATED' AS VARCHAR2(13)) ELSE CAST('NOT VALIDATED' AS VARCHAR2(13)) END AS VALIDATED, CAST(NULL AS VARCHAR2(14)) AS "GENERATED", CAST(NULL AS VARCHAR2(3)) AS BAD, CASE WHEN A.RELY_FLAG = 1 THEN CAST('RELY' AS VARCHAR2(4)) ELSE CAST(NULL AS VARCHAR2(4)) END AS RELY, CAST(NULL AS DATE) AS LAST_CHANGE, CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS INDEX_OWNER, CASE WHEN A.CONSTRAINT_TYPE = 1 THEN CAST(A.CONSTRAINT_NAME AS VARCHAR2(128)) ELSE CAST(NULL AS VARCHAR2(128)) END AS INDEX_NAME, CAST(NULL AS VARCHAR2(7)) AS INVALID, CAST(NULL AS VARCHAR2(14)) AS VIEW_RELATED FROM SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C WHERE C.DATABASE_ID = USERENV('SCHEMAID') AND A.TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND C.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -935,17 +904,16 @@ int ObInnerTableSchema::user_constraints_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tab_cols_v_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tab_cols_v_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -976,8 +944,7 @@ int ObInnerTableSchema::all_tab_cols_v_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT cast(db.database_name as VARCHAR2(128)) as OWNER, cast(t.table_name as VARCHAR2(128)) as TABLE_NAME, cast(c.column_name as VARCHAR2(128)) as COLUMN_NAME, cast(decode(c.data_type, 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, decode(c.collation_type, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, concat('TIMESTAMP(', concat(c.data_scale, ') WITH TIME ZONE')), 37, concat('TIMESTAMP(', concat(c.data_scale, ') WITH LOCAL TIME ZONE')), 38, concat('TIMESTAMP(', concat(c.data_scale, ')')), 39, 'RAW', 40, concat('INTERVAL YEAR(', concat(c.data_scale, ') TO MONTH')), 41, concat('INTERVAL DAY(', concat(trunc(c.data_scale/10), concat(') TO SECOND(', concat(mod(c.data_scale, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, 'UROWID', 46, '', 'UNDEFINED') as VARCHAR2(128)) as DATA_TYPE, cast(NULL as VARCHAR2(3)) as DATA_TYPE_MOD, cast(NULL as VARCHAR2(128)) as DATA_TYPE_OWNER, cast(c.data_length as NUMBER) as DATA_LENGTH, cast(CASE WHEN c.data_type in (11,12,17,18,19,22,23,27,28,29,30,36,37,38,43,44) THEN NULL ELSE CASE WHEN c.data_precision < 0 THEN NULL ELSE c.data_precision END END as NUMBER) as DATA_PRECISION, cast(CASE WHEN c.data_type in (11,12,17,19,22,23,27,28,29,30,42,43,44) THEN NULL ELSE CASE WHEN c.data_scale < -84 THEN NULL ELSE c.data_scale END END as NUMBER) as DATA_SCALE, cast(decode(c.nullable, 1, 'Y', 'N') as VARCHAR2(1)) as NULLABLE, cast(decode(BITAND(c.column_flags, 64), 0, c.column_id, NULL) as NUMBER) as COLUMN_ID, cast(LENGTHB(c.cur_default_value_v2) as NUMBER) as DEFAULT_LENGTH, cast(c.cur_default_value_v2 as /* TODO: LONG() */ VARCHAR(128)) as DATA_DEFAULT, cast(NULL as NUMBER) as NUM_DISTINCT, cast(NULL as /* TODO: RAW */ varchar(128)) as LOW_VALUE, cast(NULL as /* TODO: RAW */ varchar(128)) as HIGH_VALUE, cast(NULL as NUMBER) as DENSITY, cast(NULL as NUMBER) as NUM_NULLS, cast(NULL as NUMBER) as NUM_BUCKETS, cast(NULL as DATE) as LAST_ANALYZED, cast(NULL as NUMBER) as SAMPLE_SIZE, cast(NULL as VARCHAR2(44)) as CHARACTER_SET_NAME, cast(NULL as NUMBER) as CHAR_COL_DECL_LENGTH, cast(NULL as VARCHAR2(3)) as GLOBAL_STATS, cast(NULL as VARCHAR2(3)) as USER_STATS, cast(NULL as VARCHAR2(80)) as NOTES, cast(NULL as NUMBER) as AVG_COL_LEN, cast(decode(c.data_type, 22, c.data_length, 23, c.data_length, 0) as NUMBER) as CHAR_LENGTH, cast(decode(c.data_type, 22, decode(c.data_precision, 1, 'C', 'B'), 23, decode(c.data_precision, 1, 'C', 'B'), NULL) as VARCHAR2(1)) as CHAR_USED, cast(NULL as VARCHAR2(3)) as V80_FMT_IMAGE, cast(NULL as VARCHAR2(3)) as DATA_UPGRADED, cast(decode(BITAND(c.column_flags, 64), 0, 'NO', 'YES') as VARCHAR2(3)) as HIDDEN_COLUMN, cast(decode(BITAND(c.column_flags, 1), 1, 'YES', 'NO') as VARCHAR2(3)) as VIRTUAL_COLUMN, cast(NULL as NUMBER) as SEGMENT_COLUMN_ID, cast(NULL as NUMBER) as INTERNAL_COLUMN_ID, cast(NULL as VARCHAR2(15)) as HISTOGRAM, cast(c.column_name as VARCHAR2(4000)) as QUALIFIED_COL_NAME, cast('YES' as VARCHAR2(3)) as USER_GENERATED, cast(NULL as VARCHAR2(3)) as DEFAULT_ON_NULL, cast(NULL as VARCHAR2(3)) as IDENTITY_COLUMN, cast(NULL as VARCHAR2(128)) as EVALUATION_EDITION, cast(NULL as VARCHAR2(128)) as UNUSABLE_BEFORE, cast(NULL as VARCHAR2(128)) as UNUSABLE_BEGINNING, cast(NULL as VARCHAR2(100)) as COLLATION, cast(NULL as NUMBER) as COLLATED_COLUMN_ID FROM sys.ALL_VIRTUAL_TABLE_REAL_AGENT t JOIN sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db ON db.tenant_id = t.tenant_id AND db.database_id = t.database_id AND (t.database_id = userenv('SCHEMAID') OR user_can_access_obj(1, t.table_id, t.database_id) = 1) AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN sys.ALL_VIRTUAL_COLUMN_REAL_AGENT c ON c.tenant_id = t.tenant_id AND c.table_id = t.table_id AND C.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE c.is_hidden = 0 AND t.table_type in (0,2,3,8,9) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT cast(db.database_name as VARCHAR2(128)) as OWNER, cast(t.table_name as VARCHAR2(128)) as TABLE_NAME, cast(c.column_name as VARCHAR2(128)) as COLUMN_NAME, cast(decode(c.data_type, 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, decode(c.collation_type, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, concat('TIMESTAMP(', concat(c.data_scale, ') WITH TIME ZONE')), 37, concat('TIMESTAMP(', concat(c.data_scale, ') WITH LOCAL TIME ZONE')), 38, concat('TIMESTAMP(', concat(c.data_scale, ')')), 39, 'RAW', 40, concat('INTERVAL YEAR(', concat(c.data_scale, ') TO MONTH')), 41, concat('INTERVAL DAY(', concat(trunc(c.data_scale/10), concat(') TO SECOND(', concat(mod(c.data_scale, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, 'UROWID', 46, '', 'UNDEFINED') as VARCHAR2(128)) as DATA_TYPE, cast(NULL as VARCHAR2(3)) as DATA_TYPE_MOD, cast(NULL as VARCHAR2(128)) as DATA_TYPE_OWNER, cast(c.data_length as NUMBER) as DATA_LENGTH, cast(CASE WHEN c.data_type in (11,12,17,18,19,22,23,27,28,29,30,36,37,38,43,44) THEN NULL ELSE CASE WHEN c.data_precision < 0 THEN NULL ELSE c.data_precision END END as NUMBER) as DATA_PRECISION, cast(CASE WHEN c.data_type in (11,12,17,19,22,23,27,28,29,30,42,43,44) THEN NULL ELSE CASE WHEN c.data_scale < -84 THEN NULL ELSE c.data_scale END END as NUMBER) as DATA_SCALE, cast(decode(c.nullable, 1, 'Y', 'N') as VARCHAR2(1)) as NULLABLE, cast(decode(BITAND(c.column_flags, 64), 0, c.column_id, NULL) as NUMBER) as COLUMN_ID, cast(LENGTHB(c.cur_default_value_v2) as NUMBER) as DEFAULT_LENGTH, cast(c.cur_default_value_v2 as /* TODO: LONG() */ VARCHAR(128)) as DATA_DEFAULT, cast(NULL as NUMBER) as NUM_DISTINCT, cast(NULL as /* TODO: RAW */ varchar(128)) as LOW_VALUE, cast(NULL as /* TODO: RAW */ varchar(128)) as HIGH_VALUE, cast(NULL as NUMBER) as DENSITY, cast(NULL as NUMBER) as NUM_NULLS, cast(NULL as NUMBER) as NUM_BUCKETS, cast(NULL as DATE) as LAST_ANALYZED, cast(NULL as NUMBER) as SAMPLE_SIZE, cast(NULL as VARCHAR2(44)) as CHARACTER_SET_NAME, cast(NULL as NUMBER) as CHAR_COL_DECL_LENGTH, cast(NULL as VARCHAR2(3)) as GLOBAL_STATS, cast(NULL as VARCHAR2(3)) as USER_STATS, cast(NULL as VARCHAR2(80)) as NOTES, cast(NULL as NUMBER) as AVG_COL_LEN, cast(decode(c.data_type, 22, c.data_length, 23, c.data_length, 0) as NUMBER) as CHAR_LENGTH, cast(decode(c.data_type, 22, decode(c.data_precision, 1, 'C', 'B'), 23, decode(c.data_precision, 1, 'C', 'B'), NULL) as VARCHAR2(1)) as CHAR_USED, cast(NULL as VARCHAR2(3)) as V80_FMT_IMAGE, cast(NULL as VARCHAR2(3)) as DATA_UPGRADED, cast(decode(BITAND(c.column_flags, 64), 0, 'NO', 'YES') as VARCHAR2(3)) as HIDDEN_COLUMN, cast(decode(BITAND(c.column_flags, 1), 1, 'YES', 'NO') as VARCHAR2(3)) as VIRTUAL_COLUMN, cast(NULL as NUMBER) as SEGMENT_COLUMN_ID, cast(NULL as NUMBER) as INTERNAL_COLUMN_ID, cast(NULL as VARCHAR2(15)) as HISTOGRAM, cast(c.column_name as VARCHAR2(4000)) as QUALIFIED_COL_NAME, cast('YES' as VARCHAR2(3)) as USER_GENERATED, cast(NULL as VARCHAR2(3)) as DEFAULT_ON_NULL, cast(NULL as VARCHAR2(3)) as IDENTITY_COLUMN, cast(NULL as VARCHAR2(128)) as EVALUATION_EDITION, cast(NULL as VARCHAR2(128)) as UNUSABLE_BEFORE, cast(NULL as VARCHAR2(128)) as UNUSABLE_BEGINNING, cast(NULL as VARCHAR2(100)) as COLLATION, cast(NULL as NUMBER) as COLLATED_COLUMN_ID FROM sys.ALL_VIRTUAL_TABLE_REAL_AGENT t JOIN sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db ON db.tenant_id = t.tenant_id AND db.database_id = t.database_id AND (t.database_id = userenv('SCHEMAID') OR user_can_access_obj(1, t.table_id, t.database_id) = 1) AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN sys.ALL_VIRTUAL_COLUMN_REAL_AGENT c ON c.tenant_id = t.tenant_id AND c.table_id = t.table_id AND C.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE c.is_hidden = 0 AND t.table_type in (0,2,3,8,9) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -989,17 +956,16 @@ int ObInnerTableSchema::all_tab_cols_v_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_tab_cols_v_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_tab_cols_v_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1030,8 +996,7 @@ int ObInnerTableSchema::dba_tab_cols_v_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT cast(db.database_name as VARCHAR2(128)) as OWNER, cast(t.table_name as VARCHAR2(128)) as TABLE_NAME, cast(c.column_name as VARCHAR2(128)) as COLUMN_NAME, cast(decode(c.data_type, 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, decode(c.collation_type, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, concat('TIMESTAMP(', concat(c.data_scale, ') WITH TIME ZONE')), 37, concat('TIMESTAMP(', concat(c.data_scale, ') WITH LOCAL TIME ZONE')), 38, concat('TIMESTAMP(', concat(c.data_scale, ')')), 39, 'RAW', 40, concat('INTERVAL YEAR(', concat(c.data_scale, ') TO MONTH')), 41, concat('INTERVAL DAY(', concat(trunc(c.data_scale/10), concat(') TO SECOND(', concat(mod(c.data_scale, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, '', 'UNDEFINED') as VARCHAR2(128)) as DATA_TYPE, cast(NULL as VARCHAR2(3)) as DATA_TYPE_MOD, cast(NULL as VARCHAR2(128)) as DATA_TYPE_OWNER, cast(c.data_length as NUMBER) as DATA_LENGTH, cast(CASE WHEN c.data_type in (11,12,17,18,19,22,23,27,28,29,30,36,37,38,43,44) THEN NULL ELSE CASE WHEN c.data_precision < 0 THEN NULL ELSE c.data_precision END END as NUMBER) as DATA_PRECISION, cast(CASE WHEN c.data_type in (11,12,17,19,22,23,27,28,29,30,42,43,44) THEN NULL ELSE CASE WHEN c.data_scale < -84 THEN NULL ELSE c.data_scale END END as NUMBER) as DATA_SCALE, cast(decode(c.nullable, 1, 'Y', 'N') as VARCHAR2(1)) as NULLABLE, cast(decode(BITAND(c.column_flags, 64), 0, c.column_id, NULL) as NUMBER) as COLUMN_ID, cast(LENGTHB(c.cur_default_value_v2) as NUMBER) as DEFAULT_LENGTH, cast(c.cur_default_value_v2 as /* TODO: LONG() */ VARCHAR(128)) as DATA_DEFAULT, cast(NULL as NUMBER) as NUM_DISTINCT, cast(NULL as /* TODO: RAW */ varchar(128)) as LOW_VALUE, cast(NULL as /* TODO: RAW */ varchar(128)) as HIGH_VALUE, cast(NULL as NUMBER) as DENSITY, cast(NULL as NUMBER) as NUM_NULLS, cast(NULL as NUMBER) as NUM_BUCKETS, cast(NULL as DATE) as LAST_ANALYZED, cast(NULL as NUMBER) as SAMPLE_SIZE, cast(NULL as VARCHAR2(44)) as CHARACTER_SET_NAME, cast(NULL as NUMBER) as CHAR_COL_DECL_LENGTH, cast(NULL as VARCHAR2(3)) as GLOBAL_STATS, cast(NULL as VARCHAR2(3)) as USER_STATS, cast(NULL as VARCHAR2(80)) as NOTES, cast(NULL as NUMBER) as AVG_COL_LEN, cast(decode(c.data_type, 22, c.data_length, 23, c.data_length, 0) as NUMBER) as CHAR_LENGTH, cast(decode(c.data_type, 22, decode(c.data_precision, 1, 'C', 'B'), 23, decode(c.data_precision, 1, 'C', 'B'), NULL) as VARCHAR2(1)) as CHAR_USED, cast(NULL as VARCHAR2(3)) as V80_FMT_IMAGE, cast(NULL as VARCHAR2(3)) as DATA_UPGRADED, cast(decode(BITAND(c.column_flags, 64), 0, 'NO', 'YES') as VARCHAR2(3)) as HIDDEN_COLUMN, cast(decode(BITAND(c.column_flags, 1), 1, 'YES', 'NO') as VARCHAR2(3)) as VIRTUAL_COLUMN, cast(NULL as NUMBER) as SEGMENT_COLUMN_ID, cast(NULL as NUMBER) as INTERNAL_COLUMN_ID, cast(NULL as VARCHAR2(15)) as HISTOGRAM, cast(c.column_name as VARCHAR2(4000)) as QUALIFIED_COL_NAME, cast('YES' as VARCHAR2(3)) as USER_GENERATED, cast(NULL as VARCHAR2(3)) as DEFAULT_ON_NULL, cast(NULL as VARCHAR2(3)) as IDENTITY_COLUMN, cast(NULL as VARCHAR2(128)) as EVALUATION_EDITION, cast(NULL as VARCHAR2(128)) as UNUSABLE_BEFORE, cast(NULL as VARCHAR2(128)) as UNUSABLE_BEGINNING, cast(NULL as VARCHAR2(100)) as COLLATION, cast(NULL as NUMBER) as COLLATED_COLUMN_ID FROM sys.ALL_VIRTUAL_TABLE_REAL_AGENT t JOIN sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db ON db.tenant_id = t.tenant_id AND db.database_id = t.database_id AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN sys.ALL_VIRTUAL_COLUMN_REAL_AGENT c ON c.tenant_id = t.tenant_id AND c.table_id = t.table_id AND C.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE c.is_hidden = 0 AND t.table_type in (0,2,3,8,9) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT cast(db.database_name as VARCHAR2(128)) as OWNER, cast(t.table_name as VARCHAR2(128)) as TABLE_NAME, cast(c.column_name as VARCHAR2(128)) as COLUMN_NAME, cast(decode(c.data_type, 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, decode(c.collation_type, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, concat('TIMESTAMP(', concat(c.data_scale, ') WITH TIME ZONE')), 37, concat('TIMESTAMP(', concat(c.data_scale, ') WITH LOCAL TIME ZONE')), 38, concat('TIMESTAMP(', concat(c.data_scale, ')')), 39, 'RAW', 40, concat('INTERVAL YEAR(', concat(c.data_scale, ') TO MONTH')), 41, concat('INTERVAL DAY(', concat(trunc(c.data_scale/10), concat(') TO SECOND(', concat(mod(c.data_scale, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, '', 'UNDEFINED') as VARCHAR2(128)) as DATA_TYPE, cast(NULL as VARCHAR2(3)) as DATA_TYPE_MOD, cast(NULL as VARCHAR2(128)) as DATA_TYPE_OWNER, cast(c.data_length as NUMBER) as DATA_LENGTH, cast(CASE WHEN c.data_type in (11,12,17,18,19,22,23,27,28,29,30,36,37,38,43,44) THEN NULL ELSE CASE WHEN c.data_precision < 0 THEN NULL ELSE c.data_precision END END as NUMBER) as DATA_PRECISION, cast(CASE WHEN c.data_type in (11,12,17,19,22,23,27,28,29,30,42,43,44) THEN NULL ELSE CASE WHEN c.data_scale < -84 THEN NULL ELSE c.data_scale END END as NUMBER) as DATA_SCALE, cast(decode(c.nullable, 1, 'Y', 'N') as VARCHAR2(1)) as NULLABLE, cast(decode(BITAND(c.column_flags, 64), 0, c.column_id, NULL) as NUMBER) as COLUMN_ID, cast(LENGTHB(c.cur_default_value_v2) as NUMBER) as DEFAULT_LENGTH, cast(c.cur_default_value_v2 as /* TODO: LONG() */ VARCHAR(128)) as DATA_DEFAULT, cast(NULL as NUMBER) as NUM_DISTINCT, cast(NULL as /* TODO: RAW */ varchar(128)) as LOW_VALUE, cast(NULL as /* TODO: RAW */ varchar(128)) as HIGH_VALUE, cast(NULL as NUMBER) as DENSITY, cast(NULL as NUMBER) as NUM_NULLS, cast(NULL as NUMBER) as NUM_BUCKETS, cast(NULL as DATE) as LAST_ANALYZED, cast(NULL as NUMBER) as SAMPLE_SIZE, cast(NULL as VARCHAR2(44)) as CHARACTER_SET_NAME, cast(NULL as NUMBER) as CHAR_COL_DECL_LENGTH, cast(NULL as VARCHAR2(3)) as GLOBAL_STATS, cast(NULL as VARCHAR2(3)) as USER_STATS, cast(NULL as VARCHAR2(80)) as NOTES, cast(NULL as NUMBER) as AVG_COL_LEN, cast(decode(c.data_type, 22, c.data_length, 23, c.data_length, 0) as NUMBER) as CHAR_LENGTH, cast(decode(c.data_type, 22, decode(c.data_precision, 1, 'C', 'B'), 23, decode(c.data_precision, 1, 'C', 'B'), NULL) as VARCHAR2(1)) as CHAR_USED, cast(NULL as VARCHAR2(3)) as V80_FMT_IMAGE, cast(NULL as VARCHAR2(3)) as DATA_UPGRADED, cast(decode(BITAND(c.column_flags, 64), 0, 'NO', 'YES') as VARCHAR2(3)) as HIDDEN_COLUMN, cast(decode(BITAND(c.column_flags, 1), 1, 'YES', 'NO') as VARCHAR2(3)) as VIRTUAL_COLUMN, cast(NULL as NUMBER) as SEGMENT_COLUMN_ID, cast(NULL as NUMBER) as INTERNAL_COLUMN_ID, cast(NULL as VARCHAR2(15)) as HISTOGRAM, cast(c.column_name as VARCHAR2(4000)) as QUALIFIED_COL_NAME, cast('YES' as VARCHAR2(3)) as USER_GENERATED, cast(NULL as VARCHAR2(3)) as DEFAULT_ON_NULL, cast(NULL as VARCHAR2(3)) as IDENTITY_COLUMN, cast(NULL as VARCHAR2(128)) as EVALUATION_EDITION, cast(NULL as VARCHAR2(128)) as UNUSABLE_BEFORE, cast(NULL as VARCHAR2(128)) as UNUSABLE_BEGINNING, cast(NULL as VARCHAR2(100)) as COLLATION, cast(NULL as NUMBER) as COLLATED_COLUMN_ID FROM sys.ALL_VIRTUAL_TABLE_REAL_AGENT t JOIN sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db ON db.tenant_id = t.tenant_id AND db.database_id = t.database_id AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN sys.ALL_VIRTUAL_COLUMN_REAL_AGENT c ON c.tenant_id = t.tenant_id AND c.table_id = t.table_id AND C.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE c.is_hidden = 0 AND t.table_type in (0,2,3,8,9) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1043,17 +1008,16 @@ int ObInnerTableSchema::dba_tab_cols_v_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_tab_cols_v_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_tab_cols_v_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1084,8 +1048,7 @@ int ObInnerTableSchema::user_tab_cols_v_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT cast(t.table_name as VARCHAR2(128)) as TABLE_NAME, cast(c.column_name as VARCHAR2(128)) as COLUMN_NAME, cast(decode(c.data_type, 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, decode(c.collation_type, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, concat('TIMESTAMP(', concat(c.data_scale, ') WITH TIME ZONE')), 37, concat('TIMESTAMP(', concat(c.data_scale, ') WITH LOCAL TIME ZONE')), 38, concat('TIMESTAMP(', concat(c.data_scale, ')')), 39, 'RAW', 40, concat('INTERVAL YEAR(', concat(c.data_scale, ') TO MONTH')), 41, concat('INTERVAL DAY(', concat(trunc(c.data_scale/10), concat(') TO SECOND(', concat(mod(c.data_scale, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, '', 'UNDEFINED') as VARCHAR2(128)) as DATA_TYPE, cast(NULL as VARCHAR2(3)) as DATA_TYPE_MOD, cast(NULL as VARCHAR2(128)) as DATA_TYPE_OWNER, cast(c.data_length as NUMBER) as DATA_LENGTH, cast(CASE WHEN c.data_type in (11,12,17,18,19,22,23,27,28,29,30,36,37,38,43,44) THEN NULL ELSE CASE WHEN c.data_precision < 0 THEN NULL ELSE c.data_precision END END as NUMBER) as DATA_PRECISION, cast(CASE WHEN c.data_type in (11,12,17,19,22,23,27,28,29,30,42,43,44) THEN NULL ELSE CASE WHEN c.data_scale < -84 THEN NULL ELSE c.data_scale END END as NUMBER) as DATA_SCALE, cast(decode(c.nullable, 1, 'Y', 'N') as VARCHAR2(1)) as NULLABLE, cast(decode(BITAND(c.column_flags, 64), 0, c.column_id, NULL) as NUMBER) as COLUMN_ID, cast(LENGTHB(c.cur_default_value_v2) as NUMBER) as DEFAULT_LENGTH, cast(c.cur_default_value_v2 as /* TODO: LONG() */ VARCHAR(128)) as DATA_DEFAULT, cast(NULL as NUMBER) as NUM_DISTINCT, cast(NULL as /* TODO: RAW */ varchar(128)) as LOW_VALUE, cast(NULL as /* TODO: RAW */ varchar(128)) as HIGH_VALUE, cast(NULL as NUMBER) as DENSITY, cast(NULL as NUMBER) as NUM_NULLS, cast(NULL as NUMBER) as NUM_BUCKETS, cast(NULL as DATE) as LAST_ANALYZED, cast(NULL as NUMBER) as SAMPLE_SIZE, cast(NULL as VARCHAR2(44)) as CHARACTER_SET_NAME, cast(NULL as NUMBER) as CHAR_COL_DECL_LENGTH, cast(NULL as VARCHAR2(3)) as GLOBAL_STATS, cast(NULL as VARCHAR2(3)) as USER_STATS, cast(NULL as VARCHAR2(80)) as NOTES, cast(NULL as NUMBER) as AVG_COL_LEN, cast(decode(c.data_type, 22, c.data_length, 23, c.data_length, 0) as NUMBER) as CHAR_LENGTH, cast(decode(c.data_type, 22, decode(c.data_precision, 1, 'C', 'B'), 23, decode(c.data_precision, 1, 'C', 'B'), NULL) as VARCHAR2(1)) as CHAR_USED, cast(NULL as VARCHAR2(3)) as V80_FMT_IMAGE, cast(NULL as VARCHAR2(3)) as DATA_UPGRADED, cast(decode(BITAND(c.column_flags, 64), 0, 'NO', 'YES') as VARCHAR2(3)) as HIDDEN_COLUMN, cast(decode(BITAND(c.column_flags, 1), 1, 'YES', 'NO') as VARCHAR2(3)) as VIRTUAL_COLUMN, cast(NULL as NUMBER) as SEGMENT_COLUMN_ID, cast(NULL as NUMBER) as INTERNAL_COLUMN_ID, cast(NULL as VARCHAR2(15)) as HISTOGRAM, cast(c.column_name as VARCHAR2(4000)) as QUALIFIED_COL_NAME, cast('YES' as VARCHAR2(3)) as USER_GENERATED, cast(NULL as VARCHAR2(3)) as DEFAULT_ON_NULL, cast(NULL as VARCHAR2(3)) as IDENTITY_COLUMN, cast(NULL as VARCHAR2(128)) as EVALUATION_EDITION, cast(NULL as VARCHAR2(128)) as UNUSABLE_BEFORE, cast(NULL as VARCHAR2(128)) as UNUSABLE_BEGINNING, cast(NULL as VARCHAR2(100)) as COLLATION, cast(NULL as NUMBER) as COLLATED_COLUMN_ID FROM sys.ALL_VIRTUAL_TABLE_REAL_AGENT t JOIN sys.ALL_VIRTUAL_COLUMN_REAL_AGENT c ON c.tenant_id = t.tenant_id AND c.table_id = t.table_id AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE c.is_hidden = 0 AND t.table_type in (0,2,3,8,9) AND t.database_id = USERENV('SCHEMAID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT cast(t.table_name as VARCHAR2(128)) as TABLE_NAME, cast(c.column_name as VARCHAR2(128)) as COLUMN_NAME, cast(decode(c.data_type, 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, decode(c.collation_type, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, concat('TIMESTAMP(', concat(c.data_scale, ') WITH TIME ZONE')), 37, concat('TIMESTAMP(', concat(c.data_scale, ') WITH LOCAL TIME ZONE')), 38, concat('TIMESTAMP(', concat(c.data_scale, ')')), 39, 'RAW', 40, concat('INTERVAL YEAR(', concat(c.data_scale, ') TO MONTH')), 41, concat('INTERVAL DAY(', concat(trunc(c.data_scale/10), concat(') TO SECOND(', concat(mod(c.data_scale, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, '', 'UNDEFINED') as VARCHAR2(128)) as DATA_TYPE, cast(NULL as VARCHAR2(3)) as DATA_TYPE_MOD, cast(NULL as VARCHAR2(128)) as DATA_TYPE_OWNER, cast(c.data_length as NUMBER) as DATA_LENGTH, cast(CASE WHEN c.data_type in (11,12,17,18,19,22,23,27,28,29,30,36,37,38,43,44) THEN NULL ELSE CASE WHEN c.data_precision < 0 THEN NULL ELSE c.data_precision END END as NUMBER) as DATA_PRECISION, cast(CASE WHEN c.data_type in (11,12,17,19,22,23,27,28,29,30,42,43,44) THEN NULL ELSE CASE WHEN c.data_scale < -84 THEN NULL ELSE c.data_scale END END as NUMBER) as DATA_SCALE, cast(decode(c.nullable, 1, 'Y', 'N') as VARCHAR2(1)) as NULLABLE, cast(decode(BITAND(c.column_flags, 64), 0, c.column_id, NULL) as NUMBER) as COLUMN_ID, cast(LENGTHB(c.cur_default_value_v2) as NUMBER) as DEFAULT_LENGTH, cast(c.cur_default_value_v2 as /* TODO: LONG() */ VARCHAR(128)) as DATA_DEFAULT, cast(NULL as NUMBER) as NUM_DISTINCT, cast(NULL as /* TODO: RAW */ varchar(128)) as LOW_VALUE, cast(NULL as /* TODO: RAW */ varchar(128)) as HIGH_VALUE, cast(NULL as NUMBER) as DENSITY, cast(NULL as NUMBER) as NUM_NULLS, cast(NULL as NUMBER) as NUM_BUCKETS, cast(NULL as DATE) as LAST_ANALYZED, cast(NULL as NUMBER) as SAMPLE_SIZE, cast(NULL as VARCHAR2(44)) as CHARACTER_SET_NAME, cast(NULL as NUMBER) as CHAR_COL_DECL_LENGTH, cast(NULL as VARCHAR2(3)) as GLOBAL_STATS, cast(NULL as VARCHAR2(3)) as USER_STATS, cast(NULL as VARCHAR2(80)) as NOTES, cast(NULL as NUMBER) as AVG_COL_LEN, cast(decode(c.data_type, 22, c.data_length, 23, c.data_length, 0) as NUMBER) as CHAR_LENGTH, cast(decode(c.data_type, 22, decode(c.data_precision, 1, 'C', 'B'), 23, decode(c.data_precision, 1, 'C', 'B'), NULL) as VARCHAR2(1)) as CHAR_USED, cast(NULL as VARCHAR2(3)) as V80_FMT_IMAGE, cast(NULL as VARCHAR2(3)) as DATA_UPGRADED, cast(decode(BITAND(c.column_flags, 64), 0, 'NO', 'YES') as VARCHAR2(3)) as HIDDEN_COLUMN, cast(decode(BITAND(c.column_flags, 1), 1, 'YES', 'NO') as VARCHAR2(3)) as VIRTUAL_COLUMN, cast(NULL as NUMBER) as SEGMENT_COLUMN_ID, cast(NULL as NUMBER) as INTERNAL_COLUMN_ID, cast(NULL as VARCHAR2(15)) as HISTOGRAM, cast(c.column_name as VARCHAR2(4000)) as QUALIFIED_COL_NAME, cast('YES' as VARCHAR2(3)) as USER_GENERATED, cast(NULL as VARCHAR2(3)) as DEFAULT_ON_NULL, cast(NULL as VARCHAR2(3)) as IDENTITY_COLUMN, cast(NULL as VARCHAR2(128)) as EVALUATION_EDITION, cast(NULL as VARCHAR2(128)) as UNUSABLE_BEFORE, cast(NULL as VARCHAR2(128)) as UNUSABLE_BEGINNING, cast(NULL as VARCHAR2(100)) as COLLATION, cast(NULL as NUMBER) as COLLATED_COLUMN_ID FROM sys.ALL_VIRTUAL_TABLE_REAL_AGENT t JOIN sys.ALL_VIRTUAL_COLUMN_REAL_AGENT c ON c.tenant_id = t.tenant_id AND c.table_id = t.table_id AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE c.is_hidden = 0 AND t.table_type in (0,2,3,8,9) AND t.database_id = USERENV('SCHEMAID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1097,17 +1060,16 @@ int ObInnerTableSchema::user_tab_cols_v_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tab_cols_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tab_cols_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1138,8 +1100,7 @@ int ObInnerTableSchema::all_tab_cols_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select OWNER, TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_TYPE_MOD, DATA_TYPE_OWNER, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, COLUMN_ID, DEFAULT_LENGTH, DATA_DEFAULT, NUM_DISTINCT, LOW_VALUE, HIGH_VALUE, DENSITY, NUM_NULLS, NUM_BUCKETS, LAST_ANALYZED, SAMPLE_SIZE, CHARACTER_SET_NAME, CHAR_COL_DECL_LENGTH, GLOBAL_STATS, USER_STATS, AVG_COL_LEN, CHAR_LENGTH, CHAR_USED, V80_FMT_IMAGE, DATA_UPGRADED, HIDDEN_COLUMN, VIRTUAL_COLUMN, SEGMENT_COLUMN_ID, INTERNAL_COLUMN_ID, HISTOGRAM, QUALIFIED_COL_NAME from SYS.all_tab_cols_v$ )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select OWNER, TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_TYPE_MOD, DATA_TYPE_OWNER, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, COLUMN_ID, DEFAULT_LENGTH, DATA_DEFAULT, NUM_DISTINCT, LOW_VALUE, HIGH_VALUE, DENSITY, NUM_NULLS, NUM_BUCKETS, LAST_ANALYZED, SAMPLE_SIZE, CHARACTER_SET_NAME, CHAR_COL_DECL_LENGTH, GLOBAL_STATS, USER_STATS, AVG_COL_LEN, CHAR_LENGTH, CHAR_USED, V80_FMT_IMAGE, DATA_UPGRADED, HIDDEN_COLUMN, VIRTUAL_COLUMN, SEGMENT_COLUMN_ID, INTERNAL_COLUMN_ID, HISTOGRAM, QUALIFIED_COL_NAME from SYS.all_tab_cols_v$ )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1151,17 +1112,16 @@ int ObInnerTableSchema::all_tab_cols_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_tab_cols_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_tab_cols_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1192,8 +1152,7 @@ int ObInnerTableSchema::dba_tab_cols_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( select OWNER, TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_TYPE_MOD, DATA_TYPE_OWNER, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, COLUMN_ID, DEFAULT_LENGTH, DATA_DEFAULT, NUM_DISTINCT, LOW_VALUE, HIGH_VALUE, DENSITY, NUM_NULLS, NUM_BUCKETS, LAST_ANALYZED, SAMPLE_SIZE, CHARACTER_SET_NAME, CHAR_COL_DECL_LENGTH, GLOBAL_STATS, USER_STATS, AVG_COL_LEN, CHAR_LENGTH, CHAR_USED, V80_FMT_IMAGE, DATA_UPGRADED, HIDDEN_COLUMN, VIRTUAL_COLUMN, SEGMENT_COLUMN_ID, INTERNAL_COLUMN_ID, HISTOGRAM, QUALIFIED_COL_NAME from SYS.dba_tab_cols_v$ )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( select OWNER, TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_TYPE_MOD, DATA_TYPE_OWNER, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, COLUMN_ID, DEFAULT_LENGTH, DATA_DEFAULT, NUM_DISTINCT, LOW_VALUE, HIGH_VALUE, DENSITY, NUM_NULLS, NUM_BUCKETS, LAST_ANALYZED, SAMPLE_SIZE, CHARACTER_SET_NAME, CHAR_COL_DECL_LENGTH, GLOBAL_STATS, USER_STATS, AVG_COL_LEN, CHAR_LENGTH, CHAR_USED, V80_FMT_IMAGE, DATA_UPGRADED, HIDDEN_COLUMN, VIRTUAL_COLUMN, SEGMENT_COLUMN_ID, INTERNAL_COLUMN_ID, HISTOGRAM, QUALIFIED_COL_NAME from SYS.dba_tab_cols_v$ )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1205,17 +1164,16 @@ int ObInnerTableSchema::dba_tab_cols_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_tab_cols_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_tab_cols_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1246,8 +1204,7 @@ int ObInnerTableSchema::user_tab_cols_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_TYPE_MOD, DATA_TYPE_OWNER, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, COLUMN_ID, DEFAULT_LENGTH, DATA_DEFAULT, NUM_DISTINCT, LOW_VALUE, HIGH_VALUE, DENSITY, NUM_NULLS, NUM_BUCKETS, LAST_ANALYZED, SAMPLE_SIZE, CHARACTER_SET_NAME, CHAR_COL_DECL_LENGTH, GLOBAL_STATS, USER_STATS, AVG_COL_LEN, CHAR_LENGTH, CHAR_USED, V80_FMT_IMAGE, DATA_UPGRADED, HIDDEN_COLUMN, VIRTUAL_COLUMN, SEGMENT_COLUMN_ID, INTERNAL_COLUMN_ID, HISTOGRAM, QUALIFIED_COL_NAME from SYS.user_tab_cols_v$ )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_TYPE_MOD, DATA_TYPE_OWNER, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, COLUMN_ID, DEFAULT_LENGTH, DATA_DEFAULT, NUM_DISTINCT, LOW_VALUE, HIGH_VALUE, DENSITY, NUM_NULLS, NUM_BUCKETS, LAST_ANALYZED, SAMPLE_SIZE, CHARACTER_SET_NAME, CHAR_COL_DECL_LENGTH, GLOBAL_STATS, USER_STATS, AVG_COL_LEN, CHAR_LENGTH, CHAR_USED, V80_FMT_IMAGE, DATA_UPGRADED, HIDDEN_COLUMN, VIRTUAL_COLUMN, SEGMENT_COLUMN_ID, INTERNAL_COLUMN_ID, HISTOGRAM, QUALIFIED_COL_NAME from SYS.user_tab_cols_v$ )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1259,17 +1216,16 @@ int ObInnerTableSchema::user_tab_cols_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tab_columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tab_columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1300,8 +1256,7 @@ int ObInnerTableSchema::all_tab_columns_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select OWNER, TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_TYPE_MOD, DATA_TYPE_OWNER, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, COLUMN_ID, DEFAULT_LENGTH, DATA_DEFAULT, NUM_DISTINCT, LOW_VALUE, HIGH_VALUE, DENSITY, NUM_NULLS, NUM_BUCKETS, LAST_ANALYZED, SAMPLE_SIZE, CHARACTER_SET_NAME, CHAR_COL_DECL_LENGTH, GLOBAL_STATS, USER_STATS, AVG_COL_LEN, CHAR_LENGTH, CHAR_USED, V80_FMT_IMAGE, DATA_UPGRADED, HISTOGRAM from SYS.ALL_TAB_COLS )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select OWNER, TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_TYPE_MOD, DATA_TYPE_OWNER, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, COLUMN_ID, DEFAULT_LENGTH, DATA_DEFAULT, NUM_DISTINCT, LOW_VALUE, HIGH_VALUE, DENSITY, NUM_NULLS, NUM_BUCKETS, LAST_ANALYZED, SAMPLE_SIZE, CHARACTER_SET_NAME, CHAR_COL_DECL_LENGTH, GLOBAL_STATS, USER_STATS, AVG_COL_LEN, CHAR_LENGTH, CHAR_USED, V80_FMT_IMAGE, DATA_UPGRADED, HISTOGRAM from SYS.ALL_TAB_COLS )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1313,17 +1268,16 @@ int ObInnerTableSchema::all_tab_columns_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_tab_columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_tab_columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1354,8 +1308,7 @@ int ObInnerTableSchema::dba_tab_columns_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( select OWNER, TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_TYPE_MOD, DATA_TYPE_OWNER, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, COLUMN_ID, DEFAULT_LENGTH, DATA_DEFAULT, NUM_DISTINCT, LOW_VALUE, HIGH_VALUE, DENSITY, NUM_NULLS, NUM_BUCKETS, LAST_ANALYZED, SAMPLE_SIZE, CHARACTER_SET_NAME, CHAR_COL_DECL_LENGTH, GLOBAL_STATS, USER_STATS, AVG_COL_LEN, CHAR_LENGTH, CHAR_USED, V80_FMT_IMAGE, DATA_UPGRADED, HISTOGRAM from SYS.DBA_TAB_COLS )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( select OWNER, TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_TYPE_MOD, DATA_TYPE_OWNER, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, COLUMN_ID, DEFAULT_LENGTH, DATA_DEFAULT, NUM_DISTINCT, LOW_VALUE, HIGH_VALUE, DENSITY, NUM_NULLS, NUM_BUCKETS, LAST_ANALYZED, SAMPLE_SIZE, CHARACTER_SET_NAME, CHAR_COL_DECL_LENGTH, GLOBAL_STATS, USER_STATS, AVG_COL_LEN, CHAR_LENGTH, CHAR_USED, V80_FMT_IMAGE, DATA_UPGRADED, HISTOGRAM from SYS.DBA_TAB_COLS )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1367,17 +1320,16 @@ int ObInnerTableSchema::dba_tab_columns_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_tab_columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_tab_columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1408,8 +1360,7 @@ int ObInnerTableSchema::user_tab_columns_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(select TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_TYPE_MOD, DATA_TYPE_OWNER, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, COLUMN_ID, DEFAULT_LENGTH, DATA_DEFAULT, NUM_DISTINCT, LOW_VALUE, HIGH_VALUE, DENSITY, NUM_NULLS, NUM_BUCKETS, LAST_ANALYZED, SAMPLE_SIZE, CHARACTER_SET_NAME, CHAR_COL_DECL_LENGTH, GLOBAL_STATS, USER_STATS, AVG_COL_LEN, CHAR_LENGTH, CHAR_USED, V80_FMT_IMAGE, DATA_UPGRADED, HISTOGRAM from SYS.USER_TAB_COLS )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(select TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_TYPE_MOD, DATA_TYPE_OWNER, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, COLUMN_ID, DEFAULT_LENGTH, DATA_DEFAULT, NUM_DISTINCT, LOW_VALUE, HIGH_VALUE, DENSITY, NUM_NULLS, NUM_BUCKETS, LAST_ANALYZED, SAMPLE_SIZE, CHARACTER_SET_NAME, CHAR_COL_DECL_LENGTH, GLOBAL_STATS, USER_STATS, AVG_COL_LEN, CHAR_LENGTH, CHAR_USED, V80_FMT_IMAGE, DATA_UPGRADED, HISTOGRAM from SYS.USER_TAB_COLS )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1421,17 +1372,16 @@ int ObInnerTableSchema::user_tab_columns_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tables_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tables_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1462,8 +1412,7 @@ int ObInnerTableSchema::all_tables_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(db.database_name AS VARCHAR2(128)) AS OWNER, CAST(t.table_name AS VARCHAR2(128)) AS TABLE_NAME, CAST(tp.tablespace_name AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS VARCHAR2(128)) AS CLUSTER_NAME, CAST(NULL AS VARCHAR2(128)) AS IOT_NAME, CAST('VALID' AS VARCHAR2(8)) AS STATUS, CAST(t."PCTFREE" AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS PCT_USED, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS VARCHAR2(1)) AS BACKED_UP, CAST(info.row_count AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS BLOCKS, CAST(NULL AS NUMBER) AS EMPTY_BLOCKS, CAST(NULL AS NUMBER) AS AVG_SPACE, CAST(NULL AS NUMBER) AS CHAIN_CNT, CAST(NULL AS NUMBER) AS AVG_ROW_LEN, CAST(NULL AS NUMBER) AS AVG_SPACE_FREELIST_BLOCKS, CAST(NULL AS NUMBER) AS NUM_FREELIST_BLOCKS, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(NULL AS VARCHAR2(20)) AS CACHE, CAST(NULL AS VARCHAR2(8)) AS TABLE_LOCK, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST( CASE WHEN t.part_level = 0 THEN 'NO' ELSE 'YES' END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(12)) AS IOT_TYPE, CAST(decode (t.table_type, 8, 'YES', 9, 'YES', 'NO') AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST('NO' AS VARCHAR2(3)) AS NESTED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(8)) AS ROW_MOVEMENT, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST( decode (t.table_type, 8, 'SYS$SESSION', 9, 'SYS$TRANSACTION', NULL) AS VARCHAR2(15)) AS DURATION, CAST(NULL AS VARCHAR2(8)) AS SKIP_CORRUPT, CAST(NULL AS VARCHAR2(3)) AS MONITORING, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_OWNER, CAST(NULL AS VARCHAR2(8)) AS DEPENDENCIES, CAST(NULL AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS VARCHAR2(12)) AS COMPRESS_FOR, CAST( CASE WHEN db.database_name = '__recyclebin' THEN 'YES' ELSE 'NO' END AS VARCHAR2(3)) AS DROPPED, CAST(NULL AS VARCHAR2(3)) AS READ_ONLY, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED, CAST(NULL AS VARCHAR2(7)) AS RESULT_CACHE FROM ( SELECT tenant_id, table_id, SUM(row_count) AS row_count FROM sys.ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT p WHERE p.role = 1 AND P.TENANT_ID = EFFECTIVE_TENANT_ID() GROUP BY tenant_id, table_id ) info RIGHT JOIN sys.ALL_VIRTUAL_TABLE_REAL_AGENT t ON t.tenant_id = info.tenant_id AND t.table_id = info.table_id AND T.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db ON db.tenant_id = t.tenant_id AND db.database_id = t.database_id AND db.database_name != '__recyclebin' AND t.table_type in (3, 8, 9, 11) AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND (t.database_id = USERENV('SCHEMAID') or user_can_access_obj(1, t.table_id, t.database_id) =1) LEFT JOIN sys.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT tp ON tp.tablespace_id = t.tablespace_id AND t.tenant_id = tp.tenant_id AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE t.session_id = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(db.database_name AS VARCHAR2(128)) AS OWNER, CAST(t.table_name AS VARCHAR2(128)) AS TABLE_NAME, CAST(tp.tablespace_name AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS VARCHAR2(128)) AS CLUSTER_NAME, CAST(NULL AS VARCHAR2(128)) AS IOT_NAME, CAST('VALID' AS VARCHAR2(8)) AS STATUS, CAST(t."PCTFREE" AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS PCT_USED, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS VARCHAR2(1)) AS BACKED_UP, CAST(info.row_count AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS BLOCKS, CAST(NULL AS NUMBER) AS EMPTY_BLOCKS, CAST(NULL AS NUMBER) AS AVG_SPACE, CAST(NULL AS NUMBER) AS CHAIN_CNT, CAST(NULL AS NUMBER) AS AVG_ROW_LEN, CAST(NULL AS NUMBER) AS AVG_SPACE_FREELIST_BLOCKS, CAST(NULL AS NUMBER) AS NUM_FREELIST_BLOCKS, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(NULL AS VARCHAR2(20)) AS CACHE, CAST(NULL AS VARCHAR2(8)) AS TABLE_LOCK, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST( CASE WHEN t.part_level = 0 THEN 'NO' ELSE 'YES' END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(12)) AS IOT_TYPE, CAST(decode (t.table_type, 8, 'YES', 9, 'YES', 'NO') AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST('NO' AS VARCHAR2(3)) AS NESTED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(8)) AS ROW_MOVEMENT, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST( decode (t.table_type, 8, 'SYS$SESSION', 9, 'SYS$TRANSACTION', NULL) AS VARCHAR2(15)) AS DURATION, CAST(NULL AS VARCHAR2(8)) AS SKIP_CORRUPT, CAST(NULL AS VARCHAR2(3)) AS MONITORING, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_OWNER, CAST(NULL AS VARCHAR2(8)) AS DEPENDENCIES, CAST(NULL AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS VARCHAR2(12)) AS COMPRESS_FOR, CAST( CASE WHEN db.database_name = '__recyclebin' THEN 'YES' ELSE 'NO' END AS VARCHAR2(3)) AS DROPPED, CAST(NULL AS VARCHAR2(3)) AS READ_ONLY, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED, CAST(NULL AS VARCHAR2(7)) AS RESULT_CACHE FROM ( SELECT tenant_id, table_id, SUM(row_count) AS row_count FROM sys.ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT p WHERE p.role = 1 AND P.TENANT_ID = EFFECTIVE_TENANT_ID() GROUP BY tenant_id, table_id ) info RIGHT JOIN sys.ALL_VIRTUAL_TABLE_REAL_AGENT t ON t.tenant_id = info.tenant_id AND t.table_id = info.table_id AND T.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db ON db.tenant_id = t.tenant_id AND db.database_id = t.database_id AND db.database_name != '__recyclebin' AND t.table_type in (3, 8, 9, 11) AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND (t.database_id = USERENV('SCHEMAID') or user_can_access_obj(1, t.table_id, t.database_id) =1) LEFT JOIN sys.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT tp ON tp.tablespace_id = t.tablespace_id AND t.tenant_id = tp.tenant_id AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE t.session_id = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1475,17 +1424,16 @@ int ObInnerTableSchema::all_tables_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_tables_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_tables_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1516,10 +1464,7 @@ int ObInnerTableSchema::dba_tables_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL( - table_schema - .set_view_definition( - R"__( SELECT CAST(db.database_name AS VARCHAR2(128)) AS OWNER, CAST(t.table_name AS VARCHAR2(128)) AS TABLE_NAME, CAST(tp.tablespace_name AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS VARCHAR2(128)) AS CLUSTER_NAME, CAST(NULL AS VARCHAR2(128)) AS IOT_NAME, CAST('VALID' AS VARCHAR2(8)) AS STATUS, CAST(t."PCTFREE" AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS PCT_USED, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS VARCHAR2(1)) AS BACKED_UP, CAST(info.row_count AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS BLOCKS, CAST(NULL AS NUMBER) AS EMPTY_BLOCKS, CAST(NULL AS NUMBER) AS AVG_SPACE, CAST(NULL AS NUMBER) AS CHAIN_CNT, CAST(NULL AS NUMBER) AS AVG_ROW_LEN, CAST(NULL AS NUMBER) AS AVG_SPACE_FREELIST_BLOCKS, CAST(NULL AS NUMBER) AS NUM_FREELIST_BLOCKS, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(NULL AS VARCHAR2(20)) AS CACHE, CAST(NULL AS VARCHAR2(8)) AS TABLE_LOCK, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST( CASE WHEN t.part_level = 0 THEN 'NO' ELSE 'YES' END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(12)) AS IOT_TYPE, CAST(decode (t.table_type, 8, 'YES', 9, 'YES', 'NO') AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST('NO' AS VARCHAR2(3)) AS NESTED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(8)) AS ROW_MOVEMENT, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST( decode (t.table_type, 8, 'SYS$SESSION', 9, 'SYS$TRANSACTION', NULL) AS VARCHAR2(15)) AS DURATION, CAST(NULL AS VARCHAR2(8)) AS SKIP_CORRUPT, CAST(NULL AS VARCHAR2(3)) AS MONITORING, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_OWNER, CAST(NULL AS VARCHAR2(8)) AS DEPENDENCIES, CAST(NULL AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS VARCHAR2(12)) AS COMPRESS_FOR, CAST( CASE WHEN db.database_name = '__recyclebin' THEN 'YES' ELSE 'NO' END AS VARCHAR2(3)) AS DROPPED, CAST(NULL AS VARCHAR2(3)) AS READ_ONLY, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED, CAST(NULL AS VARCHAR2(7)) AS RESULT_CACHE FROM ( SELECT tenant_id, table_id, SUM(row_count) AS row_count FROM sys.ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT p WHERE p.role = 1 AND P.TENANT_ID = EFFECTIVE_TENANT_ID() GROUP BY tenant_id, table_id ) info RIGHT JOIN sys.ALL_VIRTUAL_TABLE_REAL_AGENT t ON t.tenant_id = info.tenant_id AND t.table_id = info.table_id JOIN sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db ON db.tenant_id = t.tenant_id AND db.database_id = t.database_id AND db.database_name != '__recyclebin' AND t.table_type in (3, 8, 9, 11) AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN sys.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT tp ON tp.tablespace_id = t.tablespace_id AND t.tenant_id = tp.tenant_id AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE t.session_id = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(db.database_name AS VARCHAR2(128)) AS OWNER, CAST(t.table_name AS VARCHAR2(128)) AS TABLE_NAME, CAST(tp.tablespace_name AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS VARCHAR2(128)) AS CLUSTER_NAME, CAST(NULL AS VARCHAR2(128)) AS IOT_NAME, CAST('VALID' AS VARCHAR2(8)) AS STATUS, CAST(t."PCTFREE" AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS PCT_USED, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS VARCHAR2(1)) AS BACKED_UP, CAST(info.row_count AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS BLOCKS, CAST(NULL AS NUMBER) AS EMPTY_BLOCKS, CAST(NULL AS NUMBER) AS AVG_SPACE, CAST(NULL AS NUMBER) AS CHAIN_CNT, CAST(NULL AS NUMBER) AS AVG_ROW_LEN, CAST(NULL AS NUMBER) AS AVG_SPACE_FREELIST_BLOCKS, CAST(NULL AS NUMBER) AS NUM_FREELIST_BLOCKS, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(NULL AS VARCHAR2(20)) AS CACHE, CAST(NULL AS VARCHAR2(8)) AS TABLE_LOCK, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST( CASE WHEN t.part_level = 0 THEN 'NO' ELSE 'YES' END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(12)) AS IOT_TYPE, CAST(decode (t.table_type, 8, 'YES', 9, 'YES', 'NO') AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST('NO' AS VARCHAR2(3)) AS NESTED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(8)) AS ROW_MOVEMENT, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST( decode (t.table_type, 8, 'SYS$SESSION', 9, 'SYS$TRANSACTION', NULL) AS VARCHAR2(15)) AS DURATION, CAST(NULL AS VARCHAR2(8)) AS SKIP_CORRUPT, CAST(NULL AS VARCHAR2(3)) AS MONITORING, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_OWNER, CAST(NULL AS VARCHAR2(8)) AS DEPENDENCIES, CAST(NULL AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS VARCHAR2(12)) AS COMPRESS_FOR, CAST( CASE WHEN db.database_name = '__recyclebin' THEN 'YES' ELSE 'NO' END AS VARCHAR2(3)) AS DROPPED, CAST(NULL AS VARCHAR2(3)) AS READ_ONLY, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED, CAST(NULL AS VARCHAR2(7)) AS RESULT_CACHE FROM ( SELECT tenant_id, table_id, SUM(row_count) AS row_count FROM sys.ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT p WHERE p.role = 1 AND P.TENANT_ID = EFFECTIVE_TENANT_ID() GROUP BY tenant_id, table_id ) info RIGHT JOIN sys.ALL_VIRTUAL_TABLE_REAL_AGENT t ON t.tenant_id = info.tenant_id AND t.table_id = info.table_id JOIN sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db ON db.tenant_id = t.tenant_id AND db.database_id = t.database_id AND db.database_name != '__recyclebin' AND t.table_type in (3, 8, 9, 11) AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN sys.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT tp ON tp.tablespace_id = t.tablespace_id AND t.tenant_id = tp.tenant_id AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE t.session_id = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1531,17 +1476,16 @@ int ObInnerTableSchema::dba_tables_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_tables_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_tables_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1572,9 +1516,7 @@ int ObInnerTableSchema::user_tables_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL( - table_schema - .set_view_definition(R"__( SELECT CAST(t.table_name AS VARCHAR2(128)) AS TABLE_NAME, CAST(tp.tablespace_name AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS VARCHAR2(128)) AS CLUSTER_NAME, CAST(NULL AS VARCHAR2(128)) AS IOT_NAME, CAST('VALID' AS VARCHAR2(8)) AS STATUS, CAST(t."PCTFREE" AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS PCT_USED, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS VARCHAR2(1)) AS BACKED_UP, CAST(info.row_count AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS BLOCKS, CAST(NULL AS NUMBER) AS EMPTY_BLOCKS, CAST(NULL AS NUMBER) AS AVG_SPACE, CAST(NULL AS NUMBER) AS CHAIN_CNT, CAST(NULL AS NUMBER) AS AVG_ROW_LEN, CAST(NULL AS NUMBER) AS AVG_SPACE_FREELIST_BLOCKS, CAST(NULL AS NUMBER) AS NUM_FREELIST_BLOCKS, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(NULL AS VARCHAR2(20)) AS CACHE, CAST(NULL AS VARCHAR2(8)) AS TABLE_LOCK, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST( CASE WHEN t.part_level = 0 THEN 'NO' ELSE 'YES' END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(12)) AS IOT_TYPE, CAST(decode (t.table_type, 8, 'YES', 9, 'YES', 'NO') AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST('NO' AS VARCHAR2(3)) AS NESTED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(8)) AS ROW_MOVEMENT, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST( decode (t.table_type, 8, 'SYS$SESSION', 9, 'SYS$TRANSACTION', NULL) AS VARCHAR2(15)) AS DURATION, CAST(NULL AS VARCHAR2(8)) AS SKIP_CORRUPT, CAST(NULL AS VARCHAR2(3)) AS MONITORING, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_OWNER, CAST(NULL AS VARCHAR2(8)) AS DEPENDENCIES, CAST(NULL AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS VARCHAR2(12)) AS COMPRESS_FOR, CAST( CASE WHEN db.database_name = '__recyclebin' THEN 'YES' ELSE 'NO' END AS VARCHAR2(3)) AS DROPPED, CAST(NULL AS VARCHAR2(3)) AS READ_ONLY, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED, CAST(NULL AS VARCHAR2(7)) AS RESULT_CACHE FROM ( SELECT tenant_id, table_id, SUM(row_count) AS row_count FROM sys.ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT p WHERE p.role = 1 AND P.TENANT_ID = EFFECTIVE_TENANT_ID() GROUP BY tenant_id, table_id ) info RIGHT JOIN sys.ALL_VIRTUAL_TABLE_REAL_AGENT t ON t.tenant_id = info.tenant_id AND t.table_id = info.table_id AND T.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db ON db.tenant_id = t.tenant_id AND db.database_id = t.database_id AND t.database_id = USERENV('SCHEMAID') AND t.table_type in (3, 8, 9, 11) AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN sys.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT tp ON tp.tablespace_id = t.tablespace_id AND t.tenant_id = tp.tenant_id AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE t.session_id = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(t.table_name AS VARCHAR2(128)) AS TABLE_NAME, CAST(tp.tablespace_name AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS VARCHAR2(128)) AS CLUSTER_NAME, CAST(NULL AS VARCHAR2(128)) AS IOT_NAME, CAST('VALID' AS VARCHAR2(8)) AS STATUS, CAST(t."PCTFREE" AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS PCT_USED, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS VARCHAR2(1)) AS BACKED_UP, CAST(info.row_count AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS BLOCKS, CAST(NULL AS NUMBER) AS EMPTY_BLOCKS, CAST(NULL AS NUMBER) AS AVG_SPACE, CAST(NULL AS NUMBER) AS CHAIN_CNT, CAST(NULL AS NUMBER) AS AVG_ROW_LEN, CAST(NULL AS NUMBER) AS AVG_SPACE_FREELIST_BLOCKS, CAST(NULL AS NUMBER) AS NUM_FREELIST_BLOCKS, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(NULL AS VARCHAR2(20)) AS CACHE, CAST(NULL AS VARCHAR2(8)) AS TABLE_LOCK, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST( CASE WHEN t.part_level = 0 THEN 'NO' ELSE 'YES' END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(12)) AS IOT_TYPE, CAST(decode (t.table_type, 8, 'YES', 9, 'YES', 'NO') AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST('NO' AS VARCHAR2(3)) AS NESTED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(8)) AS ROW_MOVEMENT, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST( decode (t.table_type, 8, 'SYS$SESSION', 9, 'SYS$TRANSACTION', NULL) AS VARCHAR2(15)) AS DURATION, CAST(NULL AS VARCHAR2(8)) AS SKIP_CORRUPT, CAST(NULL AS VARCHAR2(3)) AS MONITORING, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_OWNER, CAST(NULL AS VARCHAR2(8)) AS DEPENDENCIES, CAST(NULL AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS VARCHAR2(12)) AS COMPRESS_FOR, CAST( CASE WHEN db.database_name = '__recyclebin' THEN 'YES' ELSE 'NO' END AS VARCHAR2(3)) AS DROPPED, CAST(NULL AS VARCHAR2(3)) AS READ_ONLY, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED, CAST(NULL AS VARCHAR2(7)) AS RESULT_CACHE FROM ( SELECT tenant_id, table_id, SUM(row_count) AS row_count FROM sys.ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT p WHERE p.role = 1 AND P.TENANT_ID = EFFECTIVE_TENANT_ID() GROUP BY tenant_id, table_id ) info RIGHT JOIN sys.ALL_VIRTUAL_TABLE_REAL_AGENT t ON t.tenant_id = info.tenant_id AND t.table_id = info.table_id AND T.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db ON db.tenant_id = t.tenant_id AND db.database_id = t.database_id AND t.database_id = USERENV('SCHEMAID') AND t.table_type in (3, 8, 9, 11) AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN sys.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT tp ON tp.tablespace_id = t.tablespace_id AND t.tenant_id = tp.tenant_id AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE t.session_id = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1586,17 +1528,16 @@ int ObInnerTableSchema::user_tables_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_tab_comments_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_tab_comments_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1627,8 +1568,7 @@ int ObInnerTableSchema::dba_tab_comments_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT A.DATABASE_NAME AS OWNER, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE WHEN TABLE_TYPE = 0 OR TABLE_TYPE = 2 OR TABLE_TYPE = 3 OR TABLE_TYPE = 5 OR TABLE_TYPE = 8 OR TABLE_TYPE = 9 THEN 'TABLE' WHEN TABLE_TYPE = 1 OR TABLE_TYPE = 4 OR TABLE_TYPE = 7 THEN 'VIEW' ELSE NULL END AS VARCHAR2(11)) AS TABLE_TYPE, CAST(B."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT A.DATABASE_NAME AS OWNER, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE WHEN TABLE_TYPE = 0 OR TABLE_TYPE = 2 OR TABLE_TYPE = 3 OR TABLE_TYPE = 5 OR TABLE_TYPE = 8 OR TABLE_TYPE = 9 THEN 'TABLE' WHEN TABLE_TYPE = 1 OR TABLE_TYPE = 4 OR TABLE_TYPE = 7 THEN 'VIEW' ELSE NULL END AS VARCHAR2(11)) AS TABLE_TYPE, CAST(B."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1640,17 +1580,16 @@ int ObInnerTableSchema::dba_tab_comments_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tab_comments_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tab_comments_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1681,8 +1620,7 @@ int ObInnerTableSchema::all_tab_comments_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT A.DATABASE_NAME AS OWNER, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE WHEN TABLE_TYPE = 0 OR TABLE_TYPE = 2 OR TABLE_TYPE = 3 OR TABLE_TYPE = 5 OR TABLE_TYPE = 8 OR TABLE_TYPE = 9 THEN 'TABLE' WHEN TABLE_TYPE = 1 OR TABLE_TYPE = 4 OR TABLE_TYPE = 7 THEN 'VIEW' ELSE NULL END AS VARCHAR2(11)) AS TABLE_TYPE, CAST(B."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, TABLE_ID, A.DATABASE_ID) = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT A.DATABASE_NAME AS OWNER, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE WHEN TABLE_TYPE = 0 OR TABLE_TYPE = 2 OR TABLE_TYPE = 3 OR TABLE_TYPE = 5 OR TABLE_TYPE = 8 OR TABLE_TYPE = 9 THEN 'TABLE' WHEN TABLE_TYPE = 1 OR TABLE_TYPE = 4 OR TABLE_TYPE = 7 THEN 'VIEW' ELSE NULL END AS VARCHAR2(11)) AS TABLE_TYPE, CAST(B."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, TABLE_ID, A.DATABASE_ID) = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1694,17 +1632,16 @@ int ObInnerTableSchema::all_tab_comments_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_tab_comments_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_tab_comments_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1735,8 +1672,7 @@ int ObInnerTableSchema::user_tab_comments_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE WHEN TABLE_TYPE = 0 OR TABLE_TYPE = 2 OR TABLE_TYPE = 3 OR TABLE_TYPE = 5 OR TABLE_TYPE = 8 OR TABLE_TYPE = 9 THEN 'TABLE' WHEN TABLE_TYPE = 1 OR TABLE_TYPE = 4 OR TABLE_TYPE = 7 THEN 'VIEW' ELSE NULL END AS VARCHAR2(11)) AS TABLE_TYPE, CAST(B."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND A.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE WHEN TABLE_TYPE = 0 OR TABLE_TYPE = 2 OR TABLE_TYPE = 3 OR TABLE_TYPE = 5 OR TABLE_TYPE = 8 OR TABLE_TYPE = 9 THEN 'TABLE' WHEN TABLE_TYPE = 1 OR TABLE_TYPE = 4 OR TABLE_TYPE = 7 THEN 'VIEW' ELSE NULL END AS VARCHAR2(11)) AS TABLE_TYPE, CAST(B."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND A.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1748,17 +1684,16 @@ int ObInnerTableSchema::user_tab_comments_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_col_comments_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_col_comments_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1789,8 +1724,7 @@ int ObInnerTableSchema::dba_col_comments_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT A.DATABASE_NAME AS OWNER, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, C.COLUMN_NAME AS COLUMN_NAME, CAST(C."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C WHERE A.DATABASE_ID = B.DATABASE_ID AND B.TABLE_ID = C.TABLE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT A.DATABASE_NAME AS OWNER, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, C.COLUMN_NAME AS COLUMN_NAME, CAST(C."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C WHERE A.DATABASE_ID = B.DATABASE_ID AND B.TABLE_ID = C.TABLE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1802,17 +1736,16 @@ int ObInnerTableSchema::dba_col_comments_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_col_comments_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_col_comments_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1843,8 +1776,7 @@ int ObInnerTableSchema::all_col_comments_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT A.DATABASE_NAME AS OWNER, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, C.COLUMN_NAME AS COLUMN_NAME, CAST(C."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C WHERE A.DATABASE_ID = B.DATABASE_ID AND B.TABLE_ID = C.TABLE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, B.TABLE_ID, B.DATABASE_ID) = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT A.DATABASE_NAME AS OWNER, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, C.COLUMN_NAME AS COLUMN_NAME, CAST(C."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C WHERE A.DATABASE_ID = B.DATABASE_ID AND B.TABLE_ID = C.TABLE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, B.TABLE_ID, B.DATABASE_ID) = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1856,17 +1788,16 @@ int ObInnerTableSchema::all_col_comments_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_col_comments_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_col_comments_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1897,8 +1828,7 @@ int ObInnerTableSchema::user_col_comments_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, C.COLUMN_NAME AS COLUMN_NAME, CAST(C."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C WHERE A.DATABASE_ID = B.DATABASE_ID AND B.TABLE_ID = C.TABLE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND A.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, C.COLUMN_NAME AS COLUMN_NAME, CAST(C."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C WHERE A.DATABASE_ID = B.DATABASE_ID AND B.TABLE_ID = C.TABLE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND A.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1910,17 +1840,16 @@ int ObInnerTableSchema::user_col_comments_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_indexes_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_indexes_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1951,8 +1880,7 @@ int ObInnerTableSchema::dba_indexes_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(INDEX_OWNER AS VARCHAR2(128)) AS OWNER, CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(INDEX_TYPE_NAME AS VARCHAR2(27)) AS INDEX_TYPE, CAST(TABLE_OWNER AS VARCHAR2(128)) AS TABLE_OWNER, CAST(TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST('TABLE' AS CHAR(5)) AS TABLE_TYPE, CAST(UNIQUENESS AS VARCHAR2(9)) AS UNIQUENESS, CAST(COMPRESSION AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS PREFIX_LENGTH, CAST(TABLESPACE_NAME AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS PCT_THRESHOLD, CAST(NULL AS NUMBER) AS INCLUDE_COLUMN, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(STATUS AS VARCHAR2(10)) AS STATUS, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(CASE WHEN A_TABLE_TYPE = 3 THEN 'NO' WHEN A_INDEX_TYPE = 1 OR A_INDEX_TYPE = 2 THEN (CASE WHEN D.PART_LEVEL = 0 THEN 'NO' ELSE 'YES' END) ELSE (CASE WHEN A_PART_LEVEL = 0 THEN 'NO' ELSE 'YES' END) END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS "GENERATED", CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS VARCHAR2(15)) AS DURATION, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(30)) AS ITYP_OWNER, CAST(NULL AS VARCHAR2(30)) AS ITYP_NAME, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(12)) AS DOMIDX_STATUS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(FUNCIDX_STATUS AS VARCHAR2(8)) AS FUNCIDX_STATUS, CAST('NO' AS VARCHAR2(3)) AS JOIN_INDEX, CAST(NULL AS VARCHAR2(3)) AS IOT_REDUNDANT_PKEY_ELIM, CAST(DROPPED AS VARCHAR2(9)) AS DROPPED, CAST(VISIBILITY AS VARCHAR2(10)) AS VISIBILITY, CAST(NULL AS VARCHAR2(14)) AS DOMIDX_MANAGEMENT, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM (SELECT DATABASE_NAME AS INDEX_OWNER, CASE WHEN (TABLE_TYPE = 5 AND B.DATABASE_NAME != '__recyclebin') THEN SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) WHEN (TABLE_TYPE = 5 AND B.DATABASE_NAME = '__recyclebin') THEN TABLE_NAME ELSE (CONS_TAB.CONSTRAINT_NAME) END AS INDEX_NAME, CASE WHEN A.TABLE_TYPE = 5 AND EXISTS ( SELECT 1 FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT T_COL_INDEX, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT T_COL_BASE WHERE T_COL_BASE.TABLE_ID = A.DATA_TABLE_ID AND T_COL_BASE.COLUMN_NAME = T_COL_INDEX.COLUMN_NAME AND T_COL_INDEX.TABLE_ID = A.TABLE_ID AND T_COL_BASE.TENANT_ID = A.TENANT_ID AND T_COL_INDEX.TENANT_ID = A.TENANT_ID AND BITAND(T_COL_BASE.COLUMN_FLAGS,3) > 0 ) THEN 'FUNCTION-BASED NORMAL' ELSE 'NORMAL' END AS INDEX_TYPE_NAME, DATABASE_NAME AS TABLE_OWNER, CASE WHEN (TABLE_TYPE = 3) THEN A.TABLE_ID ELSE A.DATA_TABLE_ID END AS TABLE_ID, A.TABLE_ID AS INDEX_ID, CASE WHEN TABLE_TYPE = 3 THEN 'UNIQUE' WHEN A.INDEX_TYPE IN (2, 4, 8) THEN 'UNIQUE' ELSE 'NONUNIQUE' END AS UNIQUENESS, CASE WHEN A.COMPRESS_FUNC_NAME = NULL THEN 'DISABLED' ELSE 'ENABLED' END AS COMPRESSION, CASE WHEN TABLE_TYPE = 3 THEN 'VALID' WHEN A.INDEX_STATUS = 2 THEN 'VALID' WHEN A.INDEX_STATUS = 3 THEN 'CHECKING' WHEN A.INDEX_STATUS = 4 THEN 'INELEGIBLE' WHEN A.INDEX_STATUS = 5 THEN 'ERROR' ELSE 'UNUSABLE' END AS STATUS, A.INDEX_TYPE AS A_INDEX_TYPE, A.PART_LEVEL AS A_PART_LEVEL, A.TABLE_TYPE AS A_TABLE_TYPE, CASE WHEN 0 = (SELECT COUNT(1) FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT WHERE TABLE_ID = A.TABLE_ID AND IS_HIDDEN = 0 AND TENANT_ID = EFFECTIVE_TENANT_ID()) THEN 'ENABLED' ELSE 'NULL' END AS FUNCIDX_STATUS, CASE WHEN B.DATABASE_NAME = '__recyclebin' THEN 'YES' ELSE 'NO' END AS DROPPED, CASE WHEN BITAND(A.INDEX_ATTRIBUTES_SET, 1) = 0 THEN 'VISIBLE' ELSE 'INVISIBLE' END AS VISIBILITY, A.TABLESPACE_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND TABLE_TYPE IN (5, 3) AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT CONS_TAB ON (CONS_TAB.TABLE_ID = A.TABLE_ID) AND CONS_TAB.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE NOT(TABLE_TYPE = 3 AND CONSTRAINT_NAME IS NULL) AND (CONS_TAB.CONSTRAINT_TYPE IS NULL OR CONS_TAB.CONSTRAINT_TYPE = 1) ) C JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D ON C.TABLE_ID = D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON C.TABLESPACE_ID = TP.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(INDEX_OWNER AS VARCHAR2(128)) AS OWNER, CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(INDEX_TYPE_NAME AS VARCHAR2(27)) AS INDEX_TYPE, CAST(TABLE_OWNER AS VARCHAR2(128)) AS TABLE_OWNER, CAST(TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST('TABLE' AS CHAR(5)) AS TABLE_TYPE, CAST(UNIQUENESS AS VARCHAR2(9)) AS UNIQUENESS, CAST(COMPRESSION AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS PREFIX_LENGTH, CAST(TABLESPACE_NAME AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS PCT_THRESHOLD, CAST(NULL AS NUMBER) AS INCLUDE_COLUMN, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(STATUS AS VARCHAR2(10)) AS STATUS, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(CASE WHEN A_TABLE_TYPE = 3 THEN 'NO' WHEN A_INDEX_TYPE = 1 OR A_INDEX_TYPE = 2 THEN (CASE WHEN D.PART_LEVEL = 0 THEN 'NO' ELSE 'YES' END) ELSE (CASE WHEN A_PART_LEVEL = 0 THEN 'NO' ELSE 'YES' END) END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS "GENERATED", CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS VARCHAR2(15)) AS DURATION, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(30)) AS ITYP_OWNER, CAST(NULL AS VARCHAR2(30)) AS ITYP_NAME, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(12)) AS DOMIDX_STATUS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(FUNCIDX_STATUS AS VARCHAR2(8)) AS FUNCIDX_STATUS, CAST('NO' AS VARCHAR2(3)) AS JOIN_INDEX, CAST(NULL AS VARCHAR2(3)) AS IOT_REDUNDANT_PKEY_ELIM, CAST(DROPPED AS VARCHAR2(9)) AS DROPPED, CAST(VISIBILITY AS VARCHAR2(10)) AS VISIBILITY, CAST(NULL AS VARCHAR2(14)) AS DOMIDX_MANAGEMENT, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM (SELECT DATABASE_NAME AS INDEX_OWNER, CASE WHEN (TABLE_TYPE = 5 AND B.DATABASE_NAME != '__recyclebin') THEN SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) WHEN (TABLE_TYPE = 5 AND B.DATABASE_NAME = '__recyclebin') THEN TABLE_NAME ELSE (CONS_TAB.CONSTRAINT_NAME) END AS INDEX_NAME, CASE WHEN A.TABLE_TYPE = 5 AND EXISTS ( SELECT 1 FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT T_COL_INDEX, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT T_COL_BASE WHERE T_COL_BASE.TABLE_ID = A.DATA_TABLE_ID AND T_COL_BASE.COLUMN_NAME = T_COL_INDEX.COLUMN_NAME AND T_COL_INDEX.TABLE_ID = A.TABLE_ID AND T_COL_BASE.TENANT_ID = A.TENANT_ID AND T_COL_INDEX.TENANT_ID = A.TENANT_ID AND BITAND(T_COL_BASE.COLUMN_FLAGS,3) > 0 ) THEN 'FUNCTION-BASED NORMAL' ELSE 'NORMAL' END AS INDEX_TYPE_NAME, DATABASE_NAME AS TABLE_OWNER, CASE WHEN (TABLE_TYPE = 3) THEN A.TABLE_ID ELSE A.DATA_TABLE_ID END AS TABLE_ID, A.TABLE_ID AS INDEX_ID, CASE WHEN TABLE_TYPE = 3 THEN 'UNIQUE' WHEN A.INDEX_TYPE IN (2, 4, 8) THEN 'UNIQUE' ELSE 'NONUNIQUE' END AS UNIQUENESS, CASE WHEN A.COMPRESS_FUNC_NAME = NULL THEN 'DISABLED' ELSE 'ENABLED' END AS COMPRESSION, CASE WHEN TABLE_TYPE = 3 THEN 'VALID' WHEN A.INDEX_STATUS = 2 THEN 'VALID' WHEN A.INDEX_STATUS = 3 THEN 'CHECKING' WHEN A.INDEX_STATUS = 4 THEN 'INELEGIBLE' WHEN A.INDEX_STATUS = 5 THEN 'ERROR' ELSE 'UNUSABLE' END AS STATUS, A.INDEX_TYPE AS A_INDEX_TYPE, A.PART_LEVEL AS A_PART_LEVEL, A.TABLE_TYPE AS A_TABLE_TYPE, CASE WHEN 0 = (SELECT COUNT(1) FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT WHERE TABLE_ID = A.TABLE_ID AND IS_HIDDEN = 0 AND TENANT_ID = EFFECTIVE_TENANT_ID()) THEN 'ENABLED' ELSE 'NULL' END AS FUNCIDX_STATUS, CASE WHEN B.DATABASE_NAME = '__recyclebin' THEN 'YES' ELSE 'NO' END AS DROPPED, CASE WHEN BITAND(A.INDEX_ATTRIBUTES_SET, 1) = 0 THEN 'VISIBLE' ELSE 'INVISIBLE' END AS VISIBILITY, A.TABLESPACE_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND TABLE_TYPE IN (5, 3) AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT CONS_TAB ON (CONS_TAB.TABLE_ID = A.TABLE_ID) AND CONS_TAB.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE NOT(TABLE_TYPE = 3 AND CONSTRAINT_NAME IS NULL) AND (CONS_TAB.CONSTRAINT_TYPE IS NULL OR CONS_TAB.CONSTRAINT_TYPE = 1) ) C JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D ON C.TABLE_ID = D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON C.TABLESPACE_ID = TP.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1964,17 +1892,16 @@ int ObInnerTableSchema::dba_indexes_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_indexes_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_indexes_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2005,8 +1932,7 @@ int ObInnerTableSchema::all_indexes_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(INDEX_OWNER AS VARCHAR2(128)) AS OWNER, CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(INDEX_TYPE_NAME AS VARCHAR2(27)) AS INDEX_TYPE, CAST(TABLE_OWNER AS VARCHAR2(128)) AS TABLE_OWNER, CAST(TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST('TABLE' AS CHAR(5)) AS TABLE_TYPE, CAST(UNIQUENESS AS VARCHAR2(9)) AS UNIQUENESS, CAST(COMPRESSION AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS PREFIX_LENGTH, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS PCT_THRESHOLD, CAST(NULL AS NUMBER) AS INCLUDE_COLUMN, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(STATUS AS VARCHAR2(10)) AS STATUS, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(CASE WHEN A_TABLE_TYPE = 3 THEN 'NO' WHEN A_INDEX_TYPE = 1 OR A_INDEX_TYPE = 2 THEN (CASE WHEN D.PART_LEVEL = 0 THEN 'NO' ELSE 'YES' END) ELSE (CASE WHEN A_PART_LEVEL = 0 THEN 'NO' ELSE 'YES' END) END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS "GENERATED", CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS VARCHAR2(15)) AS DURATION, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(30)) AS ITYP_OWNER, CAST(NULL AS VARCHAR2(30)) AS ITYP_NAME, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(12)) AS DOMIDX_STATUS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(FUNCIDX_STATUS AS VARCHAR2(8)) AS FUNCIDX_STATUS, CAST('NO' AS VARCHAR2(3)) AS JOIN_INDEX, CAST(NULL AS VARCHAR2(3)) AS IOT_REDUNDANT_PKEY_ELIM, CAST(DROPPED AS VARCHAR2(9)) AS DROPPED, CAST(VISIBILITY AS VARCHAR2(10)) AS VISIBILITY, CAST(NULL AS VARCHAR2(14)) AS DOMIDX_MANAGEMENT, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM (SELECT DATABASE_NAME AS INDEX_OWNER, CASE WHEN (TABLE_TYPE = 5 AND B.DATABASE_NAME != '__recyclebin') THEN SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) WHEN (TABLE_TYPE = 5 AND B.DATABASE_NAME = '__recyclebin') THEN TABLE_NAME ELSE (CONS_TAB.CONSTRAINT_NAME) END AS INDEX_NAME, CASE WHEN A.TABLE_TYPE = 5 AND EXISTS ( SELECT 1 FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT T_COL_INDEX, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT T_COL_BASE WHERE T_COL_BASE.TABLE_ID = A.DATA_TABLE_ID AND T_COL_BASE.COLUMN_NAME = T_COL_INDEX.COLUMN_NAME AND T_COL_INDEX.TABLE_ID = A.TABLE_ID AND T_COL_BASE.TENANT_ID = A.TENANT_ID AND T_COL_INDEX.TENANT_ID = A.TENANT_ID AND BITAND(T_COL_BASE.COLUMN_FLAGS,3) > 0 ) THEN 'FUNCTION-BASED NORMAL' ELSE 'NORMAL' END AS INDEX_TYPE_NAME, DATABASE_NAME AS TABLE_OWNER, CASE WHEN (TABLE_TYPE = 3) THEN A.TABLE_ID ELSE A.DATA_TABLE_ID END AS TABLE_ID, A.TABLE_ID AS INDEX_ID, CASE WHEN TABLE_TYPE = 3 THEN 'UNIQUE' WHEN A.INDEX_TYPE IN (2, 4, 8) THEN 'UNIQUE' ELSE 'NONUNIQUE' END AS UNIQUENESS, CASE WHEN A.COMPRESS_FUNC_NAME = NULL THEN 'DISABLED' ELSE 'ENABLED' END AS COMPRESSION, CASE WHEN TABLE_TYPE = 3 THEN 'VALID' WHEN A.INDEX_STATUS = 2 THEN 'VALID' WHEN A.INDEX_STATUS = 3 THEN 'CHECKING' WHEN A.INDEX_STATUS = 4 THEN 'INELEGIBLE' WHEN A.INDEX_STATUS = 5 THEN 'ERROR' ELSE 'UNUSABLE' END AS STATUS, A.INDEX_TYPE AS A_INDEX_TYPE, A.PART_LEVEL AS A_PART_LEVEL, A.TABLE_TYPE AS A_TABLE_TYPE, CASE WHEN 0 = (SELECT COUNT(1) FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT WHERE TABLE_ID = A.TABLE_ID AND IS_HIDDEN = 0 AND TENANT_ID = EFFECTIVE_TENANT_ID()) THEN 'ENABLED' ELSE 'NULL' END AS FUNCIDX_STATUS, CASE WHEN B.DATABASE_NAME = '__recyclebin' THEN 'YES' ELSE 'NO' END AS DROPPED, CASE WHEN BITAND(A.INDEX_ATTRIBUTES_SET, 1) = 0 THEN 'VISIBLE' ELSE 'INVISIBLE' END AS VISIBILITY, A.TABLESPACE_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, DECODE(TABLE_TYPE, 3, A.TABLE_ID, 5, DATA_TABLE_ID), A.DATABASE_ID) = 1) AND TABLE_TYPE IN (5, 3) LEFT JOIN SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT CONS_TAB ON (CONS_TAB.TABLE_ID = A.TABLE_ID AND CONS_TAB.TENANT_ID = EFFECTIVE_TENANT_ID()) WHERE NOT(TABLE_TYPE = 3 AND CONSTRAINT_NAME IS NULL) AND (CONS_TAB.CONSTRAINT_TYPE IS NULL OR CONS_TAB.CONSTRAINT_TYPE = 1) ) C JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D ON C.TABLE_ID = D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON C.TABLESPACE_ID = TP.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(INDEX_OWNER AS VARCHAR2(128)) AS OWNER, CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(INDEX_TYPE_NAME AS VARCHAR2(27)) AS INDEX_TYPE, CAST(TABLE_OWNER AS VARCHAR2(128)) AS TABLE_OWNER, CAST(TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST('TABLE' AS CHAR(5)) AS TABLE_TYPE, CAST(UNIQUENESS AS VARCHAR2(9)) AS UNIQUENESS, CAST(COMPRESSION AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS PREFIX_LENGTH, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS PCT_THRESHOLD, CAST(NULL AS NUMBER) AS INCLUDE_COLUMN, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(STATUS AS VARCHAR2(10)) AS STATUS, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(CASE WHEN A_TABLE_TYPE = 3 THEN 'NO' WHEN A_INDEX_TYPE = 1 OR A_INDEX_TYPE = 2 THEN (CASE WHEN D.PART_LEVEL = 0 THEN 'NO' ELSE 'YES' END) ELSE (CASE WHEN A_PART_LEVEL = 0 THEN 'NO' ELSE 'YES' END) END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS "GENERATED", CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS VARCHAR2(15)) AS DURATION, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(30)) AS ITYP_OWNER, CAST(NULL AS VARCHAR2(30)) AS ITYP_NAME, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(12)) AS DOMIDX_STATUS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(FUNCIDX_STATUS AS VARCHAR2(8)) AS FUNCIDX_STATUS, CAST('NO' AS VARCHAR2(3)) AS JOIN_INDEX, CAST(NULL AS VARCHAR2(3)) AS IOT_REDUNDANT_PKEY_ELIM, CAST(DROPPED AS VARCHAR2(9)) AS DROPPED, CAST(VISIBILITY AS VARCHAR2(10)) AS VISIBILITY, CAST(NULL AS VARCHAR2(14)) AS DOMIDX_MANAGEMENT, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM (SELECT DATABASE_NAME AS INDEX_OWNER, CASE WHEN (TABLE_TYPE = 5 AND B.DATABASE_NAME != '__recyclebin') THEN SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) WHEN (TABLE_TYPE = 5 AND B.DATABASE_NAME = '__recyclebin') THEN TABLE_NAME ELSE (CONS_TAB.CONSTRAINT_NAME) END AS INDEX_NAME, CASE WHEN A.TABLE_TYPE = 5 AND EXISTS ( SELECT 1 FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT T_COL_INDEX, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT T_COL_BASE WHERE T_COL_BASE.TABLE_ID = A.DATA_TABLE_ID AND T_COL_BASE.COLUMN_NAME = T_COL_INDEX.COLUMN_NAME AND T_COL_INDEX.TABLE_ID = A.TABLE_ID AND T_COL_BASE.TENANT_ID = A.TENANT_ID AND T_COL_INDEX.TENANT_ID = A.TENANT_ID AND BITAND(T_COL_BASE.COLUMN_FLAGS,3) > 0 ) THEN 'FUNCTION-BASED NORMAL' ELSE 'NORMAL' END AS INDEX_TYPE_NAME, DATABASE_NAME AS TABLE_OWNER, CASE WHEN (TABLE_TYPE = 3) THEN A.TABLE_ID ELSE A.DATA_TABLE_ID END AS TABLE_ID, A.TABLE_ID AS INDEX_ID, CASE WHEN TABLE_TYPE = 3 THEN 'UNIQUE' WHEN A.INDEX_TYPE IN (2, 4, 8) THEN 'UNIQUE' ELSE 'NONUNIQUE' END AS UNIQUENESS, CASE WHEN A.COMPRESS_FUNC_NAME = NULL THEN 'DISABLED' ELSE 'ENABLED' END AS COMPRESSION, CASE WHEN TABLE_TYPE = 3 THEN 'VALID' WHEN A.INDEX_STATUS = 2 THEN 'VALID' WHEN A.INDEX_STATUS = 3 THEN 'CHECKING' WHEN A.INDEX_STATUS = 4 THEN 'INELEGIBLE' WHEN A.INDEX_STATUS = 5 THEN 'ERROR' ELSE 'UNUSABLE' END AS STATUS, A.INDEX_TYPE AS A_INDEX_TYPE, A.PART_LEVEL AS A_PART_LEVEL, A.TABLE_TYPE AS A_TABLE_TYPE, CASE WHEN 0 = (SELECT COUNT(1) FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT WHERE TABLE_ID = A.TABLE_ID AND IS_HIDDEN = 0 AND TENANT_ID = EFFECTIVE_TENANT_ID()) THEN 'ENABLED' ELSE 'NULL' END AS FUNCIDX_STATUS, CASE WHEN B.DATABASE_NAME = '__recyclebin' THEN 'YES' ELSE 'NO' END AS DROPPED, CASE WHEN BITAND(A.INDEX_ATTRIBUTES_SET, 1) = 0 THEN 'VISIBLE' ELSE 'INVISIBLE' END AS VISIBILITY, A.TABLESPACE_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, DECODE(TABLE_TYPE, 3, A.TABLE_ID, 5, DATA_TABLE_ID), A.DATABASE_ID) = 1) AND TABLE_TYPE IN (5, 3) LEFT JOIN SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT CONS_TAB ON (CONS_TAB.TABLE_ID = A.TABLE_ID AND CONS_TAB.TENANT_ID = EFFECTIVE_TENANT_ID()) WHERE NOT(TABLE_TYPE = 3 AND CONSTRAINT_NAME IS NULL) AND (CONS_TAB.CONSTRAINT_TYPE IS NULL OR CONS_TAB.CONSTRAINT_TYPE = 1) ) C JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D ON C.TABLE_ID = D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON C.TABLESPACE_ID = TP.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2018,17 +1944,16 @@ int ObInnerTableSchema::all_indexes_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_indexes_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_indexes_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2059,8 +1984,7 @@ int ObInnerTableSchema::user_indexes_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(INDEX_TYPE_NAME AS VARCHAR2(27)) AS INDEX_TYPE, CAST(TABLE_OWNER AS VARCHAR2(128)) AS TABLE_OWNER, CAST(TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST('TABLE' AS CHAR(5)) AS TABLE_TYPE, CAST(UNIQUENESS AS VARCHAR2(9)) AS UNIQUENESS, CAST(COMPRESSION AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS PREFIX_LENGTH, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS PCT_THRESHOLD, CAST(NULL AS NUMBER) AS INCLUDE_COLUMN, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(STATUS AS VARCHAR2(10)) AS STATUS, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(CASE WHEN A_TABLE_TYPE = 3 THEN 'NO' WHEN A_INDEX_TYPE = 1 OR A_INDEX_TYPE = 2 THEN (CASE WHEN D.PART_LEVEL = 0 THEN 'NO' ELSE 'YES' END) ELSE (CASE WHEN A_PART_LEVEL = 0 THEN 'NO' ELSE 'YES' END) END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS "GENERATED", CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS VARCHAR2(15)) AS DURATION, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(30)) AS ITYP_OWNER, CAST(NULL AS VARCHAR2(30)) AS ITYP_NAME, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(12)) AS DOMIDX_STATUS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(FUNCIDX_STATUS AS VARCHAR2(8)) AS FUNCIDX_STATUS, CAST('NO' AS VARCHAR2(3)) AS JOIN_INDEX, CAST(NULL AS VARCHAR2(3)) AS IOT_REDUNDANT_PKEY_ELIM, CAST(DROPPED AS VARCHAR2(9)) AS DROPPED, CAST(VISIBILITY AS VARCHAR2(10)) AS VISIBILITY, CAST(NULL AS VARCHAR2(14)) AS DOMIDX_MANAGEMENT, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM (SELECT DATABASE_NAME AS INDEX_OWNER, CASE WHEN (TABLE_TYPE = 5 AND B.DATABASE_NAME != '__recyclebin') THEN SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) WHEN (TABLE_TYPE = 5 AND B.DATABASE_NAME = '__recyclebin') THEN TABLE_NAME ELSE (CONS_TAB.CONSTRAINT_NAME) END AS INDEX_NAME, CASE WHEN A.TABLE_TYPE = 5 AND EXISTS ( SELECT 1 FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT T_COL_INDEX, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT T_COL_BASE WHERE T_COL_BASE.TABLE_ID = A.DATA_TABLE_ID AND T_COL_BASE.COLUMN_NAME = T_COL_INDEX.COLUMN_NAME AND T_COL_INDEX.TABLE_ID = A.TABLE_ID AND T_COL_BASE.TENANT_ID = A.TENANT_ID AND T_COL_INDEX.TENANT_ID = A.TENANT_ID AND BITAND(T_COL_BASE.COLUMN_FLAGS,3) > 0 ) THEN 'FUNCTION-BASED NORMAL' ELSE 'NORMAL' END AS INDEX_TYPE_NAME, DATABASE_NAME AS TABLE_OWNER, CASE WHEN (TABLE_TYPE = 3) THEN A.TABLE_ID ELSE A.DATA_TABLE_ID END AS TABLE_ID, A.TABLE_ID AS INDEX_ID, CASE WHEN TABLE_TYPE = 3 THEN 'UNIQUE' WHEN A.INDEX_TYPE IN (2, 4, 8) THEN 'UNIQUE' ELSE 'NONUNIQUE' END AS UNIQUENESS, CASE WHEN A.COMPRESS_FUNC_NAME = NULL THEN 'DISABLED' ELSE 'ENABLED' END AS COMPRESSION, CASE WHEN TABLE_TYPE = 3 THEN 'VALID' WHEN A.INDEX_STATUS = 2 THEN 'VALID' WHEN A.INDEX_STATUS = 3 THEN 'CHECKING' WHEN A.INDEX_STATUS = 4 THEN 'INELEGIBLE' WHEN A.INDEX_STATUS = 5 THEN 'ERROR' ELSE 'UNUSABLE' END AS STATUS, A.INDEX_TYPE AS A_INDEX_TYPE, A.PART_LEVEL AS A_PART_LEVEL, A.TABLE_TYPE AS A_TABLE_TYPE, CASE WHEN 0 = (SELECT COUNT(1) FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT WHERE TABLE_ID = A.TABLE_ID AND IS_HIDDEN = 0 AND TENANT_ID = EFFECTIVE_TENANT_ID()) THEN 'ENABLED' ELSE 'NULL' END AS FUNCIDX_STATUS, CASE WHEN B.DATABASE_NAME = '__recyclebin' THEN 'YES' ELSE 'NO' END AS DROPPED, CASE WHEN BITAND(A.INDEX_ATTRIBUTES_SET, 1) = 0 THEN 'VISIBLE' ELSE 'INVISIBLE' END AS VISIBILITY, A.TABLESPACE_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = USERENV('SCHEMAID') AND A.DATABASE_ID = B.DATABASE_ID AND TABLE_TYPE IN (5, 3) AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT CONS_TAB ON (CONS_TAB.TABLE_ID = A.TABLE_ID) AND CONS_TAB.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE NOT(TABLE_TYPE = 3 AND CONSTRAINT_NAME IS NULL) AND (CONS_TAB.CONSTRAINT_TYPE IS NULL OR CONS_TAB.CONSTRAINT_TYPE = 1) ) C JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D ON C.TABLE_ID = D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON C.TABLESPACE_ID = TP.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(INDEX_TYPE_NAME AS VARCHAR2(27)) AS INDEX_TYPE, CAST(TABLE_OWNER AS VARCHAR2(128)) AS TABLE_OWNER, CAST(TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST('TABLE' AS CHAR(5)) AS TABLE_TYPE, CAST(UNIQUENESS AS VARCHAR2(9)) AS UNIQUENESS, CAST(COMPRESSION AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS PREFIX_LENGTH, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS PCT_THRESHOLD, CAST(NULL AS NUMBER) AS INCLUDE_COLUMN, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(STATUS AS VARCHAR2(10)) AS STATUS, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(CASE WHEN A_TABLE_TYPE = 3 THEN 'NO' WHEN A_INDEX_TYPE = 1 OR A_INDEX_TYPE = 2 THEN (CASE WHEN D.PART_LEVEL = 0 THEN 'NO' ELSE 'YES' END) ELSE (CASE WHEN A_PART_LEVEL = 0 THEN 'NO' ELSE 'YES' END) END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS "GENERATED", CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS VARCHAR2(15)) AS DURATION, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(30)) AS ITYP_OWNER, CAST(NULL AS VARCHAR2(30)) AS ITYP_NAME, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(12)) AS DOMIDX_STATUS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(FUNCIDX_STATUS AS VARCHAR2(8)) AS FUNCIDX_STATUS, CAST('NO' AS VARCHAR2(3)) AS JOIN_INDEX, CAST(NULL AS VARCHAR2(3)) AS IOT_REDUNDANT_PKEY_ELIM, CAST(DROPPED AS VARCHAR2(9)) AS DROPPED, CAST(VISIBILITY AS VARCHAR2(10)) AS VISIBILITY, CAST(NULL AS VARCHAR2(14)) AS DOMIDX_MANAGEMENT, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM (SELECT DATABASE_NAME AS INDEX_OWNER, CASE WHEN (TABLE_TYPE = 5 AND B.DATABASE_NAME != '__recyclebin') THEN SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) WHEN (TABLE_TYPE = 5 AND B.DATABASE_NAME = '__recyclebin') THEN TABLE_NAME ELSE (CONS_TAB.CONSTRAINT_NAME) END AS INDEX_NAME, CASE WHEN A.TABLE_TYPE = 5 AND EXISTS ( SELECT 1 FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT T_COL_INDEX, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT T_COL_BASE WHERE T_COL_BASE.TABLE_ID = A.DATA_TABLE_ID AND T_COL_BASE.COLUMN_NAME = T_COL_INDEX.COLUMN_NAME AND T_COL_INDEX.TABLE_ID = A.TABLE_ID AND T_COL_BASE.TENANT_ID = A.TENANT_ID AND T_COL_INDEX.TENANT_ID = A.TENANT_ID AND BITAND(T_COL_BASE.COLUMN_FLAGS,3) > 0 ) THEN 'FUNCTION-BASED NORMAL' ELSE 'NORMAL' END AS INDEX_TYPE_NAME, DATABASE_NAME AS TABLE_OWNER, CASE WHEN (TABLE_TYPE = 3) THEN A.TABLE_ID ELSE A.DATA_TABLE_ID END AS TABLE_ID, A.TABLE_ID AS INDEX_ID, CASE WHEN TABLE_TYPE = 3 THEN 'UNIQUE' WHEN A.INDEX_TYPE IN (2, 4, 8) THEN 'UNIQUE' ELSE 'NONUNIQUE' END AS UNIQUENESS, CASE WHEN A.COMPRESS_FUNC_NAME = NULL THEN 'DISABLED' ELSE 'ENABLED' END AS COMPRESSION, CASE WHEN TABLE_TYPE = 3 THEN 'VALID' WHEN A.INDEX_STATUS = 2 THEN 'VALID' WHEN A.INDEX_STATUS = 3 THEN 'CHECKING' WHEN A.INDEX_STATUS = 4 THEN 'INELEGIBLE' WHEN A.INDEX_STATUS = 5 THEN 'ERROR' ELSE 'UNUSABLE' END AS STATUS, A.INDEX_TYPE AS A_INDEX_TYPE, A.PART_LEVEL AS A_PART_LEVEL, A.TABLE_TYPE AS A_TABLE_TYPE, CASE WHEN 0 = (SELECT COUNT(1) FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT WHERE TABLE_ID = A.TABLE_ID AND IS_HIDDEN = 0 AND TENANT_ID = EFFECTIVE_TENANT_ID()) THEN 'ENABLED' ELSE 'NULL' END AS FUNCIDX_STATUS, CASE WHEN B.DATABASE_NAME = '__recyclebin' THEN 'YES' ELSE 'NO' END AS DROPPED, CASE WHEN BITAND(A.INDEX_ATTRIBUTES_SET, 1) = 0 THEN 'VISIBLE' ELSE 'INVISIBLE' END AS VISIBILITY, A.TABLESPACE_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = USERENV('SCHEMAID') AND A.DATABASE_ID = B.DATABASE_ID AND TABLE_TYPE IN (5, 3) AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT CONS_TAB ON (CONS_TAB.TABLE_ID = A.TABLE_ID) AND CONS_TAB.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE NOT(TABLE_TYPE = 3 AND CONSTRAINT_NAME IS NULL) AND (CONS_TAB.CONSTRAINT_TYPE IS NULL OR CONS_TAB.CONSTRAINT_TYPE = 1) ) C JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT D ON C.TABLE_ID = D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON C.TABLESPACE_ID = TP.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2072,17 +1996,16 @@ int ObInnerTableSchema::user_indexes_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_cons_columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_cons_columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2113,8 +2036,7 @@ int ObInnerTableSchema::dba_cons_columns_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(D.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(D.INDEX_POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT D WHERE A.DATA_TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND D.TABLE_ID = A.TABLE_ID AND A.INDEX_TYPE IN (2, 4, 8) AND C.DATABASE_NAME != '__recyclebin' AND D.IS_HIDDEN = 0 AND D.INDEX_POSITION != 0 AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(E.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(D.POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT D, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT E WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.FOREIGN_KEY_ID = D.FOREIGN_KEY_ID AND D.CHILD_COLUMN_ID = E.COLUMN_ID AND B.TABLE_ID = E.TABLE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(D.CONSTRAINT_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(A.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(B.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(B.ROWKEY_POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT D WHERE A.TABLE_ID = D.TABLE_ID AND D.CONSTRAINT_TYPE = 1 AND A.TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND B.ROWKEY_POSITION > 0 AND C.DATABASE_NAME != '__recyclebin' AND B.IS_HIDDEN = 0 AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(D.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(D.INDEX_POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT D WHERE A.DATA_TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND D.TABLE_ID = A.TABLE_ID AND A.INDEX_TYPE IN (2, 4, 8) AND C.DATABASE_NAME != '__recyclebin' AND D.IS_HIDDEN = 0 AND D.INDEX_POSITION != 0 AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(E.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(D.POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT D, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT E WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.FOREIGN_KEY_ID = D.FOREIGN_KEY_ID AND D.CHILD_COLUMN_ID = E.COLUMN_ID AND B.TABLE_ID = E.TABLE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(D.CONSTRAINT_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(A.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(B.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(B.ROWKEY_POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT D WHERE A.TABLE_ID = D.TABLE_ID AND D.CONSTRAINT_TYPE = 1 AND A.TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND B.ROWKEY_POSITION > 0 AND C.DATABASE_NAME != '__recyclebin' AND B.IS_HIDDEN = 0 AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2126,17 +2048,16 @@ int ObInnerTableSchema::dba_cons_columns_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_cons_columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_cons_columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2167,8 +2088,7 @@ int ObInnerTableSchema::all_cons_columns_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(D.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(D.INDEX_POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT D WHERE A.DATA_TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, A.DATA_TABLE_ID, A.DATABASE_ID) = 1) AND D.TABLE_ID = A.TABLE_ID AND A.INDEX_TYPE IN (2, 4, 8) AND C.DATABASE_NAME != '__recyclebin' AND D.IS_HIDDEN = 0 AND D.INDEX_POSITION != 0 UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(E.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(D.POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT D, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT E WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND (B.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, A.CHILD_TABLE_ID, 1) = 1) AND A.FOREIGN_KEY_ID = D.FOREIGN_KEY_ID AND D.CHILD_COLUMN_ID = E.COLUMN_ID AND B.TABLE_ID = E.TABLE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(D.CONSTRAINT_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(A.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(B.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(B.ROWKEY_POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT D WHERE A.TABLE_ID = D.TABLE_ID AND D.CONSTRAINT_TYPE = 1 AND A.TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, A.TABLE_ID, 1) = 1) AND B.ROWKEY_POSITION > 0 AND C.DATABASE_NAME != '__recyclebin' AND B.IS_HIDDEN = 0 AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(D.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(D.INDEX_POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT D WHERE A.DATA_TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, A.DATA_TABLE_ID, A.DATABASE_ID) = 1) AND D.TABLE_ID = A.TABLE_ID AND A.INDEX_TYPE IN (2, 4, 8) AND C.DATABASE_NAME != '__recyclebin' AND D.IS_HIDDEN = 0 AND D.INDEX_POSITION != 0 UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(E.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(D.POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT D, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT E WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND (B.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, A.CHILD_TABLE_ID, 1) = 1) AND A.FOREIGN_KEY_ID = D.FOREIGN_KEY_ID AND D.CHILD_COLUMN_ID = E.COLUMN_ID AND B.TABLE_ID = E.TABLE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(D.CONSTRAINT_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(A.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(B.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(B.ROWKEY_POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT D WHERE A.TABLE_ID = D.TABLE_ID AND D.CONSTRAINT_TYPE = 1 AND A.TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, A.TABLE_ID, 1) = 1) AND B.ROWKEY_POSITION > 0 AND C.DATABASE_NAME != '__recyclebin' AND B.IS_HIDDEN = 0 AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2180,17 +2100,16 @@ int ObInnerTableSchema::all_cons_columns_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_cons_columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_cons_columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2221,8 +2140,7 @@ int ObInnerTableSchema::user_cons_columns_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(D.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(D.INDEX_POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT D WHERE A.DATA_TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND D.TABLE_ID = A.TABLE_ID AND A.INDEX_TYPE IN (2, 4, 8) AND C.DATABASE_NAME != '__recyclebin' AND D.IS_HIDDEN = 0 AND C.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') AND D.INDEX_POSITION != 0 AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(E.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(D.POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT D, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT E WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.FOREIGN_KEY_ID = D.FOREIGN_KEY_ID AND D.CHILD_COLUMN_ID = E.COLUMN_ID AND B.TABLE_ID = E.TABLE_ID AND C.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(D.CONSTRAINT_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(A.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(B.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(B.ROWKEY_POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT D WHERE A.TABLE_ID = D.TABLE_ID AND D.CONSTRAINT_TYPE = 1 AND A.TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND B.ROWKEY_POSITION > 0 AND C.DATABASE_NAME != '__recyclebin' AND B.IS_HIDDEN = 0 AND C.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(SUBSTR(A.TABLE_NAME, 7 + INSTR(SUBSTR(A.TABLE_NAME, 7), '_')) AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(D.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(D.INDEX_POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT D WHERE A.DATA_TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND D.TABLE_ID = A.TABLE_ID AND A.INDEX_TYPE IN (2, 4, 8) AND C.DATABASE_NAME != '__recyclebin' AND D.IS_HIDDEN = 0 AND C.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') AND D.INDEX_POSITION != 0 AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.FOREIGN_KEY_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(E.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(D.POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT D, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT E WHERE A.CHILD_TABLE_ID = B.TABLE_ID AND B.DATABASE_ID = C.DATABASE_ID AND A.FOREIGN_KEY_ID = D.FOREIGN_KEY_ID AND D.CHILD_COLUMN_ID = E.COLUMN_ID AND B.TABLE_ID = E.TABLE_ID AND C.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST(C.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(D.CONSTRAINT_NAME AS VARCHAR2(128)) AS CONSTRAINT_NAME, CAST(A.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(B.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(B.ROWKEY_POSITION AS NUMBER) AS POSITION FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT B, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT C, SYS.ALL_VIRTUAL_CONSTRAINT_REAL_AGENT D WHERE A.TABLE_ID = D.TABLE_ID AND D.CONSTRAINT_TYPE = 1 AND A.TABLE_ID = B.TABLE_ID AND A.DATABASE_ID = C.DATABASE_ID AND B.ROWKEY_POSITION > 0 AND C.DATABASE_NAME != '__recyclebin' AND B.IS_HIDDEN = 0 AND C.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2234,17 +2152,16 @@ int ObInnerTableSchema::user_cons_columns_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_segments_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_segments_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2275,8 +2192,7 @@ int ObInnerTableSchema::user_segments_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(A.SEGMENT_NAME AS VARCHAR2(128)) AS SEGMENT_NAME ,CAST(A.PARTITION_NAME AS VARCHAR2(128)) AS PARTITION_NAME ,CAST(A.SEGMENT_TYPE AS VARCHAR2(18)) AS SEGMENT_TYPE ,CAST(NULL AS VARCHAR2(10)) AS SEGMENT_SUBTYPE ,CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME ,A.DATA_SIZE AS BYTES ,A.BLOCK_SIZE AS BLOCKS ,CAST(NULL AS NUMBER) AS EXTENTS ,CAST(NULL AS NUMBER) AS INITIAL_EXTENT ,CAST(NULL AS NUMBER) AS NEXT_EXTENT ,CAST(NULL AS NUMBER) AS MIN_EXTENTS ,CAST(NULL AS NUMBER) AS MAX_EXTENTS ,CAST(NULL AS NUMBER) AS MAX_SIZE ,CAST(NULL AS VARCHAR(7)) AS RETENTION ,CAST(NULL AS NUMBER) AS MINRETENTION ,CAST(NULL AS NUMBER) AS PCT_INCREASE ,CAST(NULL AS NUMBER) AS FREELISTS ,CAST(NULL AS NUMBER) AS FREELIST_GROUPS ,CAST('DEFAULT' AS VARCHAR2(7)) AS BUFFER_POOL ,CAST('DEFAULT' AS VARCHAR2(7)) AS FLASH_CACHE ,CAST('DEFAULT' AS VARCHAR2(7)) AS CELL_FLASH_CACHE FROM ( SELECT T.TABLE_ID ,T.DATABASE_ID ,T.TABLE_NAME SEGMENT_NAME ,NULL PARTITION_NAME ,CASE WHEN T.TABLE_TYPE IN (0,2,3,6,8,9,10) THEN 'TABLE' WHEN T.TABLE_TYPE IN (1,4) THEN 'VIEW' WHEN T.TABLE_TYPE IN (5) THEN 'INDEX' WHEN T.TABLE_TYPE IN (7) THEN 'MATERIALIZED VIEW' ELSE NULL END AS SEGMENT_TYPE ,T.BLOCK_SIZE ,MT.DATA_SIZE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT MT ON T.TABLE_ID = MT.TABLE_ID WHERE T.PART_LEVEL=0 AND MT.ROLE = 1 AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND MT.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT T.TABLE_ID ,T.DATABASE_ID ,T.TABLE_NAME SEGMENT_NAME ,P.PART_NAME PARTITION_NAME ,'TABLE PARTITION' AS SEGMENT_TYPE ,T.BLOCK_SIZE ,MT.DATA_SIZE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT P ON T.TABLE_ID = P.TABLE_ID JOIN SYS.ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT MT ON T.TABLE_ID = MT.TABLE_ID AND P.PART_ID = MT.PARTITION_ID WHERE T.PART_LEVEL=1 AND MT.ROLE = 1 AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() AND MT.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT T.TABLE_ID ,T.DATABASE_ID ,T.TABLE_NAME SEGMENT_NAME ,SUBP.SUB_PART_NAME PARTITION_NAME ,'TABLE SUBPARTITION' AS OBJECT_TYPE ,T.BLOCK_SIZE ,MT.DATA_SIZE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT P ON T.TABLE_ID =P.TABLE_ID JOIN SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT SUBP ON P.TABLE_ID=SUBP.TABLE_ID AND P.PART_ID =SUBP.PART_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() AND SUBP.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN (SELECT A.PARTITION_ID,A.TABLE_ID,A.DATA_SIZE,A.PART_ID,PARTITION_ID - 1152921504606846976 - PART_ID *4294967296 - 268435456 AS SUB_PART_ID FROM (SELECT A.PARTITION_ID,A.TABLE_ID,A.DATA_SIZE,FLOOR((PARTITION_ID - 1152921504606846976 - 268435456)/4294967296) AS PART_ID FROM SYS.ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT A WHERE A.PARTITION_ID != 0 AND A.ROLE = 1 AND A.TENANT_ID = EFFECTIVE_TENANT_ID())A) MT ON SUBP.TABLE_ID = MT.TABLE_ID AND SUBP.PART_ID = MT.PART_ID AND SUBP.SUB_PART_ID=MT.SUB_PART_ID WHERE T.PART_LEVEL=2 )A WHERE DATABASE_ID=USERENV('SCHEMAID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(A.SEGMENT_NAME AS VARCHAR2(128)) AS SEGMENT_NAME ,CAST(A.PARTITION_NAME AS VARCHAR2(128)) AS PARTITION_NAME ,CAST(A.SEGMENT_TYPE AS VARCHAR2(18)) AS SEGMENT_TYPE ,CAST(NULL AS VARCHAR2(10)) AS SEGMENT_SUBTYPE ,CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME ,A.DATA_SIZE AS BYTES ,A.BLOCK_SIZE AS BLOCKS ,CAST(NULL AS NUMBER) AS EXTENTS ,CAST(NULL AS NUMBER) AS INITIAL_EXTENT ,CAST(NULL AS NUMBER) AS NEXT_EXTENT ,CAST(NULL AS NUMBER) AS MIN_EXTENTS ,CAST(NULL AS NUMBER) AS MAX_EXTENTS ,CAST(NULL AS NUMBER) AS MAX_SIZE ,CAST(NULL AS VARCHAR(7)) AS RETENTION ,CAST(NULL AS NUMBER) AS MINRETENTION ,CAST(NULL AS NUMBER) AS PCT_INCREASE ,CAST(NULL AS NUMBER) AS FREELISTS ,CAST(NULL AS NUMBER) AS FREELIST_GROUPS ,CAST('DEFAULT' AS VARCHAR2(7)) AS BUFFER_POOL ,CAST('DEFAULT' AS VARCHAR2(7)) AS FLASH_CACHE ,CAST('DEFAULT' AS VARCHAR2(7)) AS CELL_FLASH_CACHE FROM ( SELECT T.TABLE_ID ,T.DATABASE_ID ,T.TABLE_NAME SEGMENT_NAME ,NULL PARTITION_NAME ,CASE WHEN T.TABLE_TYPE IN (0,2,3,6,8,9,10) THEN 'TABLE' WHEN T.TABLE_TYPE IN (1,4) THEN 'VIEW' WHEN T.TABLE_TYPE IN (5) THEN 'INDEX' WHEN T.TABLE_TYPE IN (7) THEN 'MATERIALIZED VIEW' ELSE NULL END AS SEGMENT_TYPE ,T.BLOCK_SIZE ,MT.DATA_SIZE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT MT ON T.TABLE_ID = MT.TABLE_ID WHERE T.PART_LEVEL=0 AND MT.ROLE = 1 AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND MT.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT T.TABLE_ID ,T.DATABASE_ID ,T.TABLE_NAME SEGMENT_NAME ,P.PART_NAME PARTITION_NAME ,'TABLE PARTITION' AS SEGMENT_TYPE ,T.BLOCK_SIZE ,MT.DATA_SIZE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT P ON T.TABLE_ID = P.TABLE_ID JOIN SYS.ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT MT ON T.TABLE_ID = MT.TABLE_ID AND P.PART_ID = MT.PARTITION_ID WHERE T.PART_LEVEL=1 AND MT.ROLE = 1 AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() AND MT.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT T.TABLE_ID ,T.DATABASE_ID ,T.TABLE_NAME SEGMENT_NAME ,SUBP.SUB_PART_NAME PARTITION_NAME ,'TABLE SUBPARTITION' AS OBJECT_TYPE ,T.BLOCK_SIZE ,MT.DATA_SIZE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT P ON T.TABLE_ID =P.TABLE_ID JOIN SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT SUBP ON P.TABLE_ID=SUBP.TABLE_ID AND P.PART_ID =SUBP.PART_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() AND SUBP.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN (SELECT A.PARTITION_ID,A.TABLE_ID,A.DATA_SIZE,A.PART_ID,PARTITION_ID - 1152921504606846976 - PART_ID *4294967296 - 268435456 AS SUB_PART_ID FROM (SELECT A.PARTITION_ID,A.TABLE_ID,A.DATA_SIZE,FLOOR((PARTITION_ID - 1152921504606846976 - 268435456)/4294967296) AS PART_ID FROM SYS.ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT A WHERE A.PARTITION_ID != 0 AND A.ROLE = 1 AND A.TENANT_ID = EFFECTIVE_TENANT_ID())A) MT ON SUBP.TABLE_ID = MT.TABLE_ID AND SUBP.PART_ID = MT.PART_ID AND SUBP.SUB_PART_ID=MT.SUB_PART_ID WHERE T.PART_LEVEL=2 )A WHERE DATABASE_ID=USERENV('SCHEMAID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2288,17 +2204,16 @@ int ObInnerTableSchema::user_segments_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_segments_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_segments_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2329,8 +2244,7 @@ int ObInnerTableSchema::dba_segments_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT B.DATABASE_NAME OWNER ,CAST(A.SEGMENT_NAME AS VARCHAR2(128)) AS SEGMENT_NAME ,CAST(A.PARTITION_NAME AS VARCHAR2(128)) AS PARTITION_NAME ,CAST(A.SEGMENT_TYPE AS VARCHAR2(18)) AS SEGMENT_TYPE ,CAST(NULL AS VARCHAR2(10)) AS SEGMENT_SUBTYPE ,CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME ,CAST(NULL AS NUMBER) AS HEADER_FILE ,CAST(NULL AS NUMBER) AS HEADER_BLOCK ,A.DATA_SIZE AS BYTES ,A.BLOCK_SIZE AS BLOCKS ,CAST(NULL AS NUMBER) AS EXTENTS ,CAST(NULL AS NUMBER) AS INITIAL_EXTENT ,CAST(NULL AS NUMBER) AS NEXT_EXTENT ,CAST(NULL AS NUMBER) AS MIN_EXTENTS ,CAST(NULL AS NUMBER) AS MAX_EXTENTS ,CAST(NULL AS NUMBER) AS MAX_SIZE ,CAST(NULL AS VARCHAR(7)) AS RETENTION ,CAST(NULL AS NUMBER) AS MINRETENTION ,CAST(NULL AS NUMBER) AS PCT_INCREASE ,CAST(NULL AS NUMBER) AS FREELISTS ,CAST(NULL AS NUMBER) AS FREELIST_GROUPS ,CAST(NULL AS NUMBER) AS RELATIVE_FNO ,CAST('DEFAULT' AS VARCHAR2(7)) AS BUFFER_POOL ,CAST('DEFAULT' AS VARCHAR2(7)) AS FLASH_CACHE ,CAST('DEFAULT' AS VARCHAR2(7)) AS CELL_FLASH_CACHE FROM ( SELECT T.TABLE_ID ,T.DATABASE_ID ,T.TABLE_NAME SEGMENT_NAME ,NULL PARTITION_NAME ,CASE WHEN T.TABLE_TYPE IN (0,2,3,6,8,9,10) THEN 'TABLE' WHEN T.TABLE_TYPE IN (1,4) THEN 'VIEW' WHEN T.TABLE_TYPE IN (5) THEN 'INDEX' WHEN T.TABLE_TYPE IN (7) THEN 'MATERIALIZED VIEW' ELSE NULL END AS SEGMENT_TYPE ,T.BLOCK_SIZE ,MT.DATA_SIZE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT MT ON T.TABLE_ID = MT.TABLE_ID WHERE T.PART_LEVEL=0 AND MT.ROLE = 1 AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND MT.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT T.TABLE_ID ,T.DATABASE_ID ,T.TABLE_NAME SEGMENT_NAME ,P.PART_NAME PARTITION_NAME ,'TABLE PARTITION' AS SEGMENT_TYPE ,T.BLOCK_SIZE ,MT.DATA_SIZE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT P ON T.TABLE_ID = P.TABLE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT MT ON T.TABLE_ID = MT.TABLE_ID AND P.PART_ID = MT.PARTITION_ID WHERE T.PART_LEVEL=1 AND MT.ROLE = 1 AND MT.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT T.TABLE_ID ,T.DATABASE_ID ,T.TABLE_NAME SEGMENT_NAME ,SUBP.SUB_PART_NAME PARTITION_NAME ,'TABLE SUBPARTITION' AS OBJECT_TYPE ,T.BLOCK_SIZE ,MT.DATA_SIZE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT P ON T.TABLE_ID =P.TABLE_ID JOIN SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT SUBP ON P.TABLE_ID=SUBP.TABLE_ID AND P.PART_ID =SUBP.PART_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() AND SUBP.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN (SELECT A.PARTITION_ID,A.TABLE_ID,A.DATA_SIZE,A.PART_ID,PARTITION_ID - 1152921504606846976 - PART_ID *4294967296 - 268435456 AS SUB_PART_ID FROM (SELECT A.PARTITION_ID,A.TABLE_ID,A.DATA_SIZE,FLOOR((PARTITION_ID - 1152921504606846976 - 268435456)/4294967296) AS PART_ID FROM SYS.ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT A WHERE A.PARTITION_ID != 0 AND A.ROLE = 1 AND A.TENANT_ID = EFFECTIVE_TENANT_ID())A) MT ON SUBP.TABLE_ID = MT.TABLE_ID AND SUBP.PART_ID = MT.PART_ID AND SUBP.SUB_PART_ID=MT.SUB_PART_ID WHERE T.PART_LEVEL=2 ) A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND B.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT B.DATABASE_NAME OWNER ,CAST(A.SEGMENT_NAME AS VARCHAR2(128)) AS SEGMENT_NAME ,CAST(A.PARTITION_NAME AS VARCHAR2(128)) AS PARTITION_NAME ,CAST(A.SEGMENT_TYPE AS VARCHAR2(18)) AS SEGMENT_TYPE ,CAST(NULL AS VARCHAR2(10)) AS SEGMENT_SUBTYPE ,CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME ,CAST(NULL AS NUMBER) AS HEADER_FILE ,CAST(NULL AS NUMBER) AS HEADER_BLOCK ,A.DATA_SIZE AS BYTES ,A.BLOCK_SIZE AS BLOCKS ,CAST(NULL AS NUMBER) AS EXTENTS ,CAST(NULL AS NUMBER) AS INITIAL_EXTENT ,CAST(NULL AS NUMBER) AS NEXT_EXTENT ,CAST(NULL AS NUMBER) AS MIN_EXTENTS ,CAST(NULL AS NUMBER) AS MAX_EXTENTS ,CAST(NULL AS NUMBER) AS MAX_SIZE ,CAST(NULL AS VARCHAR(7)) AS RETENTION ,CAST(NULL AS NUMBER) AS MINRETENTION ,CAST(NULL AS NUMBER) AS PCT_INCREASE ,CAST(NULL AS NUMBER) AS FREELISTS ,CAST(NULL AS NUMBER) AS FREELIST_GROUPS ,CAST(NULL AS NUMBER) AS RELATIVE_FNO ,CAST('DEFAULT' AS VARCHAR2(7)) AS BUFFER_POOL ,CAST('DEFAULT' AS VARCHAR2(7)) AS FLASH_CACHE ,CAST('DEFAULT' AS VARCHAR2(7)) AS CELL_FLASH_CACHE FROM ( SELECT T.TABLE_ID ,T.DATABASE_ID ,T.TABLE_NAME SEGMENT_NAME ,NULL PARTITION_NAME ,CASE WHEN T.TABLE_TYPE IN (0,2,3,6,8,9,10) THEN 'TABLE' WHEN T.TABLE_TYPE IN (1,4) THEN 'VIEW' WHEN T.TABLE_TYPE IN (5) THEN 'INDEX' WHEN T.TABLE_TYPE IN (7) THEN 'MATERIALIZED VIEW' ELSE NULL END AS SEGMENT_TYPE ,T.BLOCK_SIZE ,MT.DATA_SIZE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT MT ON T.TABLE_ID = MT.TABLE_ID WHERE T.PART_LEVEL=0 AND MT.ROLE = 1 AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND MT.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT T.TABLE_ID ,T.DATABASE_ID ,T.TABLE_NAME SEGMENT_NAME ,P.PART_NAME PARTITION_NAME ,'TABLE PARTITION' AS SEGMENT_TYPE ,T.BLOCK_SIZE ,MT.DATA_SIZE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT P ON T.TABLE_ID = P.TABLE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT MT ON T.TABLE_ID = MT.TABLE_ID AND P.PART_ID = MT.PARTITION_ID WHERE T.PART_LEVEL=1 AND MT.ROLE = 1 AND MT.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT T.TABLE_ID ,T.DATABASE_ID ,T.TABLE_NAME SEGMENT_NAME ,SUBP.SUB_PART_NAME PARTITION_NAME ,'TABLE SUBPARTITION' AS OBJECT_TYPE ,T.BLOCK_SIZE ,MT.DATA_SIZE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT P ON T.TABLE_ID =P.TABLE_ID JOIN SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT SUBP ON P.TABLE_ID=SUBP.TABLE_ID AND P.PART_ID =SUBP.PART_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND P.TENANT_ID = EFFECTIVE_TENANT_ID() AND SUBP.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN (SELECT A.PARTITION_ID,A.TABLE_ID,A.DATA_SIZE,A.PART_ID,PARTITION_ID - 1152921504606846976 - PART_ID *4294967296 - 268435456 AS SUB_PART_ID FROM (SELECT A.PARTITION_ID,A.TABLE_ID,A.DATA_SIZE,FLOOR((PARTITION_ID - 1152921504606846976 - 268435456)/4294967296) AS PART_ID FROM SYS.ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT A WHERE A.PARTITION_ID != 0 AND A.ROLE = 1 AND A.TENANT_ID = EFFECTIVE_TENANT_ID())A) MT ON SUBP.TABLE_ID = MT.TABLE_ID AND SUBP.PART_ID = MT.PART_ID AND SUBP.SUB_PART_ID=MT.SUB_PART_ID WHERE T.PART_LEVEL=2 ) A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND B.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2342,17 +2256,16 @@ int ObInnerTableSchema::dba_segments_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_types_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_types_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2383,8 +2296,7 @@ int ObInnerTableSchema::dba_types_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT D.DATABASE_NAME AS OWNER, T.TYPE_NAME AS TYPE_NAME, T.TYPE_ID AS TYPE_OID, CAST( CASE T.TYPECODE WHEN 1 THEN 'COLLECTION' WHEN 2 THEN 'OBJECT' END AS VARCHAR2(10)) AS TYPECODE, T.ATTRIBUTES AS ATTRIBUTES, T.METHODS AS METHODS, CAST('NO' AS CHAR(2)) AS PREDEFINED, CAST('NO' AS CHAR(2)) AS INCOMPLETE, CAST('YES' AS CHAR(3)) AS FINAL, CAST('YES' AS CHAR(3)) AS INSTANTIABLE, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_OWNER, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_NAME, T.LOCAL_ATTRS AS LOCAL_ATTRIBUTES, T.LOCAL_METHODS AS LOCAL_METHODS, T.TYPE_ID AS TYPEID FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON D.DATABASE_ID = T.DATABASE_ID AND T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, TS.TYPE_NAME AS TYPE_NAME, TS.TYPE_ID AS TYPE_OID, CAST( CASE TS.TYPECODE WHEN 1 THEN 'COLLECTION' WHEN 2 THEN 'OBJECT' END AS VARCHAR2(10)) AS TYPECODE, TS.ATTRIBUTES AS ATTRIBUTES, TS.METHODS AS METHODS, CAST('NO' AS CHAR(2)) AS PREDEFINED, CAST('NO' AS CHAR(2)) AS INCOMPLETE, CAST('YES' AS CHAR(3)) AS FINAL, CAST('YES' AS CHAR(3)) AS INSTANTIABLE, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_OWNER, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_NAME, TS.LOCAL_ATTRS AS LOCAL_ATTRIBUTES, TS.LOCAL_METHODS AS LOCAL_METHODS, TS.TYPE_ID AS TYPEID FROM SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT D.DATABASE_NAME AS OWNER, T.TYPE_NAME AS TYPE_NAME, T.TYPE_ID AS TYPE_OID, CAST( CASE T.TYPECODE WHEN 1 THEN 'COLLECTION' WHEN 2 THEN 'OBJECT' END AS VARCHAR2(10)) AS TYPECODE, T.ATTRIBUTES AS ATTRIBUTES, T.METHODS AS METHODS, CAST('NO' AS CHAR(2)) AS PREDEFINED, CAST('NO' AS CHAR(2)) AS INCOMPLETE, CAST('YES' AS CHAR(3)) AS FINAL, CAST('YES' AS CHAR(3)) AS INSTANTIABLE, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_OWNER, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_NAME, T.LOCAL_ATTRS AS LOCAL_ATTRIBUTES, T.LOCAL_METHODS AS LOCAL_METHODS, T.TYPE_ID AS TYPEID FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON D.DATABASE_ID = T.DATABASE_ID AND T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, TS.TYPE_NAME AS TYPE_NAME, TS.TYPE_ID AS TYPE_OID, CAST( CASE TS.TYPECODE WHEN 1 THEN 'COLLECTION' WHEN 2 THEN 'OBJECT' END AS VARCHAR2(10)) AS TYPECODE, TS.ATTRIBUTES AS ATTRIBUTES, TS.METHODS AS METHODS, CAST('NO' AS CHAR(2)) AS PREDEFINED, CAST('NO' AS CHAR(2)) AS INCOMPLETE, CAST('YES' AS CHAR(3)) AS FINAL, CAST('YES' AS CHAR(3)) AS INSTANTIABLE, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_OWNER, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_NAME, TS.LOCAL_ATTRS AS LOCAL_ATTRIBUTES, TS.LOCAL_METHODS AS LOCAL_METHODS, TS.TYPE_ID AS TYPEID FROM SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2396,17 +2308,16 @@ int ObInnerTableSchema::dba_types_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_types_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_types_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2437,8 +2348,7 @@ int ObInnerTableSchema::all_types_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT D.DATABASE_NAME AS OWNER, T.TYPE_NAME AS TYPE_NAME, T.TYPE_ID AS TYPE_OID, CAST( CASE T.TYPECODE WHEN 1 THEN 'COLLECTION' WHEN 2 THEN 'OBJECT' END AS VARCHAR2(10)) AS TYPECODE, T.ATTRIBUTES AS ATTRIBUTES, T.METHODS AS METHODS, CAST('NO' AS CHAR(2)) AS PREDEFINED, CAST('NO' AS CHAR(2)) AS INCOMPLETE, CAST('YES' AS CHAR(3)) AS FINAL, CAST('YES' AS CHAR(3)) AS INSTANTIABLE, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_OWNER, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_NAME, T.LOCAL_ATTRS AS LOCAL_ATTRIBUTES, T.LOCAL_METHODS AS LOCAL_METHODS, T.TYPE_ID AS TYPEID FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON D.DATABASE_ID = T.DATABASE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND (T.DATABASE_ID = USERENV('SCHEMAID') or USER_CAN_ACCESS_OBJ(4, T.TYPE_ID, T.DATABASE_ID) = 1) AND T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, TS.TYPE_NAME AS TYPE_NAME, TS.TYPE_ID AS TYPE_OID, CAST( CASE TS.TYPECODE WHEN 1 THEN 'COLLECTION' WHEN 2 THEN 'OBJECT' END AS VARCHAR2(10)) AS TYPECODE, TS.ATTRIBUTES AS ATTRIBUTES, TS.METHODS AS METHODS, CAST('NO' AS CHAR(2)) AS PREDEFINED, CAST('NO' AS CHAR(2)) AS INCOMPLETE, CAST('YES' AS CHAR(3)) AS FINAL, CAST('YES' AS CHAR(3)) AS INSTANTIABLE, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_OWNER, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_NAME, TS.LOCAL_ATTRS AS LOCAL_ATTRIBUTES, TS.LOCAL_METHODS AS LOCAL_METHODS, TS.TYPE_ID AS TYPEID FROM SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT D.DATABASE_NAME AS OWNER, T.TYPE_NAME AS TYPE_NAME, T.TYPE_ID AS TYPE_OID, CAST( CASE T.TYPECODE WHEN 1 THEN 'COLLECTION' WHEN 2 THEN 'OBJECT' END AS VARCHAR2(10)) AS TYPECODE, T.ATTRIBUTES AS ATTRIBUTES, T.METHODS AS METHODS, CAST('NO' AS CHAR(2)) AS PREDEFINED, CAST('NO' AS CHAR(2)) AS INCOMPLETE, CAST('YES' AS CHAR(3)) AS FINAL, CAST('YES' AS CHAR(3)) AS INSTANTIABLE, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_OWNER, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_NAME, T.LOCAL_ATTRS AS LOCAL_ATTRIBUTES, T.LOCAL_METHODS AS LOCAL_METHODS, T.TYPE_ID AS TYPEID FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON D.DATABASE_ID = T.DATABASE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND (T.DATABASE_ID = USERENV('SCHEMAID') or USER_CAN_ACCESS_OBJ(4, T.TYPE_ID, T.DATABASE_ID) = 1) AND T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, TS.TYPE_NAME AS TYPE_NAME, TS.TYPE_ID AS TYPE_OID, CAST( CASE TS.TYPECODE WHEN 1 THEN 'COLLECTION' WHEN 2 THEN 'OBJECT' END AS VARCHAR2(10)) AS TYPECODE, TS.ATTRIBUTES AS ATTRIBUTES, TS.METHODS AS METHODS, CAST('NO' AS CHAR(2)) AS PREDEFINED, CAST('NO' AS CHAR(2)) AS INCOMPLETE, CAST('YES' AS CHAR(3)) AS FINAL, CAST('YES' AS CHAR(3)) AS INSTANTIABLE, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_OWNER, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_NAME, TS.LOCAL_ATTRS AS LOCAL_ATTRIBUTES, TS.LOCAL_METHODS AS LOCAL_METHODS, TS.TYPE_ID AS TYPEID FROM SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2450,17 +2360,16 @@ int ObInnerTableSchema::all_types_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_types_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_types_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2491,8 +2400,7 @@ int ObInnerTableSchema::user_types_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT T.TYPE_NAME AS TYPE_NAME, T.TYPE_ID AS TYPE_OID, CAST( CASE T.TYPECODE WHEN 1 THEN 'COLLECTION' WHEN 2 THEN 'OBJECT' END AS VARCHAR2(10)) AS TYPECODE, T.ATTRIBUTES AS ATTRIBUTES, T.METHODS AS METHODS, CAST('NO' AS CHAR(2)) AS PREDEFINED, CAST('NO' AS CHAR(2)) AS INCOMPLETE, CAST('YES' AS CHAR(3)) AS FINAL, CAST('YES' AS CHAR(3)) AS INSTANTIABLE, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_OWNER, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_NAME, T.LOCAL_ATTRS AS LOCAL_ATTRIBUTES, T.LOCAL_METHODS AS LOCAL_METHODS, T.TYPE_ID AS TYPEID FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON D.DATABASE_ID = T.DATABASE_ID AND T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND D.DATABASE_ID = USERENV('SCHEMAID') AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT T.TYPE_NAME AS TYPE_NAME, T.TYPE_ID AS TYPE_OID, CAST( CASE T.TYPECODE WHEN 1 THEN 'COLLECTION' WHEN 2 THEN 'OBJECT' END AS VARCHAR2(10)) AS TYPECODE, T.ATTRIBUTES AS ATTRIBUTES, T.METHODS AS METHODS, CAST('NO' AS CHAR(2)) AS PREDEFINED, CAST('NO' AS CHAR(2)) AS INCOMPLETE, CAST('YES' AS CHAR(3)) AS FINAL, CAST('YES' AS CHAR(3)) AS INSTANTIABLE, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_OWNER, CAST(NULL AS VARCHAR2(30)) AS SUPERTYPE_NAME, T.LOCAL_ATTRS AS LOCAL_ATTRIBUTES, T.LOCAL_METHODS AS LOCAL_METHODS, T.TYPE_ID AS TYPEID FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON D.DATABASE_ID = T.DATABASE_ID AND T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND D.DATABASE_ID = USERENV('SCHEMAID') AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2504,17 +2412,16 @@ int ObInnerTableSchema::user_types_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_type_attrs_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_type_attrs_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2545,8 +2452,7 @@ int ObInnerTableSchema::dba_type_attrs_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT /*+ USE_MERGE(T, A, D, T1, D1) */ D.DATABASE_NAME AS OWNER, T.TYPE_NAME AS TYPE_NAME, A.NAME AS ATTR_NAME, CAST(NULL AS VARCHAR2(7)) AS ATTR_TYPE_MOD, CAST( CASE A.PROPERTIES WHEN 3 THEN NULL ELSE D1.DATABASE_NAME END AS VARCHAR2(128)) AS ATTR_TYPE_OWNER, CAST( CASE A.PROPERTIES WHEN 3 THEN DECODE (BITAND(A.TYPE_ATTR_ID,1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(A.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(A.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(A.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(A.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, '', 46, DECODE(A.COLL_TYPE, 63, 'BLOB', 'CLOB'), 'NOT_SUPPORT') ELSE t1.TYPE_NAME END AS VARCHAR2(324)) AS ATTR_TYPE_NAME, A.LENGTH AS LENGTH, A.NUMBER_PRECISION AS NUMBER_PRECISION, A.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, A.ATTRIBUTE AS ATTR_NO, CAST('NO' AS CHAR(2)) AS INHERITED, CAST('C' AS CHAR(1)) AS CHAR_USED FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT A ON T.TYPE_ID = A.TYPE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND A.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND t.database_id = d.database_id AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T1 ON T1.TYPE_ID = A.TYPE_ATTR_ID AND T1.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D1 ON T1.DATABASE_ID = D1.DATABASE_ID AND D1.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT /*+ USE_MERGE(TS, TAS, TS1) */ CAST('SYS' AS VARCHAR2(30)) AS OWNER, TS.TYPE_NAME AS TYPE_NAME, TAS.NAME AS ATTR_NAME, CAST(NULL AS VARCHAR2(7)) AS ATTR_TYPE_MOD, CAST( CASE TAS.PROPERTIES WHEN 3 THEN NULL ELSE 'SYS' END AS VARCHAR2(128)) AS ATTR_TYPE_OWNER, CAST( CASE TAS.PROPERTIES WHEN 3 THEN DECODE (BITAND(TAS.TYPE_ATTR_ID,1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(TAS.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(TAS.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(TAS.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(TAS.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(TAS.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(TAS.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(TAS.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, '', 46, DECODE(TAS.COLL_TYPE, 63, 'BLOB', 'CLOB'), 'NOT_SUPPORT') ELSE TS1.TYPE_NAME END AS VARCHAR2(324)) AS ATTR_TYPE_NAME, TAS.LENGTH AS LENGTH, TAS.NUMBER_PRECISION AS NUMBER_PRECISION, TAS.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, TAS.ATTRIBUTE AS ATTR_NO, CAST('NO' AS CHAR(2)) AS INHERITED, CAST('C' AS CHAR(1)) AS CHAR_USED FROM SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS JOIN SYS.ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT TAS ON TS.TYPE_ID = TAS.TYPE_ID LEFT JOIN SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS1 ON TS1.TYPE_ID = TAS.TYPE_ATTR_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT /*+ USE_MERGE(T, A, D, T1, D1) */ D.DATABASE_NAME AS OWNER, T.TYPE_NAME AS TYPE_NAME, A.NAME AS ATTR_NAME, CAST(NULL AS VARCHAR2(7)) AS ATTR_TYPE_MOD, CAST( CASE A.PROPERTIES WHEN 3 THEN NULL ELSE D1.DATABASE_NAME END AS VARCHAR2(128)) AS ATTR_TYPE_OWNER, CAST( CASE A.PROPERTIES WHEN 3 THEN DECODE (BITAND(A.TYPE_ATTR_ID,1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(A.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(A.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(A.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(A.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, '', 46, DECODE(A.COLL_TYPE, 63, 'BLOB', 'CLOB'), 'NOT_SUPPORT') ELSE t1.TYPE_NAME END AS VARCHAR2(324)) AS ATTR_TYPE_NAME, A.LENGTH AS LENGTH, A.NUMBER_PRECISION AS NUMBER_PRECISION, A.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, A.ATTRIBUTE AS ATTR_NO, CAST('NO' AS CHAR(2)) AS INHERITED, CAST('C' AS CHAR(1)) AS CHAR_USED FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT A ON T.TYPE_ID = A.TYPE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND A.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND t.database_id = d.database_id AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T1 ON T1.TYPE_ID = A.TYPE_ATTR_ID AND T1.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D1 ON T1.DATABASE_ID = D1.DATABASE_ID AND D1.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT /*+ USE_MERGE(TS, TAS, TS1) */ CAST('SYS' AS VARCHAR2(30)) AS OWNER, TS.TYPE_NAME AS TYPE_NAME, TAS.NAME AS ATTR_NAME, CAST(NULL AS VARCHAR2(7)) AS ATTR_TYPE_MOD, CAST( CASE TAS.PROPERTIES WHEN 3 THEN NULL ELSE 'SYS' END AS VARCHAR2(128)) AS ATTR_TYPE_OWNER, CAST( CASE TAS.PROPERTIES WHEN 3 THEN DECODE (BITAND(TAS.TYPE_ATTR_ID,1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(TAS.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(TAS.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(TAS.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(TAS.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(TAS.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(TAS.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(TAS.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, '', 46, DECODE(TAS.COLL_TYPE, 63, 'BLOB', 'CLOB'), 'NOT_SUPPORT') ELSE TS1.TYPE_NAME END AS VARCHAR2(324)) AS ATTR_TYPE_NAME, TAS.LENGTH AS LENGTH, TAS.NUMBER_PRECISION AS NUMBER_PRECISION, TAS.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, TAS.ATTRIBUTE AS ATTR_NO, CAST('NO' AS CHAR(2)) AS INHERITED, CAST('C' AS CHAR(1)) AS CHAR_USED FROM SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS JOIN SYS.ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT TAS ON TS.TYPE_ID = TAS.TYPE_ID LEFT JOIN SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS1 ON TS1.TYPE_ID = TAS.TYPE_ATTR_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2558,17 +2464,16 @@ int ObInnerTableSchema::dba_type_attrs_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_type_attrs_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_type_attrs_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2599,10 +2504,7 @@ int ObInnerTableSchema::all_type_attrs_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL( - table_schema - .set_view_definition( - R"__( SELECT /*+ USE_MERGE(T, A, D, T1, D1) */ D.DATABASE_NAME AS OWNER, T.TYPE_NAME AS TYPE_NAME, A.NAME AS ATTR_NAME, CAST(NULL AS VARCHAR2(7)) AS ATTR_TYPE_MOD, CAST( CASE A.PROPERTIES WHEN 3 THEN NULL ELSE D1.DATABASE_NAME END AS VARCHAR2(128)) AS ATTR_TYPE_OWNER, CAST( CASE A.PROPERTIES WHEN 3 THEN DECODE (BITAND(A.TYPE_ATTR_ID,1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(A.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(A.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(A.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(A.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, '', 46, DECODE(A.COLL_TYPE, 63, 'BLOB', 'CLOB'), 'NOT_SUPPORT') ELSE t1.TYPE_NAME END AS VARCHAR2(324)) AS ATTR_TYPE_NAME, A.LENGTH AS LENGTH, A.NUMBER_PRECISION AS NUMBER_PRECISION, A.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, A.ATTRIBUTE AS ATTR_NO, CAST('NO' AS CHAR(2)) AS INHERITED, CAST('C' AS CHAR(1)) AS CHAR_USED FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT A ON T.TYPE_ID = A.TYPE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND A.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND t.database_id = d.database_id AND D.TENANT_ID = EFFECTIVE_TENANT_ID() and (t.database_id = USERENV('SCHEMAID') or USER_CAN_ACCESS_OBJ(4, t.type_id, 1) = 1) LEFT JOIN SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T1 ON T1.TYPE_ID = A.TYPE_ATTR_ID AND T1.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D1 ON T1.DATABASE_ID = D1.DATABASE_ID AND D1.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT /*+ USE_MERGE(TS, TAS, TS1) */ CAST('SYS' AS VARCHAR2(30)) AS OWNER, TS.TYPE_NAME AS TYPE_NAME, TAS.NAME AS ATTR_NAME, CAST(NULL AS VARCHAR2(7)) AS ATTR_TYPE_MOD, CAST( CASE TAS.PROPERTIES WHEN 3 THEN NULL ELSE 'SYS' END AS VARCHAR2(128)) AS ATTR_TYPE_OWNER, CAST( CASE TAS.PROPERTIES WHEN 3 THEN DECODE (BITAND(TAS.TYPE_ATTR_ID,1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(TAS.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(TAS.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(TAS.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(TAS.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(TAS.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(TAS.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(TAS.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, '', 46, DECODE(TAS.COLL_TYPE, 63, 'BLOB', 'CLOB'), 'NOT_SUPPORT') ELSE TS1.TYPE_NAME END AS VARCHAR2(324)) AS ATTR_TYPE_NAME, TAS.LENGTH AS LENGTH, TAS.NUMBER_PRECISION AS NUMBER_PRECISION, TAS.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, TAS.ATTRIBUTE AS ATTR_NO, CAST('NO' AS CHAR(2)) AS INHERITED, CAST('C' AS CHAR(1)) AS CHAR_USED FROM SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS JOIN SYS.ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT TAS ON TS.TYPE_ID = TAS.TYPE_ID LEFT JOIN SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS1 ON TS1.TYPE_ID = TAS.TYPE_ATTR_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT /*+ USE_MERGE(T, A, D, T1, D1) */ D.DATABASE_NAME AS OWNER, T.TYPE_NAME AS TYPE_NAME, A.NAME AS ATTR_NAME, CAST(NULL AS VARCHAR2(7)) AS ATTR_TYPE_MOD, CAST( CASE A.PROPERTIES WHEN 3 THEN NULL ELSE D1.DATABASE_NAME END AS VARCHAR2(128)) AS ATTR_TYPE_OWNER, CAST( CASE A.PROPERTIES WHEN 3 THEN DECODE (BITAND(A.TYPE_ATTR_ID,1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(A.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(A.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(A.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(A.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, '', 46, DECODE(A.COLL_TYPE, 63, 'BLOB', 'CLOB'), 'NOT_SUPPORT') ELSE t1.TYPE_NAME END AS VARCHAR2(324)) AS ATTR_TYPE_NAME, A.LENGTH AS LENGTH, A.NUMBER_PRECISION AS NUMBER_PRECISION, A.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, A.ATTRIBUTE AS ATTR_NO, CAST('NO' AS CHAR(2)) AS INHERITED, CAST('C' AS CHAR(1)) AS CHAR_USED FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT A ON T.TYPE_ID = A.TYPE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND A.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND t.database_id = d.database_id AND D.TENANT_ID = EFFECTIVE_TENANT_ID() and (t.database_id = USERENV('SCHEMAID') or USER_CAN_ACCESS_OBJ(4, t.type_id, 1) = 1) LEFT JOIN SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T1 ON T1.TYPE_ID = A.TYPE_ATTR_ID AND T1.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D1 ON T1.DATABASE_ID = D1.DATABASE_ID AND D1.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT /*+ USE_MERGE(TS, TAS, TS1) */ CAST('SYS' AS VARCHAR2(30)) AS OWNER, TS.TYPE_NAME AS TYPE_NAME, TAS.NAME AS ATTR_NAME, CAST(NULL AS VARCHAR2(7)) AS ATTR_TYPE_MOD, CAST( CASE TAS.PROPERTIES WHEN 3 THEN NULL ELSE 'SYS' END AS VARCHAR2(128)) AS ATTR_TYPE_OWNER, CAST( CASE TAS.PROPERTIES WHEN 3 THEN DECODE (BITAND(TAS.TYPE_ATTR_ID,1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(TAS.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(TAS.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(TAS.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(TAS.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(TAS.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(TAS.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(TAS.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, '', 46, DECODE(TAS.COLL_TYPE, 63, 'BLOB', 'CLOB'), 'NOT_SUPPORT') ELSE TS1.TYPE_NAME END AS VARCHAR2(324)) AS ATTR_TYPE_NAME, TAS.LENGTH AS LENGTH, TAS.NUMBER_PRECISION AS NUMBER_PRECISION, TAS.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, TAS.ATTRIBUTE AS ATTR_NO, CAST('NO' AS CHAR(2)) AS INHERITED, CAST('C' AS CHAR(1)) AS CHAR_USED FROM SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS JOIN SYS.ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT TAS ON TS.TYPE_ID = TAS.TYPE_ID LEFT JOIN SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS1 ON TS1.TYPE_ID = TAS.TYPE_ATTR_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2614,17 +2516,16 @@ int ObInnerTableSchema::all_type_attrs_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_type_attrs_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_type_attrs_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2655,8 +2556,7 @@ int ObInnerTableSchema::user_type_attrs_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT /*+ USE_MERGE(T, A, D, T1, D1) */ T.TYPE_NAME AS TYPE_NAME, A.NAME AS ATTR_NAME, CAST(NULL AS VARCHAR2(7)) AS ATTR_TYPE_MOD, CAST( CASE A.PROPERTIES WHEN 3 THEN NULL ELSE D1.DATABASE_NAME END AS VARCHAR2(128)) AS ATTR_TYPE_OWNER, CAST( CASE A.PROPERTIES WHEN 3 THEN DECODE (BITAND(A.TYPE_ATTR_ID,1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(A.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(A.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(A.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(A.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, '', 46, DECODE(A.COLL_TYPE, 63, 'BLOB', 'CLOB'), 'NOT_SUPPORT') ELSE t1.TYPE_NAME END AS VARCHAR2(324)) AS ATTR_TYPE_NAME, A.LENGTH AS LENGTH, A.NUMBER_PRECISION AS NUMBER_PRECISION, A.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, A.ATTRIBUTE AS ATTR_NO, CAST('NO' AS CHAR(2)) AS INHERITED, CAST('C' AS CHAR(1)) AS CHAR_USED FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT A ON T.TYPE_ID = A.TYPE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND A.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND T.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.DATABASE_ID = USERENV('SCHEMAID') LEFT JOIN SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T1 ON T1.TYPE_ID = A.TYPE_ATTR_ID AND T1.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D1 ON T1.DATABASE_ID = D1.DATABASE_ID AND D1.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT /*+ USE_MERGE(T, A, D, T1, D1) */ T.TYPE_NAME AS TYPE_NAME, A.NAME AS ATTR_NAME, CAST(NULL AS VARCHAR2(7)) AS ATTR_TYPE_MOD, CAST( CASE A.PROPERTIES WHEN 3 THEN NULL ELSE D1.DATABASE_NAME END AS VARCHAR2(128)) AS ATTR_TYPE_OWNER, CAST( CASE A.PROPERTIES WHEN 3 THEN DECODE (BITAND(A.TYPE_ATTR_ID,1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(A.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(A.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(A.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(A.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(A.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, '', 46, DECODE(A.COLL_TYPE, 63, 'BLOB', 'CLOB'), 'NOT_SUPPORT') ELSE t1.TYPE_NAME END AS VARCHAR2(324)) AS ATTR_TYPE_NAME, A.LENGTH AS LENGTH, A.NUMBER_PRECISION AS NUMBER_PRECISION, A.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, A.ATTRIBUTE AS ATTR_NO, CAST('NO' AS CHAR(2)) AS INHERITED, CAST('C' AS CHAR(1)) AS CHAR_USED FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT A ON T.TYPE_ID = A.TYPE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND A.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND T.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.DATABASE_ID = USERENV('SCHEMAID') LEFT JOIN SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T1 ON T1.TYPE_ID = A.TYPE_ATTR_ID AND T1.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D1 ON T1.DATABASE_ID = D1.DATABASE_ID AND D1.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2668,10 +2568,10 @@ int ObInnerTableSchema::user_type_attrs_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.25051_25100.cpp b/src/share/inner_table/ob_inner_table_schema.25051_25100.cpp index 324f71a84..b33fc3a6a 100644 --- a/src/share/inner_table/ob_inner_table_schema.25051_25100.cpp +++ b/src/share/inner_table/ob_inner_table_schema.25051_25100.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::dba_coll_types_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_coll_types_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -58,8 +60,7 @@ int ObInnerTableSchema::dba_coll_types_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT /*+ USE_MERGE(T, C, D, T1, D1) */ D.DATABASE_NAME AS OWNER, T.TYPE_NAME AS TYPE_NAME, CAST( CASE C.UPPER_BOUND WHEN 0 THEN 'COLLECTION' ELSE 'TABLE' END AS VARCHAR2(10)) AS COLL_TYPE, C.UPPER_BOUND AS UPPER_BOUND, CAST(NULL AS VARCHAR2(7)) AS ELEM_TYPE_MOD, CAST( CASE C.PROPERTIES WHEN 3 THEN NULL ELSE D1.DATABASE_NAME END AS VARCHAR2(128)) AS ELEM_TYPE_OWNER, CAST( CASE C.PROPERTIES WHEN 3 THEN DECODE (BITAND(C.ELEM_TYPE_ID, 1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(C.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(C.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(C.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(C.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, CONCAT('UROWID(', CONCAT(C.LENGTH, ')')), 46, DECODE(C.COLL_TYPE, 63, 'BLOB', 'CLOB'), 'NOT_SUPPORT') ELSE t1.TYPE_NAME END AS VARCHAR2(324)) AS ELEM_TYPE_NAME, C.LENGTH AS LENGTH, C.NUMBER_PRECISION AS NUMBER_PRECISION, C.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, CAST('YES' AS CHAR(3)) AS ELEM_STORAGE, CAST('B' AS CHAR(1)) AS NULLS_STORED FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_COLL_TYPE_REAL_AGENT C ON T.TYPE_ID = C.COLL_TYPE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND T.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T1 ON T1.TYPE_ID = C.ELEM_TYPE_ID AND T1.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D1 ON T1.DATABASE_ID = D1.DATABASE_ID AND D1.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT /*+ USE_MERGE(TS, CS, TS1) */ CAST('SYS' AS VARCHAR2(30)) AS OWNER, TS.TYPE_NAME AS TYPE_NAME, CAST( CASE CS.UPPER_BOUND WHEN 0 THEN 'COLLECTION' ELSE 'TABLE' END AS VARCHAR2(10)) AS COLL_TYPE, CS.UPPER_BOUND AS UPPER_BOUND, CAST(NULL AS VARCHAR2(7)) AS ELEM_TYPE_MOD, CAST( CASE CS.PROPERTIES WHEN 3 THEN NULL ELSE 'SYS' END AS VARCHAR2(128)) AS ELEM_TYPE_OWNER, CAST( CASE CS.PROPERTIES WHEN 3 THEN DECODE (BITAND(CS.ELEM_TYPE_ID, 1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(CS.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(CS.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(CS.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(CS.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(CS.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(CS.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(CS.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, CONCAT('UROWID(', CONCAT(CS.LENGTH, ')')), 46, DECODE(CS.COLL_TYPE, 63, 'BLOB', 'CLOB'), 'NOT_SUPPORT') ELSE TS1.TYPE_NAME END AS VARCHAR2(324)) AS ELEM_TYPE_NAME, CS.LENGTH AS LENGTH, CS.NUMBER_PRECISION AS NUMBER_PRECISION, CS.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, CAST('YES' AS CHAR(3)) AS ELEM_STORAGE, CAST('B' AS CHAR(1)) AS NULLS_STORED FROM SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS JOIN SYS.ALL_VIRTUAL_COLL_TYPE_SYS_AGENT CS ON TS.TYPE_ID = CS.COLL_TYPE_ID LEFT JOIN SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS1 ON TS1.TYPE_ID = CS.ELEM_TYPE_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT /*+ USE_MERGE(T, C, D, T1, D1) */ D.DATABASE_NAME AS OWNER, T.TYPE_NAME AS TYPE_NAME, CAST( CASE C.UPPER_BOUND WHEN 0 THEN 'COLLECTION' ELSE 'TABLE' END AS VARCHAR2(10)) AS COLL_TYPE, C.UPPER_BOUND AS UPPER_BOUND, CAST(NULL AS VARCHAR2(7)) AS ELEM_TYPE_MOD, CAST( CASE C.PROPERTIES WHEN 3 THEN NULL ELSE D1.DATABASE_NAME END AS VARCHAR2(128)) AS ELEM_TYPE_OWNER, CAST( CASE C.PROPERTIES WHEN 3 THEN DECODE (BITAND(C.ELEM_TYPE_ID, 1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(C.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(C.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(C.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(C.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, CONCAT('UROWID(', CONCAT(C.LENGTH, ')')), 46, DECODE(C.COLL_TYPE, 63, 'BLOB', 'CLOB'), 'NOT_SUPPORT') ELSE t1.TYPE_NAME END AS VARCHAR2(324)) AS ELEM_TYPE_NAME, C.LENGTH AS LENGTH, C.NUMBER_PRECISION AS NUMBER_PRECISION, C.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, CAST('YES' AS CHAR(3)) AS ELEM_STORAGE, CAST('B' AS CHAR(1)) AS NULLS_STORED FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_COLL_TYPE_REAL_AGENT C ON T.TYPE_ID = C.COLL_TYPE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND T.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T1 ON T1.TYPE_ID = C.ELEM_TYPE_ID AND T1.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D1 ON T1.DATABASE_ID = D1.DATABASE_ID AND D1.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT /*+ USE_MERGE(TS, CS, TS1) */ CAST('SYS' AS VARCHAR2(30)) AS OWNER, TS.TYPE_NAME AS TYPE_NAME, CAST( CASE CS.UPPER_BOUND WHEN 0 THEN 'COLLECTION' ELSE 'TABLE' END AS VARCHAR2(10)) AS COLL_TYPE, CS.UPPER_BOUND AS UPPER_BOUND, CAST(NULL AS VARCHAR2(7)) AS ELEM_TYPE_MOD, CAST( CASE CS.PROPERTIES WHEN 3 THEN NULL ELSE 'SYS' END AS VARCHAR2(128)) AS ELEM_TYPE_OWNER, CAST( CASE CS.PROPERTIES WHEN 3 THEN DECODE (BITAND(CS.ELEM_TYPE_ID, 1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(CS.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(CS.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(CS.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(CS.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(CS.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(CS.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(CS.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, CONCAT('UROWID(', CONCAT(CS.LENGTH, ')')), 46, DECODE(CS.COLL_TYPE, 63, 'BLOB', 'CLOB'), 'NOT_SUPPORT') ELSE TS1.TYPE_NAME END AS VARCHAR2(324)) AS ELEM_TYPE_NAME, CS.LENGTH AS LENGTH, CS.NUMBER_PRECISION AS NUMBER_PRECISION, CS.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, CAST('YES' AS CHAR(3)) AS ELEM_STORAGE, CAST('B' AS CHAR(1)) AS NULLS_STORED FROM SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS JOIN SYS.ALL_VIRTUAL_COLL_TYPE_SYS_AGENT CS ON TS.TYPE_ID = CS.COLL_TYPE_ID LEFT JOIN SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS1 ON TS1.TYPE_ID = CS.ELEM_TYPE_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -71,17 +72,16 @@ int ObInnerTableSchema::dba_coll_types_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_coll_types_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_coll_types_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -112,8 +112,7 @@ int ObInnerTableSchema::all_coll_types_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL( - table_schema.set_view_definition(R"__( SELECT /*+ USE_MERGE(T, C, D, T1, D1) */ D.DATABASE_NAME AS OWNER, T.TYPE_NAME AS TYPE_NAME, CAST( CASE C.UPPER_BOUND WHEN 0 THEN 'COLLECTION' ELSE 'TABLE' END AS VARCHAR2(10)) AS COLL_TYPE, C.UPPER_BOUND AS UPPER_BOUND, CAST(NULL AS VARCHAR2(7)) AS ELEM_TYPE_MOD, CAST( CASE C.PROPERTIES WHEN 3 THEN NULL ELSE D1.DATABASE_NAME END AS VARCHAR2(128)) AS ELEM_TYPE_OWNER, CAST( CASE C.PROPERTIES WHEN 3 THEN DECODE (BITAND(C.ELEM_TYPE_ID, 1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(C.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(C.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(C.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(C.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, CONCAT('UROWID(', CONCAT(C.LENGTH, ')')), 46, DECODE(C.COLL_TYPE, 63, 'BLOB', 'CLOB'), 'NOT_SUPPORT') ELSE t1.TYPE_NAME END AS VARCHAR2(324)) AS ELEM_TYPE_NAME, C.LENGTH AS LENGTH, C.NUMBER_PRECISION AS NUMBER_PRECISION, C.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, CAST('YES' AS CHAR(3)) AS ELEM_STORAGE, CAST('B' AS CHAR(1)) AS NULLS_STORED FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_COLL_TYPE_REAL_AGENT C ON T.TYPE_ID = C.COLL_TYPE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND T.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND (T.DATABASE_ID = USERENV('SCHEMAID') or USER_CAN_ACCESS_OBJ(4, T.TYPE_ID, 1) = 1) LEFT JOIN SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T1 ON T1.TYPE_ID = C.ELEM_TYPE_ID AND T1.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D1 ON T1.DATABASE_ID = D1.DATABASE_ID AND D1.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT /*+ USE_MERGE(TS, CS, TS1) */ CAST('SYS' AS VARCHAR2(30)) AS OWNER, TS.TYPE_NAME AS TYPE_NAME, CAST( CASE CS.UPPER_BOUND WHEN 0 THEN 'COLLECTION' ELSE 'TABLE' END AS VARCHAR2(10)) AS COLL_TYPE, CS.UPPER_BOUND AS UPPER_BOUND, CAST(NULL AS VARCHAR2(7)) AS ELEM_TYPE_MOD, CAST( CASE CS.PROPERTIES WHEN 3 THEN NULL ELSE 'SYS' END AS VARCHAR2(128)) AS ELEM_TYPE_OWNER, CAST( CASE CS.PROPERTIES WHEN 3 THEN DECODE (BITAND(CS.ELEM_TYPE_ID, 1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(CS.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(CS.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(CS.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(CS.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(CS.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(CS.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(CS.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, CONCAT('UROWID(', CONCAT(CS.LENGTH, ')')), 46, '', 'NOT_SUPPORT') ELSE TS1.TYPE_NAME END AS VARCHAR2(324)) AS ELEM_TYPE_NAME, CS.LENGTH AS LENGTH, CS.NUMBER_PRECISION AS NUMBER_PRECISION, CS.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, CAST('YES' AS CHAR(3)) AS ELEM_STORAGE, CAST('B' AS CHAR(1)) AS NULLS_STORED FROM SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS JOIN SYS.ALL_VIRTUAL_COLL_TYPE_SYS_AGENT CS ON TS.TYPE_ID = CS.COLL_TYPE_ID LEFT JOIN SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS1 ON TS1.TYPE_ID = CS.ELEM_TYPE_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT /*+ USE_MERGE(T, C, D, T1, D1) */ D.DATABASE_NAME AS OWNER, T.TYPE_NAME AS TYPE_NAME, CAST( CASE C.UPPER_BOUND WHEN 0 THEN 'COLLECTION' ELSE 'TABLE' END AS VARCHAR2(10)) AS COLL_TYPE, C.UPPER_BOUND AS UPPER_BOUND, CAST(NULL AS VARCHAR2(7)) AS ELEM_TYPE_MOD, CAST( CASE C.PROPERTIES WHEN 3 THEN NULL ELSE D1.DATABASE_NAME END AS VARCHAR2(128)) AS ELEM_TYPE_OWNER, CAST( CASE C.PROPERTIES WHEN 3 THEN DECODE (BITAND(C.ELEM_TYPE_ID, 1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(C.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(C.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(C.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(C.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, CONCAT('UROWID(', CONCAT(C.LENGTH, ')')), 46, DECODE(C.COLL_TYPE, 63, 'BLOB', 'CLOB'), 'NOT_SUPPORT') ELSE t1.TYPE_NAME END AS VARCHAR2(324)) AS ELEM_TYPE_NAME, C.LENGTH AS LENGTH, C.NUMBER_PRECISION AS NUMBER_PRECISION, C.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, CAST('YES' AS CHAR(3)) AS ELEM_STORAGE, CAST('B' AS CHAR(1)) AS NULLS_STORED FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_COLL_TYPE_REAL_AGENT C ON T.TYPE_ID = C.COLL_TYPE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND T.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND (T.DATABASE_ID = USERENV('SCHEMAID') or USER_CAN_ACCESS_OBJ(4, T.TYPE_ID, 1) = 1) LEFT JOIN SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T1 ON T1.TYPE_ID = C.ELEM_TYPE_ID AND T1.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D1 ON T1.DATABASE_ID = D1.DATABASE_ID AND D1.TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT /*+ USE_MERGE(TS, CS, TS1) */ CAST('SYS' AS VARCHAR2(30)) AS OWNER, TS.TYPE_NAME AS TYPE_NAME, CAST( CASE CS.UPPER_BOUND WHEN 0 THEN 'COLLECTION' ELSE 'TABLE' END AS VARCHAR2(10)) AS COLL_TYPE, CS.UPPER_BOUND AS UPPER_BOUND, CAST(NULL AS VARCHAR2(7)) AS ELEM_TYPE_MOD, CAST( CASE CS.PROPERTIES WHEN 3 THEN NULL ELSE 'SYS' END AS VARCHAR2(128)) AS ELEM_TYPE_OWNER, CAST( CASE CS.PROPERTIES WHEN 3 THEN DECODE (BITAND(CS.ELEM_TYPE_ID, 1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(CS.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(CS.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(CS.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(CS.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(CS.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(CS.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(CS.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, CONCAT('UROWID(', CONCAT(CS.LENGTH, ')')), 46, '', 'NOT_SUPPORT') ELSE TS1.TYPE_NAME END AS VARCHAR2(324)) AS ELEM_TYPE_NAME, CS.LENGTH AS LENGTH, CS.NUMBER_PRECISION AS NUMBER_PRECISION, CS.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, CAST('YES' AS CHAR(3)) AS ELEM_STORAGE, CAST('B' AS CHAR(1)) AS NULLS_STORED FROM SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS JOIN SYS.ALL_VIRTUAL_COLL_TYPE_SYS_AGENT CS ON TS.TYPE_ID = CS.COLL_TYPE_ID LEFT JOIN SYS.ALL_VIRTUAL_TYPE_SYS_AGENT TS1 ON TS1.TYPE_ID = CS.ELEM_TYPE_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -125,17 +124,16 @@ int ObInnerTableSchema::all_coll_types_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_coll_types_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_coll_types_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -166,8 +164,7 @@ int ObInnerTableSchema::user_coll_types_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT /*+ USE_MERGE(T, C, D, T1, D1) */ T.TYPE_NAME AS TYPE_NAME, CAST( CASE C.UPPER_BOUND WHEN 0 THEN 'COLLECTION' ELSE 'TABLE' END AS VARCHAR2(10)) AS COLL_TYPE, C.UPPER_BOUND AS UPPER_BOUND, CAST(NULL AS VARCHAR2(7)) AS ELEM_TYPE_MOD, CAST( CASE C.PROPERTIES WHEN 3 THEN NULL ELSE d1.DATABASE_NAME END AS VARCHAR2(128)) AS ELEM_TYPE_OWNER, CAST( CASE C.PROPERTIES WHEN 3 THEN DECODE (BITAND(C.ELEM_TYPE_ID, 1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(C.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(C.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(C.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(C.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, CONCAT('UROWID(', CONCAT(C.LENGTH, ')')), 46, '', 'NOT_SUPPORT') ELSE t1.TYPE_NAME END AS VARCHAR2(324)) AS ELEM_TYPE_NAME, C.LENGTH AS LENGTH, C.NUMBER_PRECISION AS NUMBER_PRECISION, C.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, CAST('YES' AS CHAR(7)) AS ELEM_STORAGE, CAST('B' AS CHAR(7)) AS NULLS_STORED FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_COLL_TYPE_REAL_AGENT C ON T.TYPE_ID = C.COLL_TYPE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND T.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.DATABASE_ID = USERENV('SCHEMAID') LEFT JOIN SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T1 ON T1.TYPE_ID = C.ELEM_TYPE_ID AND T1.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D1 ON T1.DATABASE_ID = D1.DATABASE_ID AND D1.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT /*+ USE_MERGE(T, C, D, T1, D1) */ T.TYPE_NAME AS TYPE_NAME, CAST( CASE C.UPPER_BOUND WHEN 0 THEN 'COLLECTION' ELSE 'TABLE' END AS VARCHAR2(10)) AS COLL_TYPE, C.UPPER_BOUND AS UPPER_BOUND, CAST(NULL AS VARCHAR2(7)) AS ELEM_TYPE_MOD, CAST( CASE C.PROPERTIES WHEN 3 THEN NULL ELSE d1.DATABASE_NAME END AS VARCHAR2(128)) AS ELEM_TYPE_OWNER, CAST( CASE C.PROPERTIES WHEN 3 THEN DECODE (BITAND(C.ELEM_TYPE_ID, 1099511627775), 0, 'NULL', 1, 'NUMBER', 2, 'NUMBER', 3, 'NUMBER', 4, 'NUMBER', 5, 'NUMBER', 6, 'NUMBER', 7, 'NUMBER', 8, 'NUMBER', 9, 'NUMBER', 10, 'NUMBER', 11, 'BINARY_FLOAT', 12, 'BINARY_DOUBLE', 13, 'NUMBER', 14, 'NUMBER', 15, 'NUMBER', 16, 'NUMBER', 17, 'DATE', 18, 'TIMESTAMP', 19, 'DATE', 20, 'TIME', 21, 'YEAR', 22, 'VARCHAR2', 23, 'CHAR', 24, 'HEX_STRING', 25, 'EXT', 26, 'UNKNOWN', 27, 'TINYTEXT', 28, 'TEXT', 29, 'MEDIUMTEXT', 30, DECODE(C.COLL_TYPE, 63, 'BLOB', 'CLOB'), 31, 'BIT', 32, 'ENUM', 33, 'SET', 34, 'ENUM_INNER', 35, 'SET_INNER', 36, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ') WITH TIME ZONE')), 37, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ') WITH LOCAL TIME ZONE')), 38, CONCAT('TIMESTAMP(', CONCAT(C.SCALE, ')')), 39, 'RAW', 40, CONCAT('INTERVAL YEAR(', CONCAT(C.SCALE, ') TO MONTH')), 41, CONCAT('INTERVAL DAY(', CONCAT(TRUNC(C.SCALE / 10), CONCAT(') TO SECOND(', CONCAT(MOD(C.SCALE, 10), ')')))), 42, 'FLOAT', 43, 'NVARCHAR2', 44, 'NCHAR', 45, CONCAT('UROWID(', CONCAT(C.LENGTH, ')')), 46, '', 'NOT_SUPPORT') ELSE t1.TYPE_NAME END AS VARCHAR2(324)) AS ELEM_TYPE_NAME, C.LENGTH AS LENGTH, C.NUMBER_PRECISION AS NUMBER_PRECISION, C.SCALE AS SCALE, CAST('CHAR_CS' AS CHAR(7)) AS CHARACTER_SET_NAME, CAST('YES' AS CHAR(7)) AS ELEM_STORAGE, CAST('B' AS CHAR(7)) AS NULLS_STORED FROM SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T JOIN SYS.ALL_VIRTUAL_COLL_TYPE_REAL_AGENT C ON T.TYPE_ID = C.COLL_TYPE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND T.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.DATABASE_ID = USERENV('SCHEMAID') LEFT JOIN SYS.ALL_VIRTUAL_TYPE_REAL_AGENT T1 ON T1.TYPE_ID = C.ELEM_TYPE_ID AND T1.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D1 ON T1.DATABASE_ID = D1.DATABASE_ID AND D1.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -179,17 +176,16 @@ int ObInnerTableSchema::user_coll_types_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_procedures_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_procedures_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -220,8 +216,7 @@ int ObInnerTableSchema::dba_procedures_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT U.USER_NAME AS OWNER, CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_NAME ELSE P.PACKAGE_NAME END AS OBJECT_NAME, CASE R.PACKAGE_ID WHEN -1 THEN NULL ELSE R.ROUTINE_NAME END AS PROCEDURE_NAME, CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_ID ELSE R.PACKAGE_ID END AS OBJECT_ID, CASE R.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE R.SUBPROGRAM_ID END AS SUBPROGRAM_ID, CASE R.OVERLOAD WHEN 0 THEN NULL ELSE R.OVERLOAD END AS OVERLOAD, CASE R.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS OBJECT_TYPE, CAST('NO' AS VARCHAR2(3)) AS AGGREGATE, CAST(DECODE(BITAND(R.FLAG, 128), 128, 'YES', 'NO') AS VARCHAR2(3)) AS PIPELINED, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPEOWNER, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPENAME, CAST(DECODE(BITAND(R.FLAG, 8), 8, 'YES', 'NO') AS VARCHAR2(3)) AS PARALLEL, CAST('NO' AS VARCHAR2(3)) AS INTERFACE, CAST(DECODE(BITAND(R.FLAG, 4), 4, 'YES', 'NO') AS VARCHAR2(3)) AS DETERMINISTIC, CAST(DECODE(BITAND(R.FLAG, 16), 16, 'INVOKER', 'DEFINER') AS VARCHAR2(12)) AS AUTHID, R.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID())R LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P ON R.PACKAGE_ID = P.PACKAGE_ID AND P.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = R.TENANT_ID OR R.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, CASE RS.PACKAGE_ID WHEN -1 THEN RS.ROUTINE_NAME ELSE PS.PACKAGE_NAME END AS OBJECT_NAME, CASE RS.PACKAGE_ID WHEN -1 THEN NULL ELSE RS.ROUTINE_NAME END AS PROCEDURE_NAME, CASE RS.PACKAGE_ID WHEN -1 THEN RS.ROUTINE_ID ELSE RS.PACKAGE_ID END AS OBJECT_ID, CASE RS.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE RS.SUBPROGRAM_ID END AS SUBPROGRAM_ID, CASE RS.OVERLOAD WHEN 0 THEN NULL ELSE RS.OVERLOAD END AS OVERLOAD, CASE RS.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS OBJECT_TYPE, CAST('NO' AS VARCHAR2(3)) AS AGGREGATE, CAST(DECODE(BITAND(RS.FLAG, 128), 128, 'YES', 'NO') AS VARCHAR2(3)) AS PIPELINED, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPEOWNER, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPENAME, CAST(DECODE(BITAND(RS.FLAG, 8), 8, 'YES', 'NO') AS VARCHAR2(3)) AS PARALLEL, CAST('NO' AS VARCHAR2(3)) AS INTERFACE, CAST(DECODE(BITAND(RS.FLAG, 4), 4, 'YES', 'NO') AS VARCHAR2(3)) AS DETERMINISTIC, CAST(DECODE(BITAND(RS.FLAG, 16), 16, 'INVOKER', 'DEFINER') AS VARCHAR2(12)) AS AUTHID, RS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_ROUTINE_SYS_AGENT RS LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_SYS_AGENT PS ON RS.PACKAGE_ID = PS.PACKAGE_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT U.USER_NAME AS OWNER, CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_NAME ELSE P.PACKAGE_NAME END AS OBJECT_NAME, CASE R.PACKAGE_ID WHEN -1 THEN NULL ELSE R.ROUTINE_NAME END AS PROCEDURE_NAME, CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_ID ELSE R.PACKAGE_ID END AS OBJECT_ID, CASE R.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE R.SUBPROGRAM_ID END AS SUBPROGRAM_ID, CASE R.OVERLOAD WHEN 0 THEN NULL ELSE R.OVERLOAD END AS OVERLOAD, CASE R.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS OBJECT_TYPE, CAST('NO' AS VARCHAR2(3)) AS AGGREGATE, CAST(DECODE(BITAND(R.FLAG, 128), 128, 'YES', 'NO') AS VARCHAR2(3)) AS PIPELINED, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPEOWNER, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPENAME, CAST(DECODE(BITAND(R.FLAG, 8), 8, 'YES', 'NO') AS VARCHAR2(3)) AS PARALLEL, CAST('NO' AS VARCHAR2(3)) AS INTERFACE, CAST(DECODE(BITAND(R.FLAG, 4), 4, 'YES', 'NO') AS VARCHAR2(3)) AS DETERMINISTIC, CAST(DECODE(BITAND(R.FLAG, 16), 16, 'INVOKER', 'DEFINER') AS VARCHAR2(12)) AS AUTHID, R.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID())R LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P ON R.PACKAGE_ID = P.PACKAGE_ID AND P.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = R.TENANT_ID OR R.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, CASE RS.PACKAGE_ID WHEN -1 THEN RS.ROUTINE_NAME ELSE PS.PACKAGE_NAME END AS OBJECT_NAME, CASE RS.PACKAGE_ID WHEN -1 THEN NULL ELSE RS.ROUTINE_NAME END AS PROCEDURE_NAME, CASE RS.PACKAGE_ID WHEN -1 THEN RS.ROUTINE_ID ELSE RS.PACKAGE_ID END AS OBJECT_ID, CASE RS.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE RS.SUBPROGRAM_ID END AS SUBPROGRAM_ID, CASE RS.OVERLOAD WHEN 0 THEN NULL ELSE RS.OVERLOAD END AS OVERLOAD, CASE RS.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS OBJECT_TYPE, CAST('NO' AS VARCHAR2(3)) AS AGGREGATE, CAST(DECODE(BITAND(RS.FLAG, 128), 128, 'YES', 'NO') AS VARCHAR2(3)) AS PIPELINED, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPEOWNER, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPENAME, CAST(DECODE(BITAND(RS.FLAG, 8), 8, 'YES', 'NO') AS VARCHAR2(3)) AS PARALLEL, CAST('NO' AS VARCHAR2(3)) AS INTERFACE, CAST(DECODE(BITAND(RS.FLAG, 4), 4, 'YES', 'NO') AS VARCHAR2(3)) AS DETERMINISTIC, CAST(DECODE(BITAND(RS.FLAG, 16), 16, 'INVOKER', 'DEFINER') AS VARCHAR2(12)) AS AUTHID, RS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_ROUTINE_SYS_AGENT RS LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_SYS_AGENT PS ON RS.PACKAGE_ID = PS.PACKAGE_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -233,17 +228,16 @@ int ObInnerTableSchema::dba_procedures_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_arguments_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_arguments_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -274,8 +268,7 @@ int ObInnerTableSchema::dba_arguments_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT U.USER_NAME AS OWNER, R.ROUTINE_NAME AS OBJECT_NAME, CASE R.PACKAGE_ID WHEN -1 THEN NULL ELSE P.PACKAGE_NAME END AS PACKAGE_NAME, CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_ID ELSE R.PACKAGE_ID END AS OBJECT_ID, CASE R.OVERLOAD WHEN 0 THEN NULL ELSE R.OVERLOAD END AS OVERLOAD, CASE R.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE R.SUBPROGRAM_ID END AS SUBPROGRAM_ID, RP.PARAM_NAME AS ARGUMENT_NAME, RP.PARAM_POSITION AS POSITION, RP.SEQUENCE AS SEQUENCE, RP.PARAM_LEVEL AS DATA_LEVEL, V.DATA_TYPE_STR AS DATA_TYPE, 'NO' AS DEFAULTED, RP.PARAM_LENGTH AS DATA_LENGTH, DECODE(BITAND(RP.FLAG, 3), 1, 'IN', 2, 'OUT', 3, 'INOUT', 0, 'OUT') AS IN_OUT, RP.PARAM_PRECISION AS DATA_PRECISION, RP.PARAM_SCALE AS DATA_SCALE, CASE RP.PARAM_CHARSET WHEN 1 THEN 'BINARY' WHEN 2 THEN 'UTF8MB4' ELSE NULL END AS CHARACTER_SET_NAME, CASE RP.PARAM_COLL_TYPE WHEN 45 THEN 'UTF8MB4_GENERAL_CI' WHEN 46 THEN 'UTF8MB4_BIN' WHEN 63 THEN 'BINARY' ELSE NULL END AS COLLATION, RP.TYPE_OWNER AS TYPE_OWNER, RP.TYPE_NAME AS TYPE_NAME, RP.TYPE_SUBNAME AS TYPE_SUBNAME, RP.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) RP LEFT JOIN SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT R ON RP.ROUTINE_ID = R.ROUTINE_ID AND R.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P ON R.PACKAGE_ID = P.PACKAGE_ID AND P.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATA_TYPE V ON RP.PARAM_TYPE = V.DATA_TYPE WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = RP.TENANT_ID OR RP.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, RS.ROUTINE_NAME AS OBJECT_NAME, CASE RS.PACKAGE_ID WHEN -1 THEN NULL ELSE PS.PACKAGE_NAME END AS PACKAGE_NAME, CASE RS.PACKAGE_ID WHEN -1 THEN RS.ROUTINE_ID ELSE RS.PACKAGE_ID END AS OBJECT_ID, CASE RS.OVERLOAD WHEN 0 THEN NULL ELSE RS.OVERLOAD END AS OVERLOAD, CASE RS.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE RS.SUBPROGRAM_ID END AS SUBPROGRAM_ID, RPS.PARAM_NAME AS ARGUMENT_NAME, RPS.PARAM_POSITION AS POSITION, RPS.SEQUENCE AS SEQUENCE, RPS.PARAM_LEVEL AS DATA_LEVEL, VV.DATA_TYPE_STR AS DATA_TYPE, 'NO' AS DEFAULTED, RPS.PARAM_LENGTH AS DATA_LENGTH, DECODE(BITAND(RPS.FLAG, 3), 1, 'IN', 2, 'OUT', 3, 'INOUT') AS IN_OUT, RPS.PARAM_PRECISION AS DATA_PRECISION, RPS.PARAM_SCALE AS DATA_SCALE, CASE RPS.PARAM_CHARSET WHEN 1 THEN 'BINARY' WHEN 2 THEN 'UTF8MB4' ELSE NULL END AS CHARACTER_SET_NAME, CASE RPS.PARAM_COLL_TYPE WHEN 45 THEN 'UTF8MB4_GENERAL_CI' WHEN 46 THEN 'UTF8MB4_BIN' WHEN 63 THEN 'BINARY' ELSE NULL END AS COLLATION, RPS.TYPE_OWNER AS TYPE_OWNER, RPS.TYPE_NAME AS TYPE_NAME, RPS.TYPE_SUBNAME AS TYPE_SUBNAME, RPS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT RPS LEFT JOIN SYS.ALL_VIRTUAL_ROUTINE_SYS_AGENT RS ON RPS.ROUTINE_ID = RS.ROUTINE_ID LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_SYS_AGENT PS ON RS.PACKAGE_ID = PS.PACKAGE_ID LEFT JOIN SYS.ALL_VIRTUAL_DATA_TYPE VV ON RPS.PARAM_TYPE = VV.DATA_TYPE )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT U.USER_NAME AS OWNER, R.ROUTINE_NAME AS OBJECT_NAME, CASE R.PACKAGE_ID WHEN -1 THEN NULL ELSE P.PACKAGE_NAME END AS PACKAGE_NAME, CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_ID ELSE R.PACKAGE_ID END AS OBJECT_ID, CASE R.OVERLOAD WHEN 0 THEN NULL ELSE R.OVERLOAD END AS OVERLOAD, CASE R.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE R.SUBPROGRAM_ID END AS SUBPROGRAM_ID, RP.PARAM_NAME AS ARGUMENT_NAME, RP.PARAM_POSITION AS POSITION, RP.SEQUENCE AS SEQUENCE, RP.PARAM_LEVEL AS DATA_LEVEL, V.DATA_TYPE_STR AS DATA_TYPE, 'NO' AS DEFAULTED, RP.PARAM_LENGTH AS DATA_LENGTH, DECODE(BITAND(RP.FLAG, 3), 1, 'IN', 2, 'OUT', 3, 'INOUT', 0, 'OUT') AS IN_OUT, RP.PARAM_PRECISION AS DATA_PRECISION, RP.PARAM_SCALE AS DATA_SCALE, CASE RP.PARAM_CHARSET WHEN 1 THEN 'BINARY' WHEN 2 THEN 'UTF8MB4' ELSE NULL END AS CHARACTER_SET_NAME, CASE RP.PARAM_COLL_TYPE WHEN 45 THEN 'UTF8MB4_GENERAL_CI' WHEN 46 THEN 'UTF8MB4_BIN' WHEN 63 THEN 'BINARY' ELSE NULL END AS COLLATION, RP.TYPE_OWNER AS TYPE_OWNER, RP.TYPE_NAME AS TYPE_NAME, RP.TYPE_SUBNAME AS TYPE_SUBNAME, RP.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) RP LEFT JOIN SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT R ON RP.ROUTINE_ID = R.ROUTINE_ID AND R.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P ON R.PACKAGE_ID = P.PACKAGE_ID AND P.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATA_TYPE V ON RP.PARAM_TYPE = V.DATA_TYPE WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = RP.TENANT_ID OR RP.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, RS.ROUTINE_NAME AS OBJECT_NAME, CASE RS.PACKAGE_ID WHEN -1 THEN NULL ELSE PS.PACKAGE_NAME END AS PACKAGE_NAME, CASE RS.PACKAGE_ID WHEN -1 THEN RS.ROUTINE_ID ELSE RS.PACKAGE_ID END AS OBJECT_ID, CASE RS.OVERLOAD WHEN 0 THEN NULL ELSE RS.OVERLOAD END AS OVERLOAD, CASE RS.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE RS.SUBPROGRAM_ID END AS SUBPROGRAM_ID, RPS.PARAM_NAME AS ARGUMENT_NAME, RPS.PARAM_POSITION AS POSITION, RPS.SEQUENCE AS SEQUENCE, RPS.PARAM_LEVEL AS DATA_LEVEL, VV.DATA_TYPE_STR AS DATA_TYPE, 'NO' AS DEFAULTED, RPS.PARAM_LENGTH AS DATA_LENGTH, DECODE(BITAND(RPS.FLAG, 3), 1, 'IN', 2, 'OUT', 3, 'INOUT') AS IN_OUT, RPS.PARAM_PRECISION AS DATA_PRECISION, RPS.PARAM_SCALE AS DATA_SCALE, CASE RPS.PARAM_CHARSET WHEN 1 THEN 'BINARY' WHEN 2 THEN 'UTF8MB4' ELSE NULL END AS CHARACTER_SET_NAME, CASE RPS.PARAM_COLL_TYPE WHEN 45 THEN 'UTF8MB4_GENERAL_CI' WHEN 46 THEN 'UTF8MB4_BIN' WHEN 63 THEN 'BINARY' ELSE NULL END AS COLLATION, RPS.TYPE_OWNER AS TYPE_OWNER, RPS.TYPE_NAME AS TYPE_NAME, RPS.TYPE_SUBNAME AS TYPE_SUBNAME, RPS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT RPS LEFT JOIN SYS.ALL_VIRTUAL_ROUTINE_SYS_AGENT RS ON RPS.ROUTINE_ID = RS.ROUTINE_ID LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_SYS_AGENT PS ON RS.PACKAGE_ID = PS.PACKAGE_ID LEFT JOIN SYS.ALL_VIRTUAL_DATA_TYPE VV ON RPS.PARAM_TYPE = VV.DATA_TYPE )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -287,17 +280,16 @@ int ObInnerTableSchema::dba_arguments_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_source_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_source_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -328,8 +320,7 @@ int ObInnerTableSchema::dba_source_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(U.USER_NAME AS VARCHAR2(30)) AS OWNER, CAST(P.PACKAGE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE P.TYPE WHEN 1 THEN 'PACKAGE' WHEN 2 THEN 'PACKAGE BODY' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(P.SOURCE) AS TEXT, P.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) P LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON P.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON P.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = P.TENANT_ID OR P.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 UNION ALL SELECT CAST(U.USER_NAME AS VARCHAR2(30)) AS OWNER, CAST(R.ROUTINE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE R.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(R.ROUTINE_BODY) AS TEXT, R.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) R LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = R.TENANT_ID OR R.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND R.PACKAGE_ID = -1 UNION ALL SELECT CAST(U.USER_NAME AS VARCHAR2(30)) AS OWNER, CAST(T.TRIGGER_NAME AS VARCHAR2(30)) AS NAME, CAST('TRIGGER' AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(T.TRIGGER_BODY) AS TEXT, T.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) T LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON T.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = T.TENANT_ID OR T.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, CAST(PS.PACKAGE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE PS.TYPE WHEN 1 THEN 'PACKAGE' WHEN 2 THEN 'PACKAGE BODY' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(PS.SOURCE) AS TEXT, PS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_PACKAGE_SYS_AGENT PS UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, CAST(RS.ROUTINE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE RS.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(RS.ROUTINE_BODY) AS TEXT, RS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_ROUTINE_SYS_AGENT RS WHERE RS.ROUTINE_TYPE != 3 UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, CAST(TS.TRIGGER_NAME AS VARCHAR2(30)) AS NAME, CAST('TRIGGER' AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(TS.TRIGGER_BODY) AS TEXT, TS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT TS )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(U.USER_NAME AS VARCHAR2(30)) AS OWNER, CAST(P.PACKAGE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE P.TYPE WHEN 1 THEN 'PACKAGE' WHEN 2 THEN 'PACKAGE BODY' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(P.SOURCE) AS TEXT, P.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) P LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON P.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON P.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = P.TENANT_ID OR P.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 UNION ALL SELECT CAST(U.USER_NAME AS VARCHAR2(30)) AS OWNER, CAST(R.ROUTINE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE R.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(R.ROUTINE_BODY) AS TEXT, R.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) R LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = R.TENANT_ID OR R.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND R.PACKAGE_ID = -1 UNION ALL SELECT CAST(U.USER_NAME AS VARCHAR2(30)) AS OWNER, CAST(T.TRIGGER_NAME AS VARCHAR2(30)) AS NAME, CAST('TRIGGER' AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(T.TRIGGER_BODY) AS TEXT, T.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) T LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON T.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = T.TENANT_ID OR T.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, CAST(PS.PACKAGE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE PS.TYPE WHEN 1 THEN 'PACKAGE' WHEN 2 THEN 'PACKAGE BODY' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(PS.SOURCE) AS TEXT, PS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_PACKAGE_SYS_AGENT PS UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, CAST(RS.ROUTINE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE RS.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(RS.ROUTINE_BODY) AS TEXT, RS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_ROUTINE_SYS_AGENT RS WHERE RS.ROUTINE_TYPE != 3 UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, CAST(TS.TRIGGER_NAME AS VARCHAR2(30)) AS NAME, CAST('TRIGGER' AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(TS.TRIGGER_BODY) AS TEXT, TS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT TS )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -341,17 +332,16 @@ int ObInnerTableSchema::dba_source_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_procedures_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_procedures_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -382,8 +372,7 @@ int ObInnerTableSchema::all_procedures_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT U.USER_NAME AS OWNER, CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_NAME ELSE P.PACKAGE_NAME END AS OBJECT_NAME, CASE R.PACKAGE_ID WHEN -1 THEN NULL ELSE R.ROUTINE_NAME END AS PROCEDURE_NAME, CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_ID ELSE R.PACKAGE_ID END AS OBJECT_ID, CASE R.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE R.SUBPROGRAM_ID END AS SUBPROGRAM_ID, CASE R.OVERLOAD WHEN 0 THEN NULL ELSE R.OVERLOAD END AS OVERLOAD, CASE R.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS OBJECT_TYPE, CAST('NO' AS VARCHAR2(3)) AS AGGREGATE, CAST(DECODE(BITAND(R.FLAG, 128), 128, 'YES', 'NO') AS VARCHAR2(3)) AS PIPELINED, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPEOWNER, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPENAME, CAST(DECODE(BITAND(R.FLAG, 8), 8, 'YES', 'NO') AS VARCHAR2(3)) AS PARALLEL, CAST('NO' AS VARCHAR2(3)) AS INTERFACE, CAST(DECODE(BITAND(R.FLAG, 4), 4, 'YES', 'NO') AS VARCHAR2(3)) AS DETERMINISTIC, CAST(DECODE(BITAND(R.FLAG, 16), 16, 'INVOKER', 'DEFINER') AS VARCHAR2(12)) AS AUTHID, R.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) R LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P ON R.PACKAGE_ID = P.PACKAGE_ID AND P.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (R.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(12, R.ROUTINE_ID, R.DATABASE_ID) = 1) AND (SYS_CONTEXT('USERENV', 'CON_ID') = R.TENANT_ID OR R.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, CASE RS.PACKAGE_ID WHEN -1 THEN RS.ROUTINE_NAME ELSE PS.PACKAGE_NAME END AS OBJECT_NAME, CASE RS.PACKAGE_ID WHEN -1 THEN NULL ELSE RS.ROUTINE_NAME END AS PROCEDURE_NAME, CASE RS.PACKAGE_ID WHEN -1 THEN RS.ROUTINE_ID ELSE RS.PACKAGE_ID END AS OBJECT_ID, CASE RS.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE RS.SUBPROGRAM_ID END AS SUBPROGRAM_ID, CASE RS.OVERLOAD WHEN 0 THEN NULL ELSE RS.OVERLOAD END AS OVERLOAD, CASE RS.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS OBJECT_TYPE, CAST('NO' AS VARCHAR2(3)) AS AGGREGATE, CAST(DECODE(BITAND(RS.FLAG, 128), 128, 'YES', 'NO') AS VARCHAR2(3)) AS PIPELINED, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPEOWNER, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPENAME, CAST(DECODE(BITAND(RS.FLAG, 8), 8, 'YES', 'NO') AS VARCHAR2(3)) AS PARALLEL, CAST('NO' AS VARCHAR2(3)) AS INTERFACE, CAST(DECODE(BITAND(RS.FLAG, 4), 4, 'YES', 'NO') AS VARCHAR2(3)) AS DETERMINISTIC, CAST(DECODE(BITAND(RS.FLAG, 16), 16, 'INVOKER', 'DEFINER') AS VARCHAR2(12)) AS AUTHID, RS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_ROUTINE_SYS_AGENT RS LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_SYS_AGENT PS ON RS.PACKAGE_ID = PS.PACKAGE_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT U.USER_NAME AS OWNER, CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_NAME ELSE P.PACKAGE_NAME END AS OBJECT_NAME, CASE R.PACKAGE_ID WHEN -1 THEN NULL ELSE R.ROUTINE_NAME END AS PROCEDURE_NAME, CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_ID ELSE R.PACKAGE_ID END AS OBJECT_ID, CASE R.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE R.SUBPROGRAM_ID END AS SUBPROGRAM_ID, CASE R.OVERLOAD WHEN 0 THEN NULL ELSE R.OVERLOAD END AS OVERLOAD, CASE R.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS OBJECT_TYPE, CAST('NO' AS VARCHAR2(3)) AS AGGREGATE, CAST(DECODE(BITAND(R.FLAG, 128), 128, 'YES', 'NO') AS VARCHAR2(3)) AS PIPELINED, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPEOWNER, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPENAME, CAST(DECODE(BITAND(R.FLAG, 8), 8, 'YES', 'NO') AS VARCHAR2(3)) AS PARALLEL, CAST('NO' AS VARCHAR2(3)) AS INTERFACE, CAST(DECODE(BITAND(R.FLAG, 4), 4, 'YES', 'NO') AS VARCHAR2(3)) AS DETERMINISTIC, CAST(DECODE(BITAND(R.FLAG, 16), 16, 'INVOKER', 'DEFINER') AS VARCHAR2(12)) AS AUTHID, R.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) R LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P ON R.PACKAGE_ID = P.PACKAGE_ID AND P.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (R.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(12, R.ROUTINE_ID, R.DATABASE_ID) = 1) AND (SYS_CONTEXT('USERENV', 'CON_ID') = R.TENANT_ID OR R.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, CASE RS.PACKAGE_ID WHEN -1 THEN RS.ROUTINE_NAME ELSE PS.PACKAGE_NAME END AS OBJECT_NAME, CASE RS.PACKAGE_ID WHEN -1 THEN NULL ELSE RS.ROUTINE_NAME END AS PROCEDURE_NAME, CASE RS.PACKAGE_ID WHEN -1 THEN RS.ROUTINE_ID ELSE RS.PACKAGE_ID END AS OBJECT_ID, CASE RS.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE RS.SUBPROGRAM_ID END AS SUBPROGRAM_ID, CASE RS.OVERLOAD WHEN 0 THEN NULL ELSE RS.OVERLOAD END AS OVERLOAD, CASE RS.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS OBJECT_TYPE, CAST('NO' AS VARCHAR2(3)) AS AGGREGATE, CAST(DECODE(BITAND(RS.FLAG, 128), 128, 'YES', 'NO') AS VARCHAR2(3)) AS PIPELINED, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPEOWNER, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPENAME, CAST(DECODE(BITAND(RS.FLAG, 8), 8, 'YES', 'NO') AS VARCHAR2(3)) AS PARALLEL, CAST('NO' AS VARCHAR2(3)) AS INTERFACE, CAST(DECODE(BITAND(RS.FLAG, 4), 4, 'YES', 'NO') AS VARCHAR2(3)) AS DETERMINISTIC, CAST(DECODE(BITAND(RS.FLAG, 16), 16, 'INVOKER', 'DEFINER') AS VARCHAR2(12)) AS AUTHID, RS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_ROUTINE_SYS_AGENT RS LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_SYS_AGENT PS ON RS.PACKAGE_ID = PS.PACKAGE_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -395,17 +384,16 @@ int ObInnerTableSchema::all_procedures_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_arguments_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_arguments_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -436,8 +424,7 @@ int ObInnerTableSchema::all_arguments_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT U.USER_NAME AS OWNER, R.ROUTINE_NAME AS OBJECT_NAME, CASE R.PACKAGE_ID WHEN -1 THEN NULL ELSE P.PACKAGE_NAME END AS PACKAGE_NAME, CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_ID ELSE R.PACKAGE_ID END AS OBJECT_ID, CASE R.OVERLOAD WHEN 0 THEN NULL ELSE R.OVERLOAD END AS OVERLOAD, CASE R.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE R.SUBPROGRAM_ID END AS SUBPROGRAM_ID, RP.PARAM_NAME AS ARGUMENT_NAME, RP.PARAM_POSITION AS POSITION, RP.SEQUENCE AS SEQUENCE, RP.PARAM_LEVEL AS DATA_LEVEL, V.DATA_TYPE_STR AS DATA_TYPE, 'NO' AS DEFAULTED, RP.PARAM_LENGTH AS DATA_LENGTH, DECODE(BITAND(RP.FLAG, 3), 1, 'IN', 2, 'OUT', 3, 'INOUT', 0, 'OUT') AS IN_OUT, RP.PARAM_PRECISION AS DATA_PRECISION, RP.PARAM_SCALE AS DATA_SCALE, CASE RP.PARAM_CHARSET WHEN 1 THEN 'BINARY' WHEN 2 THEN 'UTF8MB4' ELSE NULL END AS CHARACTER_SET_NAME, CASE RP.PARAM_COLL_TYPE WHEN 45 THEN 'UTF8MB4_GENERAL_CI' WHEN 46 THEN 'UTF8MB4_BIN' WHEN 63 THEN 'BINARY' ELSE NULL END AS COLLATION, RP.TYPE_OWNER AS TYPE_OWNER, RP.TYPE_NAME AS TYPE_NAME, RP.TYPE_SUBNAME AS TYPE_SUBNAME, RP.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) RP LEFT JOIN SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT R ON RP.ROUTINE_ID = R.ROUTINE_ID AND R.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P ON R.PACKAGE_ID = P.PACKAGE_ID AND P.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATA_TYPE V ON RP.PARAM_TYPE = V.DATA_TYPE WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = RP.TENANT_ID OR RP.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND (R.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(12, RP.ROUTINE_ID, 1) = 1) UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, RS.ROUTINE_NAME AS OBJECT_NAME, CASE RS.PACKAGE_ID WHEN -1 THEN NULL ELSE PS.PACKAGE_NAME END AS PACKAGE_NAME, CASE RS.PACKAGE_ID WHEN -1 THEN RS.ROUTINE_ID ELSE RS.PACKAGE_ID END AS OBJECT_ID, CASE RS.OVERLOAD WHEN 0 THEN NULL ELSE RS.OVERLOAD END AS OVERLOAD, CASE RS.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE RS.SUBPROGRAM_ID END AS SUBPROGRAM_ID, RPS.PARAM_NAME AS ARGUMENT_NAME, RPS.PARAM_POSITION AS POSITION, RPS.SEQUENCE AS SEQUENCE, RPS.PARAM_LEVEL AS DATA_LEVEL, VV.DATA_TYPE_STR AS DATA_TYPE, 'NO' AS DEFAULTED, RPS.PARAM_LENGTH AS DATA_LENGTH, DECODE(BITAND(RPS.FLAG, 3), 1, 'IN', 2, 'OUT', 3, 'INOUT') AS IN_OUT, RPS.PARAM_PRECISION AS DATA_PRECISION, RPS.PARAM_SCALE AS DATA_SCALE, CASE RPS.PARAM_CHARSET WHEN 1 THEN 'BINARY' WHEN 2 THEN 'UTF8MB4' ELSE NULL END AS CHARACTER_SET_NAME, CASE RPS.PARAM_COLL_TYPE WHEN 45 THEN 'UTF8MB4_GENERAL_CI' WHEN 46 THEN 'UTF8MB4_BIN' WHEN 63 THEN 'BINARY' ELSE NULL END AS COLLATION, RPS.TYPE_OWNER AS TYPE_OWNER, RPS.TYPE_NAME AS TYPE_NAME, RPS.TYPE_SUBNAME AS TYPE_SUBNAME, RPS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT RPS LEFT JOIN SYS.ALL_VIRTUAL_ROUTINE_SYS_AGENT RS ON RPS.ROUTINE_ID = RS.ROUTINE_ID LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_SYS_AGENT PS ON RS.PACKAGE_ID = PS.PACKAGE_ID LEFT JOIN SYS.ALL_VIRTUAL_DATA_TYPE VV ON RPS.PARAM_TYPE = VV.DATA_TYPE )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT U.USER_NAME AS OWNER, R.ROUTINE_NAME AS OBJECT_NAME, CASE R.PACKAGE_ID WHEN -1 THEN NULL ELSE P.PACKAGE_NAME END AS PACKAGE_NAME, CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_ID ELSE R.PACKAGE_ID END AS OBJECT_ID, CASE R.OVERLOAD WHEN 0 THEN NULL ELSE R.OVERLOAD END AS OVERLOAD, CASE R.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE R.SUBPROGRAM_ID END AS SUBPROGRAM_ID, RP.PARAM_NAME AS ARGUMENT_NAME, RP.PARAM_POSITION AS POSITION, RP.SEQUENCE AS SEQUENCE, RP.PARAM_LEVEL AS DATA_LEVEL, V.DATA_TYPE_STR AS DATA_TYPE, 'NO' AS DEFAULTED, RP.PARAM_LENGTH AS DATA_LENGTH, DECODE(BITAND(RP.FLAG, 3), 1, 'IN', 2, 'OUT', 3, 'INOUT', 0, 'OUT') AS IN_OUT, RP.PARAM_PRECISION AS DATA_PRECISION, RP.PARAM_SCALE AS DATA_SCALE, CASE RP.PARAM_CHARSET WHEN 1 THEN 'BINARY' WHEN 2 THEN 'UTF8MB4' ELSE NULL END AS CHARACTER_SET_NAME, CASE RP.PARAM_COLL_TYPE WHEN 45 THEN 'UTF8MB4_GENERAL_CI' WHEN 46 THEN 'UTF8MB4_BIN' WHEN 63 THEN 'BINARY' ELSE NULL END AS COLLATION, RP.TYPE_OWNER AS TYPE_OWNER, RP.TYPE_NAME AS TYPE_NAME, RP.TYPE_SUBNAME AS TYPE_SUBNAME, RP.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) RP LEFT JOIN SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT R ON RP.ROUTINE_ID = R.ROUTINE_ID AND R.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P ON R.PACKAGE_ID = P.PACKAGE_ID AND P.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATA_TYPE V ON RP.PARAM_TYPE = V.DATA_TYPE WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = RP.TENANT_ID OR RP.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND (R.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(12, RP.ROUTINE_ID, 1) = 1) UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, RS.ROUTINE_NAME AS OBJECT_NAME, CASE RS.PACKAGE_ID WHEN -1 THEN NULL ELSE PS.PACKAGE_NAME END AS PACKAGE_NAME, CASE RS.PACKAGE_ID WHEN -1 THEN RS.ROUTINE_ID ELSE RS.PACKAGE_ID END AS OBJECT_ID, CASE RS.OVERLOAD WHEN 0 THEN NULL ELSE RS.OVERLOAD END AS OVERLOAD, CASE RS.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE RS.SUBPROGRAM_ID END AS SUBPROGRAM_ID, RPS.PARAM_NAME AS ARGUMENT_NAME, RPS.PARAM_POSITION AS POSITION, RPS.SEQUENCE AS SEQUENCE, RPS.PARAM_LEVEL AS DATA_LEVEL, VV.DATA_TYPE_STR AS DATA_TYPE, 'NO' AS DEFAULTED, RPS.PARAM_LENGTH AS DATA_LENGTH, DECODE(BITAND(RPS.FLAG, 3), 1, 'IN', 2, 'OUT', 3, 'INOUT') AS IN_OUT, RPS.PARAM_PRECISION AS DATA_PRECISION, RPS.PARAM_SCALE AS DATA_SCALE, CASE RPS.PARAM_CHARSET WHEN 1 THEN 'BINARY' WHEN 2 THEN 'UTF8MB4' ELSE NULL END AS CHARACTER_SET_NAME, CASE RPS.PARAM_COLL_TYPE WHEN 45 THEN 'UTF8MB4_GENERAL_CI' WHEN 46 THEN 'UTF8MB4_BIN' WHEN 63 THEN 'BINARY' ELSE NULL END AS COLLATION, RPS.TYPE_OWNER AS TYPE_OWNER, RPS.TYPE_NAME AS TYPE_NAME, RPS.TYPE_SUBNAME AS TYPE_SUBNAME, RPS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT RPS LEFT JOIN SYS.ALL_VIRTUAL_ROUTINE_SYS_AGENT RS ON RPS.ROUTINE_ID = RS.ROUTINE_ID LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_SYS_AGENT PS ON RS.PACKAGE_ID = PS.PACKAGE_ID LEFT JOIN SYS.ALL_VIRTUAL_DATA_TYPE VV ON RPS.PARAM_TYPE = VV.DATA_TYPE )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -449,17 +436,16 @@ int ObInnerTableSchema::all_arguments_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_source_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_source_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -490,8 +476,7 @@ int ObInnerTableSchema::all_source_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(U.USER_NAME AS VARCHAR2(30)) AS OWNER, CAST(P.PACKAGE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE P.TYPE WHEN 1 THEN 'PACKAGE' WHEN 2 THEN 'PACKAGE BODY' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(P.SOURCE) AS TEXT, P.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) P LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON P.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON P.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = P.TENANT_ID OR P.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND (P.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(12, P.PACKAGE_ID, P.DATABASE_ID) = 1) UNION ALL SELECT CAST(U.USER_NAME AS VARCHAR2(30)) AS OWNER, CAST(R.ROUTINE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE R.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(R.ROUTINE_BODY) AS TEXT, R.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) R LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = R.TENANT_ID OR R.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND R.PACKAGE_ID = -1 AND (R.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(12, R.ROUTINE_ID, R.DATABASE_ID) = 1) UNION ALL SELECT CAST(U.USER_NAME AS VARCHAR2(30)) AS OWNER, CAST(T.TRIGGER_NAME AS VARCHAR2(30)) AS NAME, CAST('TRIGGER' AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(T.TRIGGER_BODY) AS TEXT, T.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID())T LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON T.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = T.TENANT_ID OR T.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND (T.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(12, T.TRIGGER_ID, T.DATABASE_ID) = 1) UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, CAST(PS.PACKAGE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE PS.TYPE WHEN 1 THEN 'PACKAGE' WHEN 2 THEN 'PACKAGE BODY' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(PS.SOURCE) AS TEXT, PS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_PACKAGE_SYS_AGENT PS UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, CAST(RS.ROUTINE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE RS.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(RS.ROUTINE_BODY) AS TEXT, RS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_ROUTINE_SYS_AGENT RS WHERE RS.ROUTINE_TYPE != 3 UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, CAST(TS.TRIGGER_NAME AS VARCHAR2(30)) AS NAME, CAST('TRIGGER' AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(TS.TRIGGER_BODY) AS TEXT, TS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT TS )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(U.USER_NAME AS VARCHAR2(30)) AS OWNER, CAST(P.PACKAGE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE P.TYPE WHEN 1 THEN 'PACKAGE' WHEN 2 THEN 'PACKAGE BODY' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(P.SOURCE) AS TEXT, P.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) P LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON P.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON P.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = P.TENANT_ID OR P.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND (P.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(12, P.PACKAGE_ID, P.DATABASE_ID) = 1) UNION ALL SELECT CAST(U.USER_NAME AS VARCHAR2(30)) AS OWNER, CAST(R.ROUTINE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE R.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(R.ROUTINE_BODY) AS TEXT, R.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) R LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = R.TENANT_ID OR R.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND R.PACKAGE_ID = -1 AND (R.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(12, R.ROUTINE_ID, R.DATABASE_ID) = 1) UNION ALL SELECT CAST(U.USER_NAME AS VARCHAR2(30)) AS OWNER, CAST(T.TRIGGER_NAME AS VARCHAR2(30)) AS NAME, CAST('TRIGGER' AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(T.TRIGGER_BODY) AS TEXT, T.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID())T LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON T.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = T.TENANT_ID OR T.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND (T.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(12, T.TRIGGER_ID, T.DATABASE_ID) = 1) UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, CAST(PS.PACKAGE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE PS.TYPE WHEN 1 THEN 'PACKAGE' WHEN 2 THEN 'PACKAGE BODY' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(PS.SOURCE) AS TEXT, PS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_PACKAGE_SYS_AGENT PS UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, CAST(RS.ROUTINE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE RS.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(RS.ROUTINE_BODY) AS TEXT, RS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_ROUTINE_SYS_AGENT RS WHERE RS.ROUTINE_TYPE != 3 UNION ALL SELECT CAST('SYS' AS VARCHAR2(30)) AS OWNER, CAST(TS.TRIGGER_NAME AS VARCHAR2(30)) AS NAME, CAST('TRIGGER' AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(TS.TRIGGER_BODY) AS TEXT, TS.TENANT_ID AS ORIGIN_CON_ID FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT TS )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -503,17 +488,16 @@ int ObInnerTableSchema::all_source_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_procedures_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_procedures_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -544,8 +528,7 @@ int ObInnerTableSchema::user_procedures_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema - .set_view_definition(R"__( SELECT CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_NAME ELSE P.PACKAGE_NAME END AS OBJECT_NAME, CASE R.PACKAGE_ID WHEN -1 THEN NULL ELSE R.ROUTINE_NAME END AS PROCEDURE_NAME, CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_ID ELSE R.PACKAGE_ID END AS OBJECT_ID, CASE R.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE R.SUBPROGRAM_ID END AS SUBPROGRAM_ID, CASE R.OVERLOAD WHEN 0 THEN NULL ELSE R.OVERLOAD END AS OVERLOAD, CASE R.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS OBJECT_TYPE, CAST('NO' AS VARCHAR2(3)) AS AGGREGATE, CAST(DECODE(BITAND(R.FLAG, 128), 128, 'YES', 'NO') AS VARCHAR2(3)) AS PIPELINED, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPEOWNER, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPENAME, CAST(DECODE(BITAND(R.FLAG, 8), 8, 'YES', 'NO') AS VARCHAR2(3)) AS PARALLEL, CAST('NO' AS VARCHAR2(3)) AS INTERFACE, CAST(DECODE(BITAND(R.FLAG, 4), 4, 'YES', 'NO') AS VARCHAR2(3)) AS DETERMINISTIC, CAST(DECODE(BITAND(R.FLAG, 16), 16, 'INVOKER', 'DEFINER') AS VARCHAR2(12)) AS AUTHID, R.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) R LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P ON R.PACKAGE_ID = P.PACKAGE_ID AND P.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = R.TENANT_ID OR R.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND R.DATABASE_ID = USERENV('SCHEMAID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_NAME ELSE P.PACKAGE_NAME END AS OBJECT_NAME, CASE R.PACKAGE_ID WHEN -1 THEN NULL ELSE R.ROUTINE_NAME END AS PROCEDURE_NAME, CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_ID ELSE R.PACKAGE_ID END AS OBJECT_ID, CASE R.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE R.SUBPROGRAM_ID END AS SUBPROGRAM_ID, CASE R.OVERLOAD WHEN 0 THEN NULL ELSE R.OVERLOAD END AS OVERLOAD, CASE R.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS OBJECT_TYPE, CAST('NO' AS VARCHAR2(3)) AS AGGREGATE, CAST(DECODE(BITAND(R.FLAG, 128), 128, 'YES', 'NO') AS VARCHAR2(3)) AS PIPELINED, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPEOWNER, CAST(NULL AS VARCHAR2(30)) AS IMPLTYPENAME, CAST(DECODE(BITAND(R.FLAG, 8), 8, 'YES', 'NO') AS VARCHAR2(3)) AS PARALLEL, CAST('NO' AS VARCHAR2(3)) AS INTERFACE, CAST(DECODE(BITAND(R.FLAG, 4), 4, 'YES', 'NO') AS VARCHAR2(3)) AS DETERMINISTIC, CAST(DECODE(BITAND(R.FLAG, 16), 16, 'INVOKER', 'DEFINER') AS VARCHAR2(12)) AS AUTHID, R.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) R LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P ON R.PACKAGE_ID = P.PACKAGE_ID AND P.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = R.TENANT_ID OR R.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND R.DATABASE_ID = USERENV('SCHEMAID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -557,17 +540,16 @@ int ObInnerTableSchema::user_procedures_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_arguments_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_arguments_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -598,8 +580,7 @@ int ObInnerTableSchema::user_arguments_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT R.ROUTINE_NAME AS OBJECT_NAME, CASE R.PACKAGE_ID WHEN -1 THEN NULL ELSE P.PACKAGE_NAME END AS PACKAGE_NAME, CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_ID ELSE R.PACKAGE_ID END AS OBJECT_ID, CASE R.OVERLOAD WHEN 0 THEN NULL ELSE R.OVERLOAD END AS OVERLOAD, CASE R.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE R.SUBPROGRAM_ID END AS SUBPROGRAM_ID, RP.PARAM_NAME AS ARGUMENT_NAME, RP.PARAM_POSITION AS POSITION, RP.SEQUENCE AS SEQUENCE, RP.PARAM_LEVEL AS DATA_LEVEL, V.DATA_TYPE_STR AS DATA_TYPE, 'NO' AS DEFAULTED, RP.PARAM_LENGTH AS DATA_LENGTH, DECODE(BITAND(RP.FLAG, 3), 1, 'IN', 2, 'OUT', 3, 'INOUT', 0, 'OUT') AS IN_OUT, RP.PARAM_PRECISION AS DATA_PRECISION, RP.PARAM_SCALE AS DATA_SCALE, CASE RP.PARAM_CHARSET WHEN 1 THEN 'BINARY' WHEN 2 THEN 'UTF8MB4' ELSE NULL END AS CHARACTER_SET_NAME, CASE RP.PARAM_COLL_TYPE WHEN 45 THEN 'UTF8MB4_GENERAL_CI' WHEN 46 THEN 'UTF8MB4_BIN' WHEN 63 THEN 'BINARY' ELSE NULL END AS COLLATION, RP.TYPE_OWNER AS TYPE_OWNER, RP.TYPE_NAME AS TYPE_NAME, RP.TYPE_SUBNAME AS TYPE_SUBNAME, RP.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID())RP LEFT JOIN SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT R ON RP.ROUTINE_ID = R.ROUTINE_ID AND R.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P ON R.PACKAGE_ID = P.PACKAGE_ID AND P.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATA_TYPE V ON RP.PARAM_TYPE = V.DATA_TYPE WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = RP.TENANT_ID OR RP.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND R.DATABASE_ID = USERENV('SCHEMAID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT R.ROUTINE_NAME AS OBJECT_NAME, CASE R.PACKAGE_ID WHEN -1 THEN NULL ELSE P.PACKAGE_NAME END AS PACKAGE_NAME, CASE R.PACKAGE_ID WHEN -1 THEN R.ROUTINE_ID ELSE R.PACKAGE_ID END AS OBJECT_ID, CASE R.OVERLOAD WHEN 0 THEN NULL ELSE R.OVERLOAD END AS OVERLOAD, CASE R.SUBPROGRAM_ID WHEN 0 THEN 1 ELSE R.SUBPROGRAM_ID END AS SUBPROGRAM_ID, RP.PARAM_NAME AS ARGUMENT_NAME, RP.PARAM_POSITION AS POSITION, RP.SEQUENCE AS SEQUENCE, RP.PARAM_LEVEL AS DATA_LEVEL, V.DATA_TYPE_STR AS DATA_TYPE, 'NO' AS DEFAULTED, RP.PARAM_LENGTH AS DATA_LENGTH, DECODE(BITAND(RP.FLAG, 3), 1, 'IN', 2, 'OUT', 3, 'INOUT', 0, 'OUT') AS IN_OUT, RP.PARAM_PRECISION AS DATA_PRECISION, RP.PARAM_SCALE AS DATA_SCALE, CASE RP.PARAM_CHARSET WHEN 1 THEN 'BINARY' WHEN 2 THEN 'UTF8MB4' ELSE NULL END AS CHARACTER_SET_NAME, CASE RP.PARAM_COLL_TYPE WHEN 45 THEN 'UTF8MB4_GENERAL_CI' WHEN 46 THEN 'UTF8MB4_BIN' WHEN 63 THEN 'BINARY' ELSE NULL END AS COLLATION, RP.TYPE_OWNER AS TYPE_OWNER, RP.TYPE_NAME AS TYPE_NAME, RP.TYPE_SUBNAME AS TYPE_SUBNAME, RP.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID())RP LEFT JOIN SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT R ON RP.ROUTINE_ID = R.ROUTINE_ID AND R.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT P ON R.PACKAGE_ID = P.PACKAGE_ID AND P.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_DATA_TYPE V ON RP.PARAM_TYPE = V.DATA_TYPE WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = RP.TENANT_ID OR RP.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND R.DATABASE_ID = USERENV('SCHEMAID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -611,17 +592,16 @@ int ObInnerTableSchema::user_arguments_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_source_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_source_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -652,8 +632,7 @@ int ObInnerTableSchema::user_source_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(P.PACKAGE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE P.TYPE WHEN 1 THEN 'PACKAGE' WHEN 2 THEN 'PACKAGE BODY' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(P.SOURCE) AS TEXT, P.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) P LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON P.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON P.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = P.TENANT_ID OR P.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 UNION ALL SELECT CAST(R.ROUTINE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE R.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(R.ROUTINE_BODY) AS TEXT, R.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) R LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = R.TENANT_ID OR R.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND R.PACKAGE_ID = -1 AND R.DATABASE_ID = USERENV('SCHEMAID') UNION ALL SELECT CAST(T.TRIGGER_NAME AS VARCHAR2(30)) AS NAME, CAST('TRIGGER' AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(T.TRIGGER_BODY) AS TEXT, T.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) T LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON T.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = T.TENANT_ID OR T.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND T.DATABASE_ID = USERENV('SCHEMAID'); )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(P.PACKAGE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE P.TYPE WHEN 1 THEN 'PACKAGE' WHEN 2 THEN 'PACKAGE BODY' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(P.SOURCE) AS TEXT, P.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) P LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON P.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON P.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = P.TENANT_ID OR P.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 UNION ALL SELECT CAST(R.ROUTINE_NAME AS VARCHAR2(30)) AS NAME, CAST(CASE R.ROUTINE_TYPE WHEN 1 THEN 'PROCEDURE' WHEN 2 THEN 'FUNCTION' WHEN 3 THEN 'PACKAGE' END AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(R.ROUTINE_BODY) AS TEXT, R.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) R LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON R.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON R.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = R.TENANT_ID OR R.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND R.PACKAGE_ID = -1 AND R.DATABASE_ID = USERENV('SCHEMAID') UNION ALL SELECT CAST(T.TRIGGER_NAME AS VARCHAR2(30)) AS NAME, CAST('TRIGGER' AS VARCHAR2(12)) AS TYPE, CAST(1 AS NUMBER) AS LINE, TO_CLOB(T.TRIGGER_BODY) AS TEXT, T.TENANT_ID AS ORIGIN_CON_ID FROM (SELECT * FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) T LEFT JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D ON T.DATABASE_ID = D.DATABASE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_USER_REAL_AGENT U ON T.OWNER_ID = U.USER_ID AND U.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = T.TENANT_ID OR T.TENANT_ID = 1) AND D.IN_RECYCLEBIN = 0 AND T.DATABASE_ID = USERENV('SCHEMAID'); )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -665,17 +644,16 @@ int ObInnerTableSchema::user_source_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_part_key_columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_part_key_columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -706,8 +684,7 @@ int ObInnerTableSchema::dba_part_key_columns_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT D.DATABASE_NAME AS OWNER, CAST(T.TABLE_NAME AS VARCHAR2(128)) AS NAME, 'TABLE' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 255) AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND C.TABLE_ID = T.TABLE_ID AND T.DATABASE_ID = D.DATABASE_ID AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND T.TABLE_TYPE IN (0, 2, 3, 8, 9, 10, 11) AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() UNION SELECT D.DATABASE_NAME AS OWNER, CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 255) AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.TABLE_ID AND T.TABLE_TYPE = 5 AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() UNION SELECT D.DATABASE_NAME AS OWNER, CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(-1 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.DATA_TABLE_ID AND T.TABLE_TYPE = 5 AND T.INDEX_TYPE IN (1,2) AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT D.DATABASE_NAME AS OWNER, CAST(T.TABLE_NAME AS VARCHAR2(128)) AS NAME, 'TABLE' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 255) AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND C.TABLE_ID = T.TABLE_ID AND T.DATABASE_ID = D.DATABASE_ID AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND T.TABLE_TYPE IN (0, 2, 3, 8, 9, 10, 11) AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() UNION SELECT D.DATABASE_NAME AS OWNER, CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 255) AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.TABLE_ID AND T.TABLE_TYPE = 5 AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() UNION SELECT D.DATABASE_NAME AS OWNER, CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(-1 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.DATA_TABLE_ID AND T.TABLE_TYPE = 5 AND T.INDEX_TYPE IN (1,2) AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -719,17 +696,16 @@ int ObInnerTableSchema::dba_part_key_columns_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_part_key_columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_part_key_columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -760,8 +736,7 @@ int ObInnerTableSchema::all_part_key_columns_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT D.DATABASE_NAME AS OWNER, CAST(T.TABLE_NAME AS VARCHAR2(128)) AS NAME, 'TABLE' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 255) AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND C.TABLE_ID = T.TABLE_ID AND T.DATABASE_ID = D.DATABASE_ID AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND T.TABLE_TYPE IN (0, 2, 3, 8, 9, 10, 11) AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND (T.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, T.TABLE_ID, T.DATABASE_ID) = 1) UNION SELECT D.DATABASE_NAME AS OWNER, CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 255) AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.TABLE_ID AND T.TABLE_TYPE = 5 AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND (T.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, T.TABLE_ID, T.DATABASE_ID) = 1) UNION SELECT D.DATABASE_NAME AS OWNER, CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(-1 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.DATA_TABLE_ID AND T.TABLE_TYPE = 5 AND T.INDEX_TYPE IN (1,2) AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND (T.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, T.DATA_TABLE_ID, T.DATABASE_ID) = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT D.DATABASE_NAME AS OWNER, CAST(T.TABLE_NAME AS VARCHAR2(128)) AS NAME, 'TABLE' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 255) AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND C.TABLE_ID = T.TABLE_ID AND T.DATABASE_ID = D.DATABASE_ID AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND T.TABLE_TYPE IN (0, 2, 3, 8, 9, 10, 11) AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND (T.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, T.TABLE_ID, T.DATABASE_ID) = 1) UNION SELECT D.DATABASE_NAME AS OWNER, CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 255) AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.TABLE_ID AND T.TABLE_TYPE = 5 AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND (T.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, T.TABLE_ID, T.DATABASE_ID) = 1) UNION SELECT D.DATABASE_NAME AS OWNER, CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(-1 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.DATA_TABLE_ID AND T.TABLE_TYPE = 5 AND T.INDEX_TYPE IN (1,2) AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND (T.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, T.DATA_TABLE_ID, T.DATABASE_ID) = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -773,17 +748,16 @@ int ObInnerTableSchema::all_part_key_columns_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_part_key_columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_part_key_columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -814,8 +788,7 @@ int ObInnerTableSchema::user_part_key_columns_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(T.TABLE_NAME AS VARCHAR2(128)) AS NAME, 'TABLE' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 255) AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T WHERE C.TENANT_ID = T.TENANT_ID AND C.TABLE_ID = T.TABLE_ID AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND T.TABLE_TYPE IN (0, 2, 3, 8, 9, 10, 11) AND T.DATABASE_ID = USERENV('SCHEMAID') AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() UNION SELECT CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 255) AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.TABLE_ID AND T.TABLE_TYPE = 5 AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND T.DATABASE_ID = USERENV('SCHEMAID') AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() UNION SELECT CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(-1 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.DATA_TABLE_ID AND T.TABLE_TYPE = 5 AND T.INDEX_TYPE IN (1,2) AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND T.DATABASE_ID = USERENV('SCHEMAID') AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(T.TABLE_NAME AS VARCHAR2(128)) AS NAME, 'TABLE' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 255) AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T WHERE C.TENANT_ID = T.TENANT_ID AND C.TABLE_ID = T.TABLE_ID AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND T.TABLE_TYPE IN (0, 2, 3, 8, 9, 10, 11) AND T.DATABASE_ID = USERENV('SCHEMAID') AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() UNION SELECT CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 255) AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.TABLE_ID AND T.TABLE_TYPE = 5 AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND T.DATABASE_ID = USERENV('SCHEMAID') AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() UNION SELECT CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(-1 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.DATA_TABLE_ID AND T.TABLE_TYPE = 5 AND T.INDEX_TYPE IN (1,2) AND BITAND(C.PARTITION_KEY_POSITION, 255) > 0 AND T.DATABASE_ID = USERENV('SCHEMAID') AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -827,17 +800,16 @@ int ObInnerTableSchema::user_part_key_columns_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_subpart_key_columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_subpart_key_columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -868,8 +840,7 @@ int ObInnerTableSchema::dba_subpart_key_columns_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT D.DATABASE_NAME AS OWNER, CAST(T.TABLE_NAME AS VARCHAR2(128)) AS NAME, 'TABLE' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 65280)/256 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND C.TABLE_ID = T.TABLE_ID AND T.DATABASE_ID = D.DATABASE_ID AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND T.TABLE_TYPE IN (0, 2, 3, 8, 9, 10, 11) AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() UNION SELECT D.DATABASE_NAME AS OWNER, CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 65280)/256 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.TABLE_ID AND T.TABLE_TYPE = 5 AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() UNION SELECT D.DATABASE_NAME AS OWNER, CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(-1 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.DATA_TABLE_ID AND T.TABLE_TYPE = 5 AND T.INDEX_TYPE IN (1,2) AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT D.DATABASE_NAME AS OWNER, CAST(T.TABLE_NAME AS VARCHAR2(128)) AS NAME, 'TABLE' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 65280)/256 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND C.TABLE_ID = T.TABLE_ID AND T.DATABASE_ID = D.DATABASE_ID AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND T.TABLE_TYPE IN (0, 2, 3, 8, 9, 10, 11) AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() UNION SELECT D.DATABASE_NAME AS OWNER, CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 65280)/256 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.TABLE_ID AND T.TABLE_TYPE = 5 AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() UNION SELECT D.DATABASE_NAME AS OWNER, CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(-1 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.DATA_TABLE_ID AND T.TABLE_TYPE = 5 AND T.INDEX_TYPE IN (1,2) AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -881,17 +852,16 @@ int ObInnerTableSchema::dba_subpart_key_columns_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_subpart_key_columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_subpart_key_columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -922,8 +892,7 @@ int ObInnerTableSchema::all_subpart_key_columns_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT D.DATABASE_NAME AS OWNER, CAST(T.TABLE_NAME AS VARCHAR2(128)) AS NAME, 'TABLE' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 65280)/256 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND C.TABLE_ID = T.TABLE_ID AND T.DATABASE_ID = D.DATABASE_ID AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND T.TABLE_TYPE IN (0, 2, 3, 8, 9, 10, 11) AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND (T.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, T.TABLE_ID, T.DATABASE_ID) = 1) UNION SELECT D.DATABASE_NAME AS OWNER, CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 65280)/256 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.TABLE_ID AND T.TABLE_TYPE = 5 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND (T.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, T.DATA_TABLE_ID, T.DATABASE_ID) = 1) UNION SELECT D.DATABASE_NAME AS OWNER, CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(-1 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.DATA_TABLE_ID AND T.TABLE_TYPE = 5 AND T.INDEX_TYPE IN (1,2) AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND (T.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, T.DATA_TABLE_ID, T.DATABASE_ID) = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT D.DATABASE_NAME AS OWNER, CAST(T.TABLE_NAME AS VARCHAR2(128)) AS NAME, 'TABLE' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 65280)/256 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND C.TABLE_ID = T.TABLE_ID AND T.DATABASE_ID = D.DATABASE_ID AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND T.TABLE_TYPE IN (0, 2, 3, 8, 9, 10, 11) AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND (T.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, T.TABLE_ID, T.DATABASE_ID) = 1) UNION SELECT D.DATABASE_NAME AS OWNER, CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 65280)/256 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.TABLE_ID AND T.TABLE_TYPE = 5 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND (T.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, T.DATA_TABLE_ID, T.DATABASE_ID) = 1) UNION SELECT D.DATABASE_NAME AS OWNER, CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(-1 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.DATA_TABLE_ID AND T.TABLE_TYPE = 5 AND T.INDEX_TYPE IN (1,2) AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND (T.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, T.DATA_TABLE_ID, T.DATABASE_ID) = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -935,17 +904,16 @@ int ObInnerTableSchema::all_subpart_key_columns_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_subpart_key_columns_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_subpart_key_columns_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -976,8 +944,7 @@ int ObInnerTableSchema::user_subpart_key_columns_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(T.TABLE_NAME AS VARCHAR2(128)) AS NAME, 'TABLE' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 65280)/256 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T WHERE C.TENANT_ID = T.TENANT_ID AND C.TABLE_ID = T.TABLE_ID AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND T.TABLE_TYPE IN (0, 2, 3, 8, 9, 10, 11) AND T.DATABASE_ID = USERENV('SCHEMAID') AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() UNION SELECT CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 65280)/256 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.TABLE_ID AND T.TABLE_TYPE = 5 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND T.DATABASE_ID = USERENV('SCHEMAID') UNION SELECT CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(-1 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.DATA_TABLE_ID AND T.TABLE_TYPE = 5 AND T.INDEX_TYPE IN (1,2) AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND T.DATABASE_ID = USERENV('SCHEMAID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(T.TABLE_NAME AS VARCHAR2(128)) AS NAME, 'TABLE' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 65280)/256 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T WHERE C.TENANT_ID = T.TENANT_ID AND C.TABLE_ID = T.TABLE_ID AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND T.TABLE_TYPE IN (0, 2, 3, 8, 9, 10, 11) AND T.DATABASE_ID = USERENV('SCHEMAID') AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() UNION SELECT CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(BITAND(C.PARTITION_KEY_POSITION, 65280)/256 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.TABLE_ID AND T.TABLE_TYPE = 5 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND T.DATABASE_ID = USERENV('SCHEMAID') UNION SELECT CAST(CASE WHEN D.DATABASE_NAME = '__recyclebin' THEN T.TABLE_NAME ELSE SUBSTR(T.TABLE_NAME, 7 + INSTR(SUBSTR(T.TABLE_NAME, 7), '_')) END AS VARCHAR2(128)) AS NAME, 'INDEX' AS OBJECT_TYPE, CAST(C.COLUMN_NAME AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(-1 AS NUMBER) AS COLUMN_POSITION, CAST(NULL AS NUMBER) AS COLLATED_COLUMN_ID FROM SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT D WHERE C.TENANT_ID = T.TENANT_ID AND T.TENANT_ID = D.TENANT_ID AND T.DATABASE_ID = D.DATABASE_ID AND C.TABLE_ID = T.DATA_TABLE_ID AND T.TABLE_TYPE = 5 AND T.INDEX_TYPE IN (1,2) AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND D.TENANT_ID = EFFECTIVE_TENANT_ID() AND BITAND(C.PARTITION_KEY_POSITION, 65280) > 0 AND T.DATABASE_ID = USERENV('SCHEMAID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -989,17 +956,16 @@ int ObInnerTableSchema::user_subpart_key_columns_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_views_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_views_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1030,8 +996,7 @@ int ObInnerTableSchema::dba_views_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST('SYS' AS VARCHAR2(128)) OWNER, CAST(TABLE_NAME AS VARCHAR2(128)) VIEW_NAME, CAST(LENGTH(VIEW_DEFINITION) AS NUMBER) TEXT_LENGTH, TO_CLOB(VIEW_DEFINITION) TEXT, CAST(NULL AS NUMBER) OID_TEXT_LENGTH, CAST(NULL AS VARCHAR2(4000)) OID_TEXT, CAST(NULL AS VARCHAR2(30)) VIEW_TYPE, CAST(NULL AS VARCHAR2(30)) SUPERVIEW_NAME, CAST(NULL AS VARCHAR2(1)) EDITIONING_VIEW, CAST(NULL AS VARCHAR2(1)) READ_ONLY FROM SYS.ALL_VIRTUAL_TABLE_SYS_AGENT WHERE BITAND(TABLE_ID, 1099511627775) > 25000 AND BITAND(TABLE_ID, 1099511627775) <= 28000 AND TABLE_TYPE = 1 UNION ALL SELECT CAST(B.DATABASE_NAME AS VARCHAR2(128)) OWNER, CAST(A.TABLE_NAME AS VARCHAR2(128)) VIEW_NAME, CAST(LENGTH(A.VIEW_DEFINITION) AS NUMBER) TEXT_LENGTH, TO_CLOB(VIEW_DEFINITION) TEXT, CAST(NULL AS NUMBER) OID_TEXT_LENGTH, CAST(NULL AS VARCHAR2(4000)) OID_TEXT, CAST(NULL AS VARCHAR2(30)) VIEW_TYPE, CAST(NULL AS VARCHAR2(30)) SUPERVIEW_NAME, CAST(NULL AS VARCHAR2(1)) EDITIONING_VIEW, CAST(NULL AS VARCHAR2(1)) READ_ONLY FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B WHERE A.TABLE_TYPE = 4 AND A.DATABASE_ID = B.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST('SYS' AS VARCHAR2(128)) OWNER, CAST(TABLE_NAME AS VARCHAR2(128)) VIEW_NAME, CAST(LENGTH(VIEW_DEFINITION) AS NUMBER) TEXT_LENGTH, TO_CLOB(VIEW_DEFINITION) TEXT, CAST(NULL AS NUMBER) OID_TEXT_LENGTH, CAST(NULL AS VARCHAR2(4000)) OID_TEXT, CAST(NULL AS VARCHAR2(30)) VIEW_TYPE, CAST(NULL AS VARCHAR2(30)) SUPERVIEW_NAME, CAST(NULL AS VARCHAR2(1)) EDITIONING_VIEW, CAST(NULL AS VARCHAR2(1)) READ_ONLY FROM SYS.ALL_VIRTUAL_TABLE_SYS_AGENT WHERE BITAND(TABLE_ID, 1099511627775) > 25000 AND BITAND(TABLE_ID, 1099511627775) <= 28000 AND TABLE_TYPE = 1 UNION ALL SELECT CAST(B.DATABASE_NAME AS VARCHAR2(128)) OWNER, CAST(A.TABLE_NAME AS VARCHAR2(128)) VIEW_NAME, CAST(LENGTH(A.VIEW_DEFINITION) AS NUMBER) TEXT_LENGTH, TO_CLOB(VIEW_DEFINITION) TEXT, CAST(NULL AS NUMBER) OID_TEXT_LENGTH, CAST(NULL AS VARCHAR2(4000)) OID_TEXT, CAST(NULL AS VARCHAR2(30)) VIEW_TYPE, CAST(NULL AS VARCHAR2(30)) SUPERVIEW_NAME, CAST(NULL AS VARCHAR2(1)) EDITIONING_VIEW, CAST(NULL AS VARCHAR2(1)) READ_ONLY FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B WHERE A.TABLE_TYPE = 4 AND A.DATABASE_ID = B.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1043,17 +1008,16 @@ int ObInnerTableSchema::dba_views_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_views_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_views_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1084,8 +1048,7 @@ int ObInnerTableSchema::all_views_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST('SYS' AS VARCHAR2(128)) OWNER, CAST(TABLE_NAME AS VARCHAR2(128)) VIEW_NAME, CAST(LENGTH(VIEW_DEFINITION) AS NUMBER) TEXT_LENGTH, TO_CLOB(VIEW_DEFINITION) TEXT, CAST(NULL AS NUMBER) OID_TEXT_LENGTH, CAST(NULL AS VARCHAR2(4000)) OID_TEXT, CAST(NULL AS VARCHAR2(30)) VIEW_TYPE, CAST(NULL AS VARCHAR2(30)) SUPERVIEW_NAME, CAST(NULL AS VARCHAR2(1)) EDITIONING_VIEW, CAST(NULL AS VARCHAR2(1)) READ_ONLY FROM SYS.ALL_VIRTUAL_TABLE_SYS_AGENT WHERE BITAND(TABLE_ID, 1099511627775) > 25000 AND BITAND(TABLE_ID, 1099511627775) <= 28000 AND TABLE_TYPE = 1 AND ((SUBSTR(TABLE_NAME,1,3) = 'DBA' AND USER_CAN_ACCESS_OBJ(1, TABLE_ID, DATABASE_ID) =1) OR SUBSTR(TABLE_NAME,1,3) != 'DBA') UNION ALL SELECT CAST(B.DATABASE_NAME AS VARCHAR2(128)) OWNER, CAST(A.TABLE_NAME AS VARCHAR2(128)) VIEW_NAME, CAST(LENGTH(A.VIEW_DEFINITION) AS NUMBER) TEXT_LENGTH, TO_CLOB(VIEW_DEFINITION) TEXT, CAST(NULL AS NUMBER) OID_TEXT_LENGTH, CAST(NULL AS VARCHAR2(4000)) OID_TEXT, CAST(NULL AS VARCHAR2(30)) VIEW_TYPE, CAST(NULL AS VARCHAR2(30)) SUPERVIEW_NAME, CAST(NULL AS VARCHAR2(1)) EDITIONING_VIEW, CAST(NULL AS VARCHAR2(1)) READ_ONLY FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B WHERE A.TABLE_TYPE = 4 AND A.DATABASE_ID = B.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, A.TABLE_ID, A.DATABASE_ID) =1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST('SYS' AS VARCHAR2(128)) OWNER, CAST(TABLE_NAME AS VARCHAR2(128)) VIEW_NAME, CAST(LENGTH(VIEW_DEFINITION) AS NUMBER) TEXT_LENGTH, TO_CLOB(VIEW_DEFINITION) TEXT, CAST(NULL AS NUMBER) OID_TEXT_LENGTH, CAST(NULL AS VARCHAR2(4000)) OID_TEXT, CAST(NULL AS VARCHAR2(30)) VIEW_TYPE, CAST(NULL AS VARCHAR2(30)) SUPERVIEW_NAME, CAST(NULL AS VARCHAR2(1)) EDITIONING_VIEW, CAST(NULL AS VARCHAR2(1)) READ_ONLY FROM SYS.ALL_VIRTUAL_TABLE_SYS_AGENT WHERE BITAND(TABLE_ID, 1099511627775) > 25000 AND BITAND(TABLE_ID, 1099511627775) <= 28000 AND TABLE_TYPE = 1 AND ((SUBSTR(TABLE_NAME,1,3) = 'DBA' AND USER_CAN_ACCESS_OBJ(1, TABLE_ID, DATABASE_ID) =1) OR SUBSTR(TABLE_NAME,1,3) != 'DBA') UNION ALL SELECT CAST(B.DATABASE_NAME AS VARCHAR2(128)) OWNER, CAST(A.TABLE_NAME AS VARCHAR2(128)) VIEW_NAME, CAST(LENGTH(A.VIEW_DEFINITION) AS NUMBER) TEXT_LENGTH, TO_CLOB(VIEW_DEFINITION) TEXT, CAST(NULL AS NUMBER) OID_TEXT_LENGTH, CAST(NULL AS VARCHAR2(4000)) OID_TEXT, CAST(NULL AS VARCHAR2(30)) VIEW_TYPE, CAST(NULL AS VARCHAR2(30)) SUPERVIEW_NAME, CAST(NULL AS VARCHAR2(1)) EDITIONING_VIEW, CAST(NULL AS VARCHAR2(1)) READ_ONLY FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B WHERE A.TABLE_TYPE = 4 AND A.DATABASE_ID = B.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, A.TABLE_ID, A.DATABASE_ID) =1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1097,17 +1060,16 @@ int ObInnerTableSchema::all_views_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_views_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_views_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1138,8 +1100,7 @@ int ObInnerTableSchema::user_views_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(A.TABLE_NAME AS VARCHAR2(128)) VIEW_NAME, CAST(LENGTH(A.VIEW_DEFINITION) AS NUMBER) TEXT_LENGTH, TO_CLOB(VIEW_DEFINITION) TEXT, CAST(NULL AS NUMBER) OID_TEXT_LENGTH, CAST(NULL AS VARCHAR2(4000)) OID_TEXT, CAST(NULL AS VARCHAR2(30)) VIEW_TYPE, CAST(NULL AS VARCHAR2(30)) SUPERVIEW_NAME, CAST(NULL AS VARCHAR2(1)) EDITIONING_VIEW, CAST(NULL AS VARCHAR2(1)) READ_ONLY FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B WHERE A.TABLE_TYPE = 4 AND A.DATABASE_ID = B.DATABASE_ID AND B.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(A.TABLE_NAME AS VARCHAR2(128)) VIEW_NAME, CAST(LENGTH(A.VIEW_DEFINITION) AS NUMBER) TEXT_LENGTH, TO_CLOB(VIEW_DEFINITION) TEXT, CAST(NULL AS NUMBER) OID_TEXT_LENGTH, CAST(NULL AS VARCHAR2(4000)) OID_TEXT, CAST(NULL AS VARCHAR2(30)) VIEW_TYPE, CAST(NULL AS VARCHAR2(30)) SUPERVIEW_NAME, CAST(NULL AS VARCHAR2(1)) EDITIONING_VIEW, CAST(NULL AS VARCHAR2(1)) READ_ONLY FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B WHERE A.TABLE_TYPE = 4 AND A.DATABASE_ID = B.DATABASE_ID AND B.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1151,17 +1112,16 @@ int ObInnerTableSchema::user_views_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tab_partitions_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tab_partitions_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1192,9 +1152,7 @@ int ObInnerTableSchema::all_tab_partitions_ora_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL( - table_schema.set_view_definition( - R"__(SELECT CAST(DB_TB.DATABASE_NAME AS VARCHAR2(128)) TABLE_OWNER, CAST(DB_TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(CASE WHEN PART.SUB_PART_NUM <=0 THEN 'NO' ELSE 'YES' END AS VARCHAR(3)) COMPOSITE, CAST(PART.PART_NAME AS VARCHAR(128)) PARTITION_NAME, CAST(PART.SUB_PART_NUM AS NUMBER) SUBPARTITION_COUNT, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN PART.HIGH_BOUND_VAL ELSE PART.LIST_VAL END AS VARCHAR2(1024)) HIGH_VALUE, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN length(PART.HIGH_BOUND_VAL) ELSE length(PART.LIST_VAL) END AS NUMBER) HIGH_VALUE_LENGTH, CAST(PART.PART_ID + 1 AS NUMBER) PARTITION_POSITION, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) TABLESPACE_NAME, CAST(NULL AS NUMBER) PCT_FREE, CAST(NULL AS NUMBER) PCT_USED, CAST(NULL AS NUMBER) INI_TRANS, CAST(NULL AS NUMBER) MAX_TRANS, CAST(NULL AS NUMBER) INITIAL_EXTENT, CAST(NULL AS NUMBER) NEXT_EXTENT, CAST(NULL AS NUMBER) MIN_EXTENT, CAST(NULL AS NUMBER) MAX_EXTENT, CAST(NULL AS NUMBER) MAX_SIZE, CAST(NULL AS NUMBER) PCT_INCREASE, CAST(NULL AS NUMBER) FREELISTS, CAST(NULL AS NUMBER) FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(PART.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS NUMBER) NUM_ROWS, CAST(NULL AS NUMBER) BLOCKS, CAST(NULL AS NUMBER) EMPTY_BLOCKS, CAST(NULL AS NUMBER) AVG_SPACE, CAST(NULL AS NUMBER) CHAIN_CNT, CAST(NULL AS NUMBER) AVG_ROW_LEN, CAST(NULL AS NUMBER) SAMPLE_SIZE, CAST(NULL AS DATE) LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) USER_STATS, CAST(NULL AS VARCHAR2(3)) IS_NESTED, CAST(NULL AS VARCHAR2(30)) PARENT_TABLE_PARTITION, CAST(NULL AS VARCHAR2(3)) "INTERVAL", CAST(NULL AS VARCHAR2(4)) SEGMENT_CREATED FROM (SELECT DB.DATABASE_NAME, DB.DATABASE_ID, TB.TABLE_ID, TB.TABLE_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND (TB.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, TB.TABLE_ID, TB.DATABASE_ID) = 1)) DB_TB JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT PART ON DB_TB.TABLE_ID = PART.TABLE_ID AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = PART.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(DB_TB.DATABASE_NAME AS VARCHAR2(128)) TABLE_OWNER, CAST(DB_TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(CASE WHEN PART.SUB_PART_NUM <=0 THEN 'NO' ELSE 'YES' END AS VARCHAR(3)) COMPOSITE, CAST(PART.PART_NAME AS VARCHAR(128)) PARTITION_NAME, CAST(PART.SUB_PART_NUM AS NUMBER) SUBPARTITION_COUNT, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN PART.HIGH_BOUND_VAL ELSE PART.LIST_VAL END AS VARCHAR2(1024)) HIGH_VALUE, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN length(PART.HIGH_BOUND_VAL) ELSE length(PART.LIST_VAL) END AS NUMBER) HIGH_VALUE_LENGTH, CAST(PART.PART_ID + 1 AS NUMBER) PARTITION_POSITION, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) TABLESPACE_NAME, CAST(NULL AS NUMBER) PCT_FREE, CAST(NULL AS NUMBER) PCT_USED, CAST(NULL AS NUMBER) INI_TRANS, CAST(NULL AS NUMBER) MAX_TRANS, CAST(NULL AS NUMBER) INITIAL_EXTENT, CAST(NULL AS NUMBER) NEXT_EXTENT, CAST(NULL AS NUMBER) MIN_EXTENT, CAST(NULL AS NUMBER) MAX_EXTENT, CAST(NULL AS NUMBER) MAX_SIZE, CAST(NULL AS NUMBER) PCT_INCREASE, CAST(NULL AS NUMBER) FREELISTS, CAST(NULL AS NUMBER) FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(PART.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS NUMBER) NUM_ROWS, CAST(NULL AS NUMBER) BLOCKS, CAST(NULL AS NUMBER) EMPTY_BLOCKS, CAST(NULL AS NUMBER) AVG_SPACE, CAST(NULL AS NUMBER) CHAIN_CNT, CAST(NULL AS NUMBER) AVG_ROW_LEN, CAST(NULL AS NUMBER) SAMPLE_SIZE, CAST(NULL AS DATE) LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) USER_STATS, CAST(NULL AS VARCHAR2(3)) IS_NESTED, CAST(NULL AS VARCHAR2(30)) PARENT_TABLE_PARTITION, CAST(NULL AS VARCHAR2(3)) "INTERVAL", CAST(NULL AS VARCHAR2(4)) SEGMENT_CREATED FROM (SELECT DB.DATABASE_NAME, DB.DATABASE_ID, TB.TABLE_ID, TB.TABLE_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND (TB.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, TB.TABLE_ID, TB.DATABASE_ID) = 1)) DB_TB JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT PART ON DB_TB.TABLE_ID = PART.TABLE_ID AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = PART.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1206,17 +1164,16 @@ int ObInnerTableSchema::all_tab_partitions_ora_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tab_subpartitions_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tab_subpartitions_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1247,8 +1204,7 @@ int ObInnerTableSchema::all_tab_subpartitions_ora_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT CAST(DB_TB.DATABASE_NAME AS VARCHAR2(128)) TABLE_OWNER, CAST(DB_TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(PART.PART_NAME AS VARCHAR2(128)) PARTITION_NAME, CAST(PART.SUB_PART_NAME AS VARCHAR2(128)) SUBPARTITION_NAME, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN PART.HIGH_BOUND_VAL ELSE PART.LIST_VAL END AS VARCHAR2(1024)) HIGH_VALUE, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN length(PART.HIGH_BOUND_VAL) ELSE length(PART.LIST_VAL) END AS NUMBER) HIGH_VALUE_LENGTH, CAST(PART.SUB_PART_ID + 1 AS NUMBER) SUBPARTITION_POSITION, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) TABLESPACE_NAME, CAST(NULL AS NUMBER) PCT_FREE, CAST(NULL AS NUMBER) PCT_USED, CAST(NULL AS NUMBER) INI_TRANS, CAST(NULL AS NUMBER) MAX_TRANS, CAST(NULL AS NUMBER) INITIAL_EXTENT, CAST(NULL AS NUMBER) NEXT_EXTENT, CAST(NULL AS NUMBER) MIN_EXTENT, CAST(NULL AS NUMBER) MAX_EXTENT, CAST(NULL AS NUMBER) MAX_SIZE, CAST(NULL AS NUMBER) PCT_INCREASE, CAST(NULL AS NUMBER) FREELISTS, CAST(NULL AS NUMBER) FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(PART.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS NUMBER) NUM_ROWS, CAST(NULL AS NUMBER) BLOCKS, CAST(NULL AS NUMBER) EMPTY_BLOCKS, CAST(NULL AS NUMBER) AVG_SPACE, CAST(NULL AS NUMBER) CHAIN_CNT, CAST(NULL AS NUMBER) AVG_ROW_LEN, CAST(NULL AS NUMBER) SAMPLE_SIZE, CAST(NULL AS DATE) LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) USER_STATS, CAST(NULL AS VARCHAR2(3)) "INTERVAL", CAST(NULL AS VARCHAR2(3)) SEGMENT_CREATED FROM (SELECT DB.DATABASE_NAME, DB.DATABASE_ID, TB.TABLE_ID, TB.TABLE_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND (TB.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, TB.TABLE_ID, TB.DATABASE_ID) = 1)) DB_TB JOIN (SELECT P_PART.PART_NAME, P_PART.SUB_PART_NUM, P_PART.TABLE_ID, S_PART.SUB_PART_NAME, S_PART.HIGH_BOUND_VAL, S_PART.LIST_VAL, S_PART.COMPRESS_FUNC_NAME, S_PART.SUB_PART_ID, S_PART.TABLESPACE_ID FROM SYS.ALL_VIRTUAL_PART_REAL_AGENT P_PART, SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT S_PART WHERE P_PART.PART_ID = S_PART.PART_ID AND P_PART.TABLE_ID = S_PART.TABLE_ID AND P_PART.TENANT_ID = EFFECTIVE_TENANT_ID() AND S_PART.TENANT_ID = EFFECTIVE_TENANT_ID()) PART ON DB_TB.TABLE_ID = PART.TABLE_ID LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = PART.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(DB_TB.DATABASE_NAME AS VARCHAR2(128)) TABLE_OWNER, CAST(DB_TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(PART.PART_NAME AS VARCHAR2(128)) PARTITION_NAME, CAST(PART.SUB_PART_NAME AS VARCHAR2(128)) SUBPARTITION_NAME, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN PART.HIGH_BOUND_VAL ELSE PART.LIST_VAL END AS VARCHAR2(1024)) HIGH_VALUE, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN length(PART.HIGH_BOUND_VAL) ELSE length(PART.LIST_VAL) END AS NUMBER) HIGH_VALUE_LENGTH, CAST(PART.SUB_PART_ID + 1 AS NUMBER) SUBPARTITION_POSITION, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) TABLESPACE_NAME, CAST(NULL AS NUMBER) PCT_FREE, CAST(NULL AS NUMBER) PCT_USED, CAST(NULL AS NUMBER) INI_TRANS, CAST(NULL AS NUMBER) MAX_TRANS, CAST(NULL AS NUMBER) INITIAL_EXTENT, CAST(NULL AS NUMBER) NEXT_EXTENT, CAST(NULL AS NUMBER) MIN_EXTENT, CAST(NULL AS NUMBER) MAX_EXTENT, CAST(NULL AS NUMBER) MAX_SIZE, CAST(NULL AS NUMBER) PCT_INCREASE, CAST(NULL AS NUMBER) FREELISTS, CAST(NULL AS NUMBER) FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(PART.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS NUMBER) NUM_ROWS, CAST(NULL AS NUMBER) BLOCKS, CAST(NULL AS NUMBER) EMPTY_BLOCKS, CAST(NULL AS NUMBER) AVG_SPACE, CAST(NULL AS NUMBER) CHAIN_CNT, CAST(NULL AS NUMBER) AVG_ROW_LEN, CAST(NULL AS NUMBER) SAMPLE_SIZE, CAST(NULL AS DATE) LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) USER_STATS, CAST(NULL AS VARCHAR2(3)) "INTERVAL", CAST(NULL AS VARCHAR2(3)) SEGMENT_CREATED FROM (SELECT DB.DATABASE_NAME, DB.DATABASE_ID, TB.TABLE_ID, TB.TABLE_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND (TB.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, TB.TABLE_ID, TB.DATABASE_ID) = 1)) DB_TB JOIN (SELECT P_PART.PART_NAME, P_PART.SUB_PART_NUM, P_PART.TABLE_ID, S_PART.SUB_PART_NAME, S_PART.HIGH_BOUND_VAL, S_PART.LIST_VAL, S_PART.COMPRESS_FUNC_NAME, S_PART.SUB_PART_ID, S_PART.TABLESPACE_ID FROM SYS.ALL_VIRTUAL_PART_REAL_AGENT P_PART, SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT S_PART WHERE P_PART.PART_ID = S_PART.PART_ID AND P_PART.TABLE_ID = S_PART.TABLE_ID AND P_PART.TENANT_ID = EFFECTIVE_TENANT_ID() AND S_PART.TENANT_ID = EFFECTIVE_TENANT_ID()) PART ON DB_TB.TABLE_ID = PART.TABLE_ID LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = PART.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1260,17 +1216,16 @@ int ObInnerTableSchema::all_tab_subpartitions_ora_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_part_tables_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_part_tables_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1301,8 +1256,7 @@ int ObInnerTableSchema::all_part_tables_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT CAST(DB.DATABASE_NAME AS VARCHAR2(128)) OWNER, CAST(TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(CASE TB.PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END AS VARCHAR2(9)) PARTITIONING_TYPE, CAST (DECODE(TB.PART_LEVEL, 1, 'NONE', 2, DECODE(TB.SUB_PART_FUNC_TYPE, 0, 'HASH', 1, 'KEY', 2, 'KEY', 3, 'RANGE', 4, 'RANGE', 5, 'LIST', 6, 'KEY', 7, 'LIST', 8, 'HASH', 9, 'KEY', 10, 'KEY')) AS VARCHAR2(9)) SUBPARTITIONING_TYPE, CAST(TB.PART_NUM AS NUMBER) PARTITION_COUNT, CAST (DECODE (TB.PART_LEVEL, 1, 0, 2, TB.SUB_PART_NUM) AS NUMBER) DEF_SUBPARTITION_COUNT, CAST(PART_INFO.PART_KEY_COUNT AS NUMBER) PARTITIONING_KEY_COUNT, CAST (DECODE (TB.PART_LEVEL, 1, 0, 2, PART_INFO.SUBPART_KEY_COUNT) AS NUMBER) SUBPARTITIONING_KEY_COUNT, CAST(NULL AS VARCHAR2(8)) STATUS, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) DEF_TABLESPACE_NAME, CAST(NULL AS NUMBER) DEF_PCT_FREE, CAST(NULL AS NUMBER) DEF_PCT_USED, CAST(NULL AS NUMBER) DEF_INI_TRANS, CAST(NULL AS NUMBER) DEF_MAX_TRANS, CAST(NULL AS VARCHAR2(40)) DEF_INITIAL_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_NEXT_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_MIN_EXTENT, CAST(NULL AS VARCHAR2(40)) MAX_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_MAX_SIZE, CAST(NULL AS VARCHAR2(40)) DEF_PCT_INCREASE, CAST(NULL AS NUMBER) DEF_FREELISTS, CAST(NULL AS NUMBER) DEF_FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) DEF_LOGGING, CAST(CASE WHEN TB.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(TB.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS VARCHAR2(7)) DEF_BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) DEF_FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) DEF_CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(30)) REF_PTN_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(1000)) "INTERVAL", CAST(NULL AS VARCHAR2(3)) IS_NESTED, CAST(NULL AS VARCHAR2(4)) DEF_SEGMENT_CREATED, CAST(CASE TB.AUTO_PART WHEN 1 THEN 'AUTO_PART' WHEN 0 THEN '' END AS VARCHAR(10)) AUTO_PART, CAST(TB.AUTO_PART_SIZE AS NUMBER) AUTO_PART_SIZE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB ON TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND (TB.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, TB.TABLE_ID, TB.DATABASE_ID) = 1) JOIN (select table_id, sum(case when BITAND(PARTITION_KEY_POSITION, 255) > 0 then 1 else 0 end) as PART_KEY_COUNT, sum(case when BITAND(PARTITION_KEY_POSITION, 65280) > 0 then 0 else 1 end) as SUBPART_KEY_COUNT from SYS.ALL_VIRTUAL_COLUMN_AGENT where PARTITION_KEY_POSITION > 0 group by table_id) PART_INFO ON TB.TABLE_ID = PART_INFO.TABLE_ID LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = TB.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE TB.TABLE_TYPE != 5 AND TB.PART_LEVEL != 0)__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(DB.DATABASE_NAME AS VARCHAR2(128)) OWNER, CAST(TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(CASE TB.PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END AS VARCHAR2(9)) PARTITIONING_TYPE, CAST (DECODE(TB.PART_LEVEL, 1, 'NONE', 2, DECODE(TB.SUB_PART_FUNC_TYPE, 0, 'HASH', 1, 'KEY', 2, 'KEY', 3, 'RANGE', 4, 'RANGE', 5, 'LIST', 6, 'KEY', 7, 'LIST', 8, 'HASH', 9, 'KEY', 10, 'KEY')) AS VARCHAR2(9)) SUBPARTITIONING_TYPE, CAST(TB.PART_NUM AS NUMBER) PARTITION_COUNT, CAST (DECODE (TB.PART_LEVEL, 1, 0, 2, TB.SUB_PART_NUM) AS NUMBER) DEF_SUBPARTITION_COUNT, CAST(PART_INFO.PART_KEY_COUNT AS NUMBER) PARTITIONING_KEY_COUNT, CAST (DECODE (TB.PART_LEVEL, 1, 0, 2, PART_INFO.SUBPART_KEY_COUNT) AS NUMBER) SUBPARTITIONING_KEY_COUNT, CAST(NULL AS VARCHAR2(8)) STATUS, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) DEF_TABLESPACE_NAME, CAST(NULL AS NUMBER) DEF_PCT_FREE, CAST(NULL AS NUMBER) DEF_PCT_USED, CAST(NULL AS NUMBER) DEF_INI_TRANS, CAST(NULL AS NUMBER) DEF_MAX_TRANS, CAST(NULL AS VARCHAR2(40)) DEF_INITIAL_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_NEXT_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_MIN_EXTENT, CAST(NULL AS VARCHAR2(40)) MAX_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_MAX_SIZE, CAST(NULL AS VARCHAR2(40)) DEF_PCT_INCREASE, CAST(NULL AS NUMBER) DEF_FREELISTS, CAST(NULL AS NUMBER) DEF_FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) DEF_LOGGING, CAST(CASE WHEN TB.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(TB.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS VARCHAR2(7)) DEF_BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) DEF_FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) DEF_CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(30)) REF_PTN_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(1000)) "INTERVAL", CAST(NULL AS VARCHAR2(3)) IS_NESTED, CAST(NULL AS VARCHAR2(4)) DEF_SEGMENT_CREATED, CAST(CASE TB.AUTO_PART WHEN 1 THEN 'AUTO_PART' WHEN 0 THEN '' END AS VARCHAR(10)) AUTO_PART, CAST(TB.AUTO_PART_SIZE AS NUMBER) AUTO_PART_SIZE FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB ON TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND (TB.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, TB.TABLE_ID, TB.DATABASE_ID) = 1) JOIN (select table_id, sum(case when BITAND(PARTITION_KEY_POSITION, 255) > 0 then 1 else 0 end) as PART_KEY_COUNT, sum(case when BITAND(PARTITION_KEY_POSITION, 65280) > 0 then 0 else 1 end) as SUBPART_KEY_COUNT from SYS.ALL_VIRTUAL_COLUMN_AGENT where PARTITION_KEY_POSITION > 0 group by table_id) PART_INFO ON TB.TABLE_ID = PART_INFO.TABLE_ID LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = TB.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE TB.TABLE_TYPE != 5 AND TB.PART_LEVEL != 0)__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1314,17 +1268,16 @@ int ObInnerTableSchema::all_part_tables_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_part_tables_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_part_tables_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1355,8 +1308,7 @@ int ObInnerTableSchema::dba_part_tables_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT CAST(DB.DATABASE_NAME AS VARCHAR2(128)) OWNER, CAST(TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(CASE TB.PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END AS VARCHAR2(9)) PARTITIONING_TYPE, CAST (DECODE(TB.PART_LEVEL, 1, 'NONE', 2, DECODE(TB.SUB_PART_FUNC_TYPE, 0, 'HASH', 1, 'KEY', 2, 'KEY', 3, 'RANGE', 4, 'RANGE', 5, 'LIST', 6, 'KEY', 7, 'LIST', 8, 'HASH', 9, 'KEY', 10, 'KEY')) AS VARCHAR2(9)) SUBPARTITIONING_TYPE, CAST (TB.PART_NUM AS NUMBER) PARTITION_COUNT, CAST (DECODE (TB.PART_LEVEL, 1, 0, 2, TB.SUB_PART_NUM) AS NUMBER) DEF_SUBPARTITION_COUNT, CAST(PART_INFO.PART_KEY_COUNT AS NUMBER) PARTITIONING_KEY_COUNT, CAST (DECODE (TB.PART_LEVEL, 1, 0, 2, PART_INFO.SUBPART_KEY_COUNT) AS NUMBER) SUBPARTITIONING_KEY_COUNT, CAST(NULL AS VARCHAR2(8)) STATUS, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) DEF_TABLESPACE_NAME, CAST(NULL AS NUMBER) DEF_PCT_FREE, CAST(NULL AS NUMBER) DEF_PCT_USED, CAST(NULL AS NUMBER) DEF_INI_TRANS, CAST(NULL AS NUMBER) DEF_MAX_TRANS, CAST(NULL AS VARCHAR2(40)) DEF_INITIAL_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_NEXT_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_MIN_EXTENT, CAST(NULL AS VARCHAR2(40)) MAX_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_MAX_SIZE, CAST(NULL AS VARCHAR2(40)) DEF_PCT_INCREASE, CAST(NULL AS NUMBER) DEF_FREELISTS, CAST(NULL AS NUMBER) DEF_FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) DEF_LOGGING, CAST(CASE WHEN TB.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(TB.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS VARCHAR2(7)) DEF_BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) DEF_FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) DEF_CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(30)) REF_PTN_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(1000)) "INTERVAL", CAST(NULL AS VARCHAR2(3)) IS_NESTED, CAST(NULL AS VARCHAR2(4)) DEF_SEGMENT_CREATED FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB ON TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN (select table_id, sum(case when BITAND(PARTITION_KEY_POSITION, 255) > 0 then 1 else 0 end) as PART_KEY_COUNT, sum(case when BITAND(PARTITION_KEY_POSITION, 65280) > 0 then 0 else 1 end) as SUBPART_KEY_COUNT from SYS.ALL_VIRTUAL_COLUMN_AGENT where PARTITION_KEY_POSITION > 0 group by table_id) PART_INFO ON TB.TABLE_ID = PART_INFO.TABLE_ID LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = TB.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE TB.TABLE_TYPE != 5 AND TB.PART_LEVEL != 0)__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(DB.DATABASE_NAME AS VARCHAR2(128)) OWNER, CAST(TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(CASE TB.PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END AS VARCHAR2(9)) PARTITIONING_TYPE, CAST (DECODE(TB.PART_LEVEL, 1, 'NONE', 2, DECODE(TB.SUB_PART_FUNC_TYPE, 0, 'HASH', 1, 'KEY', 2, 'KEY', 3, 'RANGE', 4, 'RANGE', 5, 'LIST', 6, 'KEY', 7, 'LIST', 8, 'HASH', 9, 'KEY', 10, 'KEY')) AS VARCHAR2(9)) SUBPARTITIONING_TYPE, CAST (TB.PART_NUM AS NUMBER) PARTITION_COUNT, CAST (DECODE (TB.PART_LEVEL, 1, 0, 2, TB.SUB_PART_NUM) AS NUMBER) DEF_SUBPARTITION_COUNT, CAST(PART_INFO.PART_KEY_COUNT AS NUMBER) PARTITIONING_KEY_COUNT, CAST (DECODE (TB.PART_LEVEL, 1, 0, 2, PART_INFO.SUBPART_KEY_COUNT) AS NUMBER) SUBPARTITIONING_KEY_COUNT, CAST(NULL AS VARCHAR2(8)) STATUS, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) DEF_TABLESPACE_NAME, CAST(NULL AS NUMBER) DEF_PCT_FREE, CAST(NULL AS NUMBER) DEF_PCT_USED, CAST(NULL AS NUMBER) DEF_INI_TRANS, CAST(NULL AS NUMBER) DEF_MAX_TRANS, CAST(NULL AS VARCHAR2(40)) DEF_INITIAL_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_NEXT_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_MIN_EXTENT, CAST(NULL AS VARCHAR2(40)) MAX_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_MAX_SIZE, CAST(NULL AS VARCHAR2(40)) DEF_PCT_INCREASE, CAST(NULL AS NUMBER) DEF_FREELISTS, CAST(NULL AS NUMBER) DEF_FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) DEF_LOGGING, CAST(CASE WHEN TB.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(TB.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS VARCHAR2(7)) DEF_BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) DEF_FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) DEF_CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(30)) REF_PTN_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(1000)) "INTERVAL", CAST(NULL AS VARCHAR2(3)) IS_NESTED, CAST(NULL AS VARCHAR2(4)) DEF_SEGMENT_CREATED FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB ON TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN (select table_id, sum(case when BITAND(PARTITION_KEY_POSITION, 255) > 0 then 1 else 0 end) as PART_KEY_COUNT, sum(case when BITAND(PARTITION_KEY_POSITION, 65280) > 0 then 0 else 1 end) as SUBPART_KEY_COUNT from SYS.ALL_VIRTUAL_COLUMN_AGENT where PARTITION_KEY_POSITION > 0 group by table_id) PART_INFO ON TB.TABLE_ID = PART_INFO.TABLE_ID LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = TB.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE TB.TABLE_TYPE != 5 AND TB.PART_LEVEL != 0)__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1368,17 +1320,16 @@ int ObInnerTableSchema::dba_part_tables_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_part_tables_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_part_tables_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1409,8 +1360,7 @@ int ObInnerTableSchema::user_part_tables_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT CAST(TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(CASE TB.PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END AS VARCHAR2(9)) PARTITIONING_TYPE, CAST (DECODE(TB.PART_LEVEL, 1, 'NONE', 2, DECODE(TB.SUB_PART_FUNC_TYPE, 0, 'HASH', 1, 'KEY', 2, 'KEY', 3, 'RANGE', 4, 'RANGE', 5, 'LIST', 6, 'KEY', 7, 'LIST', 8, 'HASH', 9, 'KEY', 10, 'KEY')) AS VARCHAR2(9)) SUBPARTITIONING_TYPE, CAST(TB.PART_NUM AS NUMBER) PARTITION_COUNT, CAST (DECODE (TB.PART_LEVEL, 1, 0, 2, TB.SUB_PART_NUM) AS NUMBER) DEF_SUBPARTITION_COUNT, CAST(PART_INFO.PART_KEY_COUNT AS NUMBER) PARTITIONING_KEY_COUNT, CAST (DECODE (TB.PART_LEVEL, 1, 0, 2, PART_INFO.SUBPART_KEY_COUNT) AS NUMBER) SUBPARTITIONING_KEY_COUNT, CAST(NULL AS VARCHAR2(8)) STATUS, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) DEF_TABLESPACE_NAME, CAST(NULL AS NUMBER) DEF_PCT_FREE, CAST(NULL AS NUMBER) DEF_PCT_USED, CAST(NULL AS NUMBER) DEF_INI_TRANS, CAST(NULL AS NUMBER) DEF_MAX_TRANS, CAST(NULL AS VARCHAR2(40)) DEF_INITIAL_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_NEXT_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_MIN_EXTENT, CAST(NULL AS VARCHAR2(40)) MAX_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_MAX_SIZE, CAST(NULL AS VARCHAR2(40)) DEF_PCT_INCREASE, CAST(NULL AS NUMBER) DEF_FREELISTS, CAST(NULL AS NUMBER) DEF_FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) DEF_LOGGING, CAST(CASE WHEN TB.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(TB.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS VARCHAR2(7)) DEF_BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) DEF_FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) DEF_CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(30)) REF_PTN_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(1000)) "INTERVAL", CAST(NULL AS VARCHAR2(3)) IS_NESTED, CAST(NULL AS VARCHAR2(4)) DEF_SEGMENT_CREATED FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB ON TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') JOIN (select table_id, sum(case when BITAND(PARTITION_KEY_POSITION, 255) > 0 then 1 else 0 end) as PART_KEY_COUNT, sum(case when BITAND(PARTITION_KEY_POSITION, 65280) > 0 then 0 else 1 end) as SUBPART_KEY_COUNT from SYS.ALL_VIRTUAL_COLUMN_AGENT where PARTITION_KEY_POSITION > 0 group by table_id) PART_INFO ON TB.TABLE_ID = PART_INFO.TABLE_ID LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = TB.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE TB.TABLE_TYPE != 5 AND TB.PART_LEVEL != 0)__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(CASE TB.PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END AS VARCHAR2(9)) PARTITIONING_TYPE, CAST (DECODE(TB.PART_LEVEL, 1, 'NONE', 2, DECODE(TB.SUB_PART_FUNC_TYPE, 0, 'HASH', 1, 'KEY', 2, 'KEY', 3, 'RANGE', 4, 'RANGE', 5, 'LIST', 6, 'KEY', 7, 'LIST', 8, 'HASH', 9, 'KEY', 10, 'KEY')) AS VARCHAR2(9)) SUBPARTITIONING_TYPE, CAST(TB.PART_NUM AS NUMBER) PARTITION_COUNT, CAST (DECODE (TB.PART_LEVEL, 1, 0, 2, TB.SUB_PART_NUM) AS NUMBER) DEF_SUBPARTITION_COUNT, CAST(PART_INFO.PART_KEY_COUNT AS NUMBER) PARTITIONING_KEY_COUNT, CAST (DECODE (TB.PART_LEVEL, 1, 0, 2, PART_INFO.SUBPART_KEY_COUNT) AS NUMBER) SUBPARTITIONING_KEY_COUNT, CAST(NULL AS VARCHAR2(8)) STATUS, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) DEF_TABLESPACE_NAME, CAST(NULL AS NUMBER) DEF_PCT_FREE, CAST(NULL AS NUMBER) DEF_PCT_USED, CAST(NULL AS NUMBER) DEF_INI_TRANS, CAST(NULL AS NUMBER) DEF_MAX_TRANS, CAST(NULL AS VARCHAR2(40)) DEF_INITIAL_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_NEXT_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_MIN_EXTENT, CAST(NULL AS VARCHAR2(40)) MAX_EXTENT, CAST(NULL AS VARCHAR2(40)) DEF_MAX_SIZE, CAST(NULL AS VARCHAR2(40)) DEF_PCT_INCREASE, CAST(NULL AS NUMBER) DEF_FREELISTS, CAST(NULL AS NUMBER) DEF_FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) DEF_LOGGING, CAST(CASE WHEN TB.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(TB.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS VARCHAR2(7)) DEF_BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) DEF_FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) DEF_CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(30)) REF_PTN_CONSTRAINT_NAME, CAST(NULL AS VARCHAR2(1000)) "INTERVAL", CAST(NULL AS VARCHAR2(3)) IS_NESTED, CAST(NULL AS VARCHAR2(4)) DEF_SEGMENT_CREATED FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB ON TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') JOIN (select table_id, sum(case when BITAND(PARTITION_KEY_POSITION, 255) > 0 then 1 else 0 end) as PART_KEY_COUNT, sum(case when BITAND(PARTITION_KEY_POSITION, 65280) > 0 then 0 else 1 end) as SUBPART_KEY_COUNT from SYS.ALL_VIRTUAL_COLUMN_AGENT where PARTITION_KEY_POSITION > 0 group by table_id) PART_INFO ON TB.TABLE_ID = PART_INFO.TABLE_ID LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = TB.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE TB.TABLE_TYPE != 5 AND TB.PART_LEVEL != 0)__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1422,17 +1372,16 @@ int ObInnerTableSchema::user_part_tables_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_tab_partitions_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_tab_partitions_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1463,8 +1412,7 @@ int ObInnerTableSchema::dba_tab_partitions_ora_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT CAST(DB_TB.DATABASE_NAME AS VARCHAR2(128)) TABLE_OWNER, CAST(DB_TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(CASE WHEN PART.SUB_PART_NUM <=0 THEN 'NO' ELSE 'YES' END AS VARCHAR(3)) COMPOSITE, CAST(PART.PART_NAME AS VARCHAR(128)) PARTITION_NAME, CAST(PART.SUB_PART_NUM AS NUMBER) SUBPARTITION_COUNT, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN PART.HIGH_BOUND_VAL ELSE PART.LIST_VAL END AS VARCHAR2(1024)) HIGH_VALUE, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN length(PART.HIGH_BOUND_VAL) ELSE length(PART.LIST_VAL) END AS NUMBER) HIGH_VALUE_LENGTH, CAST(PART.PART_ID + 1 AS NUMBER) PARTITION_POSITION, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) TABLESPACE_NAME, CAST(NULL AS NUMBER) PCT_FREE, CAST(NULL AS NUMBER) PCT_USED, CAST(NULL AS NUMBER) INI_TRANS, CAST(NULL AS NUMBER) MAX_TRANS, CAST(NULL AS NUMBER) INITIAL_EXTENT, CAST(NULL AS NUMBER) NEXT_EXTENT, CAST(NULL AS NUMBER) MIN_EXTENT, CAST(NULL AS NUMBER) MAX_EXTENT, CAST(NULL AS NUMBER) MAX_SIZE, CAST(NULL AS NUMBER) PCT_INCREASE, CAST(NULL AS NUMBER) FREELISTS, CAST(NULL AS NUMBER) FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(PART.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS NUMBER) NUM_ROWS, CAST(NULL AS NUMBER) BLOCKS, CAST(NULL AS NUMBER) EMPTY_BLOCKS, CAST(NULL AS NUMBER) AVG_SPACE, CAST(NULL AS NUMBER) CHAIN_CNT, CAST(NULL AS NUMBER) AVG_ROW_LEN, CAST(NULL AS NUMBER) SAMPLE_SIZE, CAST(NULL AS DATE) LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) USER_STATS, CAST(NULL AS VARCHAR2(3)) IS_NESTED, CAST(NULL AS VARCHAR2(30)) PARENT_TABLE_PARTITION, CAST(NULL AS VARCHAR2(3)) "INTERVAL", CAST(NULL AS VARCHAR2(4)) SEGMENT_CREATED FROM (SELECT DB.DATABASE_NAME, DB.DATABASE_ID, TB.TABLE_ID, TB.TABLE_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID()) DB_TB JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT PART ON DB_TB.TABLE_ID = PART.TABLE_ID AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = PART.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID())__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(DB_TB.DATABASE_NAME AS VARCHAR2(128)) TABLE_OWNER, CAST(DB_TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(CASE WHEN PART.SUB_PART_NUM <=0 THEN 'NO' ELSE 'YES' END AS VARCHAR(3)) COMPOSITE, CAST(PART.PART_NAME AS VARCHAR(128)) PARTITION_NAME, CAST(PART.SUB_PART_NUM AS NUMBER) SUBPARTITION_COUNT, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN PART.HIGH_BOUND_VAL ELSE PART.LIST_VAL END AS VARCHAR2(1024)) HIGH_VALUE, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN length(PART.HIGH_BOUND_VAL) ELSE length(PART.LIST_VAL) END AS NUMBER) HIGH_VALUE_LENGTH, CAST(PART.PART_ID + 1 AS NUMBER) PARTITION_POSITION, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) TABLESPACE_NAME, CAST(NULL AS NUMBER) PCT_FREE, CAST(NULL AS NUMBER) PCT_USED, CAST(NULL AS NUMBER) INI_TRANS, CAST(NULL AS NUMBER) MAX_TRANS, CAST(NULL AS NUMBER) INITIAL_EXTENT, CAST(NULL AS NUMBER) NEXT_EXTENT, CAST(NULL AS NUMBER) MIN_EXTENT, CAST(NULL AS NUMBER) MAX_EXTENT, CAST(NULL AS NUMBER) MAX_SIZE, CAST(NULL AS NUMBER) PCT_INCREASE, CAST(NULL AS NUMBER) FREELISTS, CAST(NULL AS NUMBER) FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(PART.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS NUMBER) NUM_ROWS, CAST(NULL AS NUMBER) BLOCKS, CAST(NULL AS NUMBER) EMPTY_BLOCKS, CAST(NULL AS NUMBER) AVG_SPACE, CAST(NULL AS NUMBER) CHAIN_CNT, CAST(NULL AS NUMBER) AVG_ROW_LEN, CAST(NULL AS NUMBER) SAMPLE_SIZE, CAST(NULL AS DATE) LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) USER_STATS, CAST(NULL AS VARCHAR2(3)) IS_NESTED, CAST(NULL AS VARCHAR2(30)) PARENT_TABLE_PARTITION, CAST(NULL AS VARCHAR2(3)) "INTERVAL", CAST(NULL AS VARCHAR2(4)) SEGMENT_CREATED FROM (SELECT DB.DATABASE_NAME, DB.DATABASE_ID, TB.TABLE_ID, TB.TABLE_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID()) DB_TB JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT PART ON DB_TB.TABLE_ID = PART.TABLE_ID AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = PART.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID())__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1476,17 +1424,16 @@ int ObInnerTableSchema::dba_tab_partitions_ora_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_tab_partitions_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_tab_partitions_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1517,8 +1464,7 @@ int ObInnerTableSchema::user_tab_partitions_ora_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT CAST(DB_TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(CASE WHEN PART.SUB_PART_NUM <=0 THEN 'NO' ELSE 'YES' END AS VARCHAR(3)) COMPOSITE, CAST(PART.PART_NAME AS VARCHAR(128)) PARTITION_NAME, CAST(PART.SUB_PART_NUM AS NUMBER) SUBPARTITION_COUNT, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN PART.HIGH_BOUND_VAL ELSE PART.LIST_VAL END AS VARCHAR2(1024)) HIGH_VALUE, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN length(PART.HIGH_BOUND_VAL) ELSE length(PART.LIST_VAL) END AS NUMBER) HIGH_VALUE_LENGTH, CAST(PART.PART_ID + 1 AS NUMBER) PARTITION_POSITION, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) TABLESPACE_NAME, CAST(NULL AS NUMBER) PCT_FREE, CAST(NULL AS NUMBER) PCT_USED, CAST(NULL AS NUMBER) INI_TRANS, CAST(NULL AS NUMBER) MAX_TRANS, CAST(NULL AS NUMBER) INITIAL_EXTENT, CAST(NULL AS NUMBER) NEXT_EXTENT, CAST(NULL AS NUMBER) MIN_EXTENT, CAST(NULL AS NUMBER) MAX_EXTENT, CAST(NULL AS NUMBER) MAX_SIZE, CAST(NULL AS NUMBER) PCT_INCREASE, CAST(NULL AS NUMBER) FREELISTS, CAST(NULL AS NUMBER) FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(PART.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS NUMBER) NUM_ROWS, CAST(NULL AS NUMBER) BLOCKS, CAST(NULL AS NUMBER) EMPTY_BLOCKS, CAST(NULL AS NUMBER) AVG_SPACE, CAST(NULL AS NUMBER) CHAIN_CNT, CAST(NULL AS NUMBER) AVG_ROW_LEN, CAST(NULL AS NUMBER) SAMPLE_SIZE, CAST(NULL AS DATE) LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) USER_STATS, CAST(NULL AS VARCHAR2(3)) IS_NESTED, CAST(NULL AS VARCHAR2(30)) PARENT_TABLE_PARTITION, CAST(NULL AS VARCHAR2(3)) "INTERVAL", CAST(NULL AS VARCHAR2(4)) SEGMENT_CREATED FROM (SELECT DB.DATABASE_NAME, DB.DATABASE_ID, TB.TABLE_ID, TB.TABLE_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID()) DB_TB JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT PART ON DB_TB.TABLE_ID = PART.TABLE_ID AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB_TB.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = PART.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID())__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(DB_TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(CASE WHEN PART.SUB_PART_NUM <=0 THEN 'NO' ELSE 'YES' END AS VARCHAR(3)) COMPOSITE, CAST(PART.PART_NAME AS VARCHAR(128)) PARTITION_NAME, CAST(PART.SUB_PART_NUM AS NUMBER) SUBPARTITION_COUNT, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN PART.HIGH_BOUND_VAL ELSE PART.LIST_VAL END AS VARCHAR2(1024)) HIGH_VALUE, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN length(PART.HIGH_BOUND_VAL) ELSE length(PART.LIST_VAL) END AS NUMBER) HIGH_VALUE_LENGTH, CAST(PART.PART_ID + 1 AS NUMBER) PARTITION_POSITION, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) TABLESPACE_NAME, CAST(NULL AS NUMBER) PCT_FREE, CAST(NULL AS NUMBER) PCT_USED, CAST(NULL AS NUMBER) INI_TRANS, CAST(NULL AS NUMBER) MAX_TRANS, CAST(NULL AS NUMBER) INITIAL_EXTENT, CAST(NULL AS NUMBER) NEXT_EXTENT, CAST(NULL AS NUMBER) MIN_EXTENT, CAST(NULL AS NUMBER) MAX_EXTENT, CAST(NULL AS NUMBER) MAX_SIZE, CAST(NULL AS NUMBER) PCT_INCREASE, CAST(NULL AS NUMBER) FREELISTS, CAST(NULL AS NUMBER) FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(PART.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS NUMBER) NUM_ROWS, CAST(NULL AS NUMBER) BLOCKS, CAST(NULL AS NUMBER) EMPTY_BLOCKS, CAST(NULL AS NUMBER) AVG_SPACE, CAST(NULL AS NUMBER) CHAIN_CNT, CAST(NULL AS NUMBER) AVG_ROW_LEN, CAST(NULL AS NUMBER) SAMPLE_SIZE, CAST(NULL AS DATE) LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) USER_STATS, CAST(NULL AS VARCHAR2(3)) IS_NESTED, CAST(NULL AS VARCHAR2(30)) PARENT_TABLE_PARTITION, CAST(NULL AS VARCHAR2(3)) "INTERVAL", CAST(NULL AS VARCHAR2(4)) SEGMENT_CREATED FROM (SELECT DB.DATABASE_NAME, DB.DATABASE_ID, TB.TABLE_ID, TB.TABLE_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID()) DB_TB JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT PART ON DB_TB.TABLE_ID = PART.TABLE_ID AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB_TB.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = PART.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID())__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1530,17 +1476,16 @@ int ObInnerTableSchema::user_tab_partitions_ora_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_tab_subpartitions_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_tab_subpartitions_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1571,8 +1516,7 @@ int ObInnerTableSchema::dba_tab_subpartitions_ora_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT CAST(DB_TB.DATABASE_NAME AS VARCHAR2(128)) TABLE_OWNER, CAST(DB_TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(PART.PART_NAME AS VARCHAR2(128)) PARTITION_NAME, CAST(PART.SUB_PART_NAME AS VARCHAR2(128)) SUBPARTITION_NAME, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN PART.HIGH_BOUND_VAL ELSE PART.LIST_VAL END AS VARCHAR2(1024)) HIGH_VALUE, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN length(PART.HIGH_BOUND_VAL) ELSE length(PART.LIST_VAL) END AS NUMBER) HIGH_VALUE_LENGTH, CAST(PART.SUB_PART_ID + 1 AS NUMBER) SUBPARTITION_POSITION, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) TABLESPACE_NAME, CAST(NULL AS NUMBER) PCT_FREE, CAST(NULL AS NUMBER) PCT_USED, CAST(NULL AS NUMBER) INI_TRANS, CAST(NULL AS NUMBER) MAX_TRANS, CAST(NULL AS NUMBER) INITIAL_EXTENT, CAST(NULL AS NUMBER) NEXT_EXTENT, CAST(NULL AS NUMBER) MIN_EXTENT, CAST(NULL AS NUMBER) MAX_EXTENT, CAST(NULL AS NUMBER) MAX_SIZE, CAST(NULL AS NUMBER) PCT_INCREASE, CAST(NULL AS NUMBER) FREELISTS, CAST(NULL AS NUMBER) FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(PART.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS NUMBER) NUM_ROWS, CAST(NULL AS NUMBER) BLOCKS, CAST(NULL AS NUMBER) EMPTY_BLOCKS, CAST(NULL AS NUMBER) AVG_SPACE, CAST(NULL AS NUMBER) CHAIN_CNT, CAST(NULL AS NUMBER) AVG_ROW_LEN, CAST(NULL AS NUMBER) SAMPLE_SIZE, CAST(NULL AS DATE) LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) USER_STATS, CAST(NULL AS VARCHAR2(3)) "INTERVAL", CAST(NULL AS VARCHAR2(3)) SEGMENT_CREATED FROM (SELECT DB.DATABASE_NAME, DB.DATABASE_ID, TB.TABLE_ID, TB.TABLE_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID()) DB_TB JOIN (SELECT P_PART.PART_NAME, P_PART.SUB_PART_NUM, P_PART.TABLE_ID, S_PART.SUB_PART_NAME, S_PART.HIGH_BOUND_VAL, S_PART.LIST_VAL, S_PART.COMPRESS_FUNC_NAME, S_PART.SUB_PART_ID, S_PART.TABLESPACE_ID FROM SYS.ALL_VIRTUAL_PART_REAL_AGENT P_PART, SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT S_PART WHERE P_PART.PART_ID = S_PART.PART_ID AND P_PART.TABLE_ID = S_PART.TABLE_ID AND P_PART.TENANT_ID = EFFECTIVE_TENANT_ID() AND S_PART.TENANT_ID = EFFECTIVE_TENANT_ID()) PART ON DB_TB.TABLE_ID = PART.TABLE_ID LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = PART.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID())__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(DB_TB.DATABASE_NAME AS VARCHAR2(128)) TABLE_OWNER, CAST(DB_TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(PART.PART_NAME AS VARCHAR2(128)) PARTITION_NAME, CAST(PART.SUB_PART_NAME AS VARCHAR2(128)) SUBPARTITION_NAME, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN PART.HIGH_BOUND_VAL ELSE PART.LIST_VAL END AS VARCHAR2(1024)) HIGH_VALUE, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN length(PART.HIGH_BOUND_VAL) ELSE length(PART.LIST_VAL) END AS NUMBER) HIGH_VALUE_LENGTH, CAST(PART.SUB_PART_ID + 1 AS NUMBER) SUBPARTITION_POSITION, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) TABLESPACE_NAME, CAST(NULL AS NUMBER) PCT_FREE, CAST(NULL AS NUMBER) PCT_USED, CAST(NULL AS NUMBER) INI_TRANS, CAST(NULL AS NUMBER) MAX_TRANS, CAST(NULL AS NUMBER) INITIAL_EXTENT, CAST(NULL AS NUMBER) NEXT_EXTENT, CAST(NULL AS NUMBER) MIN_EXTENT, CAST(NULL AS NUMBER) MAX_EXTENT, CAST(NULL AS NUMBER) MAX_SIZE, CAST(NULL AS NUMBER) PCT_INCREASE, CAST(NULL AS NUMBER) FREELISTS, CAST(NULL AS NUMBER) FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(PART.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS NUMBER) NUM_ROWS, CAST(NULL AS NUMBER) BLOCKS, CAST(NULL AS NUMBER) EMPTY_BLOCKS, CAST(NULL AS NUMBER) AVG_SPACE, CAST(NULL AS NUMBER) CHAIN_CNT, CAST(NULL AS NUMBER) AVG_ROW_LEN, CAST(NULL AS NUMBER) SAMPLE_SIZE, CAST(NULL AS DATE) LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) USER_STATS, CAST(NULL AS VARCHAR2(3)) "INTERVAL", CAST(NULL AS VARCHAR2(3)) SEGMENT_CREATED FROM (SELECT DB.DATABASE_NAME, DB.DATABASE_ID, TB.TABLE_ID, TB.TABLE_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID()) DB_TB JOIN (SELECT P_PART.PART_NAME, P_PART.SUB_PART_NUM, P_PART.TABLE_ID, S_PART.SUB_PART_NAME, S_PART.HIGH_BOUND_VAL, S_PART.LIST_VAL, S_PART.COMPRESS_FUNC_NAME, S_PART.SUB_PART_ID, S_PART.TABLESPACE_ID FROM SYS.ALL_VIRTUAL_PART_REAL_AGENT P_PART, SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT S_PART WHERE P_PART.PART_ID = S_PART.PART_ID AND P_PART.TABLE_ID = S_PART.TABLE_ID AND P_PART.TENANT_ID = EFFECTIVE_TENANT_ID() AND S_PART.TENANT_ID = EFFECTIVE_TENANT_ID()) PART ON DB_TB.TABLE_ID = PART.TABLE_ID LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = PART.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID())__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1584,17 +1528,16 @@ int ObInnerTableSchema::dba_tab_subpartitions_ora_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_tab_subpartitions_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_tab_subpartitions_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1625,8 +1568,7 @@ int ObInnerTableSchema::user_tab_subpartitions_ora_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT CAST(DB_TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(PART.PART_NAME AS VARCHAR2(128)) PARTITION_NAME, CAST(PART.SUB_PART_NAME AS VARCHAR2(128)) SUBPARTITION_NAME, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN PART.HIGH_BOUND_VAL ELSE PART.LIST_VAL END AS VARCHAR2(1024)) HIGH_VALUE, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN length(PART.HIGH_BOUND_VAL) ELSE length(PART.LIST_VAL) END AS NUMBER) HIGH_VALUE_LENGTH, CAST(PART.SUB_PART_ID + 1 AS NUMBER) SUBPARTITION_POSITION, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) TABLESPACE_NAME, CAST(NULL AS NUMBER) PCT_FREE, CAST(NULL AS NUMBER) PCT_USED, CAST(NULL AS NUMBER) INI_TRANS, CAST(NULL AS NUMBER) MAX_TRANS, CAST(NULL AS NUMBER) INITIAL_EXTENT, CAST(NULL AS NUMBER) NEXT_EXTENT, CAST(NULL AS NUMBER) MIN_EXTENT, CAST(NULL AS NUMBER) MAX_EXTENT, CAST(NULL AS NUMBER) MAX_SIZE, CAST(NULL AS NUMBER) PCT_INCREASE, CAST(NULL AS NUMBER) FREELISTS, CAST(NULL AS NUMBER) FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(PART.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS NUMBER) NUM_ROWS, CAST(NULL AS NUMBER) BLOCKS, CAST(NULL AS NUMBER) EMPTY_BLOCKS, CAST(NULL AS NUMBER) AVG_SPACE, CAST(NULL AS NUMBER) CHAIN_CNT, CAST(NULL AS NUMBER) AVG_ROW_LEN, CAST(NULL AS NUMBER) SAMPLE_SIZE, CAST(NULL AS DATE) LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) USER_STATS, CAST(NULL AS VARCHAR2(3)) "INTERVAL", CAST(NULL AS VARCHAR2(3)) SEGMENT_CREATED FROM (SELECT DB.DATABASE_NAME, DB.DATABASE_ID, TB.TABLE_ID, TB.TABLE_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID()) DB_TB JOIN (SELECT P_PART.PART_NAME, P_PART.SUB_PART_NUM, P_PART.TABLE_ID, S_PART.SUB_PART_NAME, S_PART.HIGH_BOUND_VAL, S_PART.LIST_VAL, S_PART.COMPRESS_FUNC_NAME, S_PART.SUB_PART_ID, S_PART.TABLESPACE_ID FROM SYS.ALL_VIRTUAL_PART_REAL_AGENT P_PART, SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT S_PART WHERE P_PART.PART_ID = S_PART.PART_ID AND P_PART.TABLE_ID = S_PART.TABLE_ID AND P_PART.TENANT_ID = EFFECTIVE_TENANT_ID() AND S_PART.TENANT_ID = EFFECTIVE_TENANT_ID()) PART ON DB_TB.TABLE_ID = PART.TABLE_ID AND DB_TB.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = PART.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID())__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(DB_TB.TABLE_NAME AS VARCHAR2(128)) TABLE_NAME, CAST(PART.PART_NAME AS VARCHAR2(128)) PARTITION_NAME, CAST(PART.SUB_PART_NAME AS VARCHAR2(128)) SUBPARTITION_NAME, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN PART.HIGH_BOUND_VAL ELSE PART.LIST_VAL END AS VARCHAR2(1024)) HIGH_VALUE, CAST(CASE WHEN length(PART.HIGH_BOUND_VAL) > 0 THEN length(PART.HIGH_BOUND_VAL) ELSE length(PART.LIST_VAL) END AS NUMBER) HIGH_VALUE_LENGTH, CAST(PART.SUB_PART_ID + 1 AS NUMBER) SUBPARTITION_POSITION, CAST(TP.TABLESPACE_NAME AS VARCHAR2(30)) TABLESPACE_NAME, CAST(NULL AS NUMBER) PCT_FREE, CAST(NULL AS NUMBER) PCT_USED, CAST(NULL AS NUMBER) INI_TRANS, CAST(NULL AS NUMBER) MAX_TRANS, CAST(NULL AS NUMBER) INITIAL_EXTENT, CAST(NULL AS NUMBER) NEXT_EXTENT, CAST(NULL AS NUMBER) MIN_EXTENT, CAST(NULL AS NUMBER) MAX_EXTENT, CAST(NULL AS NUMBER) MAX_SIZE, CAST(NULL AS NUMBER) PCT_INCREASE, CAST(NULL AS NUMBER) FREELISTS, CAST(NULL AS NUMBER) FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) COMPRESSION, CAST(PART.COMPRESS_FUNC_NAME AS VARCHAR2(12)) COMPRESS_FOR, CAST(NULL AS NUMBER) NUM_ROWS, CAST(NULL AS NUMBER) BLOCKS, CAST(NULL AS NUMBER) EMPTY_BLOCKS, CAST(NULL AS NUMBER) AVG_SPACE, CAST(NULL AS NUMBER) CHAIN_CNT, CAST(NULL AS NUMBER) AVG_ROW_LEN, CAST(NULL AS NUMBER) SAMPLE_SIZE, CAST(NULL AS DATE) LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) USER_STATS, CAST(NULL AS VARCHAR2(3)) "INTERVAL", CAST(NULL AS VARCHAR2(3)) SEGMENT_CREATED FROM (SELECT DB.DATABASE_NAME, DB.DATABASE_ID, TB.TABLE_ID, TB.TABLE_NAME FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE TB.DATABASE_ID = DB.DATABASE_ID AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID()) DB_TB JOIN (SELECT P_PART.PART_NAME, P_PART.SUB_PART_NUM, P_PART.TABLE_ID, S_PART.SUB_PART_NAME, S_PART.HIGH_BOUND_VAL, S_PART.LIST_VAL, S_PART.COMPRESS_FUNC_NAME, S_PART.SUB_PART_ID, S_PART.TABLESPACE_ID FROM SYS.ALL_VIRTUAL_PART_REAL_AGENT P_PART, SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT S_PART WHERE P_PART.PART_ID = S_PART.PART_ID AND P_PART.TABLE_ID = S_PART.TABLE_ID AND P_PART.TENANT_ID = EFFECTIVE_TENANT_ID() AND S_PART.TENANT_ID = EFFECTIVE_TENANT_ID()) PART ON DB_TB.TABLE_ID = PART.TABLE_ID AND DB_TB.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = PART.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID())__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1638,17 +1580,16 @@ int ObInnerTableSchema::user_tab_subpartitions_ora_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_subpartition_templates_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_subpartition_templates_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1679,9 +1620,7 @@ int ObInnerTableSchema::dba_subpartition_templates_ora_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL( - table_schema - .set_view_definition(R"__(SELECT CAST(DB.DATABASE_NAME AS VARCHAR2(128)) USER_NAME, TB.TABLE_NAME AS TABLE_NAME, SP.SUB_PART_NAME AS SUBPARTITION_NAME, SP.SUB_PART_ID + 1 AS SUBPARTITION_POSITION, TP.TABLESPACE_NAME AS TABLESPACE_NAME, CAST(CASE WHEN SP.HIGH_BOUND_VAL is NULL THEN SP.LIST_VAL ELSE SP.HIGH_BOUND_VAL END AS VARCHAR2(1024)) HIGH_BOUND FROM (SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB join SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB on DB.database_id = TB.database_id AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() join SYS.ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT SP on tb.table_id = sp.table_id AND SP.TENANT_ID = EFFECTIVE_TENANT_ID()) left join SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = SP.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(DB.DATABASE_NAME AS VARCHAR2(128)) USER_NAME, TB.TABLE_NAME AS TABLE_NAME, SP.SUB_PART_NAME AS SUBPARTITION_NAME, SP.SUB_PART_ID + 1 AS SUBPARTITION_POSITION, TP.TABLESPACE_NAME AS TABLESPACE_NAME, CAST(CASE WHEN SP.HIGH_BOUND_VAL is NULL THEN SP.LIST_VAL ELSE SP.HIGH_BOUND_VAL END AS VARCHAR2(1024)) HIGH_BOUND FROM (SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB join SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB on DB.database_id = TB.database_id AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() join SYS.ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT SP on tb.table_id = sp.table_id AND SP.TENANT_ID = EFFECTIVE_TENANT_ID()) left join SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = SP.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1693,17 +1632,16 @@ int ObInnerTableSchema::dba_subpartition_templates_ora_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_subpartition_templates_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_subpartition_templates_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1734,8 +1672,7 @@ int ObInnerTableSchema::all_subpartition_templates_ora_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT CAST(DB.DATABASE_NAME AS VARCHAR2(128)) USER_NAME, TB.TABLE_NAME AS TABLE_NAME, SP.SUB_PART_NAME AS SUBPARTITION_NAME, SP.SUB_PART_ID + 1 AS SUBPARTITION_POSITION, TP.TABLESPACE_NAME AS TABLESPACE_NAME, CAST(CASE WHEN SP.HIGH_BOUND_VAL is NULL THEN SP.LIST_VAL ELSE SP.HIGH_BOUND_VAL END AS VARCHAR2(1024)) HIGH_BOUND FROM (SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB join SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB on DB.database_id = TB.database_id AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND (TB.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, TB.TABLE_ID, TB.DATABASE_ID) = 1) join SYS.ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT SP on tb.table_id = sp.table_id AND SP.TENANT_ID = EFFECTIVE_TENANT_ID()) left join SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = SP.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(DB.DATABASE_NAME AS VARCHAR2(128)) USER_NAME, TB.TABLE_NAME AS TABLE_NAME, SP.SUB_PART_NAME AS SUBPARTITION_NAME, SP.SUB_PART_ID + 1 AS SUBPARTITION_POSITION, TP.TABLESPACE_NAME AS TABLESPACE_NAME, CAST(CASE WHEN SP.HIGH_BOUND_VAL is NULL THEN SP.LIST_VAL ELSE SP.HIGH_BOUND_VAL END AS VARCHAR2(1024)) HIGH_BOUND FROM (SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB join SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB on DB.database_id = TB.database_id AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND (TB.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, TB.TABLE_ID, TB.DATABASE_ID) = 1) join SYS.ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT SP on tb.table_id = sp.table_id AND SP.TENANT_ID = EFFECTIVE_TENANT_ID()) left join SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = SP.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1747,17 +1684,16 @@ int ObInnerTableSchema::all_subpartition_templates_ora_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_subpartition_templates_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_subpartition_templates_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1788,9 +1724,7 @@ int ObInnerTableSchema::user_subpartition_templates_ora_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL( - table_schema - .set_view_definition(R"__(SELECT TB.TABLE_NAME AS USER_NAME, SP.SUB_PART_NAME AS SUBPARTITION_NAME, SP.SUB_PART_ID + 1 AS SUBPARTITION_POSITION, TP.TABLESPACE_NAME AS TABLESPACE_NAME, CAST(CASE WHEN SP.HIGH_BOUND_VAL is NULL THEN SP.LIST_VAL ELSE SP.HIGH_BOUND_VAL END AS VARCHAR2(1024)) HIGH_BOUND FROM (SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB join SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB on DB.database_id = TB.database_id AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() join SYS.ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT SP on tb.table_id = sp.table_id AND SP.TENANT_ID = EFFECTIVE_TENANT_ID()) left join SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = SP.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE DB.database_id = USERENV('SCHEMAID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT TB.TABLE_NAME AS USER_NAME, SP.SUB_PART_NAME AS SUBPARTITION_NAME, SP.SUB_PART_ID + 1 AS SUBPARTITION_POSITION, TP.TABLESPACE_NAME AS TABLESPACE_NAME, CAST(CASE WHEN SP.HIGH_BOUND_VAL is NULL THEN SP.LIST_VAL ELSE SP.HIGH_BOUND_VAL END AS VARCHAR2(1024)) HIGH_BOUND FROM (SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB join SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB on DB.database_id = TB.database_id AND TB.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() join SYS.ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT SP on tb.table_id = sp.table_id AND SP.TENANT_ID = EFFECTIVE_TENANT_ID()) left join SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = SP.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE DB.database_id = USERENV('SCHEMAID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1802,17 +1736,16 @@ int ObInnerTableSchema::user_subpartition_templates_ora_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_part_indexes_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_part_indexes_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1843,8 +1776,7 @@ int ObInnerTableSchema::dba_part_indexes_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( with PARTITIONED_INDEXES as ( SELECT CASE when I.INDEX_TYPE IN (1, 2) then 1 else 0 end as IS_LOCAL, DB.DATABASE_NAME AS I_OWNER, CASE WHEN DB.DATABASE_NAME != '__recyclebin' THEN SUBSTR(I.TABLE_NAME, 7 + INSTR(SUBSTR(I.TABLE_NAME, 7), '_')) ELSE I.TABLE_NAME END AS I_NAME, T.TABLE_NAME AS T_NAME, I.DATA_TABLE_ID AS T_ID, I.TABLE_ID AS I_ID, TP.TABLESPACE_NAME, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN I.DATA_TABLE_ID ELSE I.TABLE_ID END AS PART_INFO_T_ID, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_LEVEL ELSE I.PART_LEVEL END AS I_PART_LEVEL, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_FUNC_TYPE ELSE I.PART_FUNC_TYPE END AS I_PART_FUNC_TYPE, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.SUB_PART_FUNC_TYPE ELSE I.SUB_PART_FUNC_TYPE END AS I_SUB_PART_FUNC_TYPE, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_NUM ELSE I.PART_NUM END AS I_PART_NUM, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.SUB_PART_NUM ELSE I.SUB_PART_NUM END AS I_SUB_PART_NUM FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT I JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB ON I.DATABASE_ID = DB.DATABASE_ID AND I.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T ON I.DATA_TABLE_ID = T.TABLE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = I.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE I.TABLE_TYPE = 5 AND (I.INDEX_TYPE NOT IN (1, 2) and I.PART_LEVEL != 0 or I.INDEX_TYPE IN (1, 2) and T.PART_LEVEL != 0) ), PART_KEY_COUNT as ( select PI.I_ID, SUM(CASE WHEN BITAND(C.PARTITION_KEY_POSITION, 255) != 0 THEN 1 ELSE 0 END) AS PARTITIONING_KEY_COUNT, SUM(CASE WHEN BITAND(C.PARTITION_KEY_POSITION, 65280)/256 != 0 THEN 1 ELSE 0 END) AS SUBPARTITIONING_KEY_COUNT from PARTITIONED_INDEXES PI join SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C on PI.PART_INFO_T_ID = C.TABLE_ID AND C.TENANT_ID = EFFECTIVE_TENANT_ID() group by I_ID ), LOCAL_INDEX_PREFIXED as ( select I.TABLE_ID AS I_ID, 1 AS IS_PREFIXED from SYS.ALL_VIRTUAL_TABLE_REAL_AGENT I where I.TABLE_TYPE = 5 AND I.INDEX_TYPE in (1,2) AND I.TENANT_ID = EFFECTIVE_TENANT_ID() and not exists (select * from ( select * from SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C where C.TABLE_ID = I.DATA_TABLE_ID AND C.PARTITION_KEY_POSITION != 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() ) PART_COLUMNS left join ( select * from SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C WHERE C.TABLE_ID = I.TABLE_ID AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.INDEX_POSITION != 0 ) INDEX_COLUMNS ON PART_COLUMNS.COLUMN_ID = INDEX_COLUMNS.COLUMN_ID where (BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 255) != 0 AND (INDEX_COLUMNS.INDEX_POSITION is null or BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 255) != INDEX_COLUMNS.INDEX_POSITION)) or (BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 65280)/256 != 0 AND (INDEX_COLUMNS.INDEX_POSITION is null)) ) ) SELECT CAST(PI.I_OWNER AS VARCHAR2(128)) AS OWNER, CAST(PI.I_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(PI.T_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE PI.I_PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END AS VARCHAR2(9)) AS PARTITIONING_TYPE, CAST( CASE WHEN PI.I_PART_LEVEL < 2 THEN 'NONE' ELSE CASE PI.I_SUB_PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END END AS VARCHAR2(9)) AS SUBPARTITIONING_TYPE, CAST(PI.I_PART_NUM AS NUMBER) AS PARTITION_COUNT, CAST(CASE WHEN PI.I_PART_LEVEL < 2 THEN 0 ELSE PI.I_SUB_PART_NUM END AS NUMBER) AS DEF_SUBPARTITION_COUNT, CAST(PKC.PARTITIONING_KEY_COUNT AS NUMBER) AS PARTITIONING_KEY_COUNT, CAST(PKC.SUBPARTITIONING_KEY_COUNT AS NUMBER) AS SUBPARTITIONING_KEY_COUNT, CAST(CASE WHEN PI.IS_LOCAL = 1 THEN 'LOCAL' ELSE 'GLOBAL' END AS VARCHAR2(6)) AS LOCALITY, CAST(CASE WHEN (PI.IS_LOCAL = 0 or (PI.IS_LOCAL = 1 and LIP.IS_PREFIXED = 1)) THEN 'PREFIXED' ELSE 'NON_PREFIXED' END AS VARCHAR2(12)) AS ALIGNMENT, CAST(PI.TABLESPACE_NAME AS VARCHAR2(30)) AS DEF_TABLESPACE_NAME, CAST(0 AS NUMBER) AS DEF_PCT_FREE, CAST(0 AS NUMBER) AS DEF_INI_TRANS, CAST(0 AS NUMBER) AS DEF_MAX_TRANS, CAST(NULL AS VARCHAR2(40)) AS DEF_INITIAL_EXTENT, CAST(NULL AS VARCHAR2(40)) AS DEF_NEXT_EXTENT, CAST(NULL AS VARCHAR2(40)) AS DEF_MIN_EXTENTS, CAST(NULL AS VARCHAR2(40)) AS DEF_MAX_EXTENTS, CAST(NULL AS VARCHAR2(40)) AS DEF_MAX_SIZE, CAST(NULL AS VARCHAR2(40)) AS DEF_PCT_INCREASE, CAST(0 AS NUMBER) AS DEF_FREELISTS, CAST(0 AS NUMBER) AS DEF_FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS DEF_LOGGING, CAST(NULL AS VARCHAR2(7)) AS DEF_BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS DEF_FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS DEF_CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(1000)) AS DEF_PARAMETERS, CAST(NULL AS VARCHAR2(1000)) AS INTERVAL from PARTITIONED_INDEXES PI join PART_KEY_COUNT PKC on PI.I_ID = PKC.I_ID left join LOCAL_INDEX_PREFIXED LIP on PI.I_ID = LIP.I_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( with PARTITIONED_INDEXES as ( SELECT CASE when I.INDEX_TYPE IN (1, 2) then 1 else 0 end as IS_LOCAL, DB.DATABASE_NAME AS I_OWNER, CASE WHEN DB.DATABASE_NAME != '__recyclebin' THEN SUBSTR(I.TABLE_NAME, 7 + INSTR(SUBSTR(I.TABLE_NAME, 7), '_')) ELSE I.TABLE_NAME END AS I_NAME, T.TABLE_NAME AS T_NAME, I.DATA_TABLE_ID AS T_ID, I.TABLE_ID AS I_ID, TP.TABLESPACE_NAME, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN I.DATA_TABLE_ID ELSE I.TABLE_ID END AS PART_INFO_T_ID, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_LEVEL ELSE I.PART_LEVEL END AS I_PART_LEVEL, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_FUNC_TYPE ELSE I.PART_FUNC_TYPE END AS I_PART_FUNC_TYPE, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.SUB_PART_FUNC_TYPE ELSE I.SUB_PART_FUNC_TYPE END AS I_SUB_PART_FUNC_TYPE, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_NUM ELSE I.PART_NUM END AS I_PART_NUM, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.SUB_PART_NUM ELSE I.SUB_PART_NUM END AS I_SUB_PART_NUM FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT I JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB ON I.DATABASE_ID = DB.DATABASE_ID AND I.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T ON I.DATA_TABLE_ID = T.TABLE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = I.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE I.TABLE_TYPE = 5 AND (I.INDEX_TYPE NOT IN (1, 2) and I.PART_LEVEL != 0 or I.INDEX_TYPE IN (1, 2) and T.PART_LEVEL != 0) ), PART_KEY_COUNT as ( select PI.I_ID, SUM(CASE WHEN BITAND(C.PARTITION_KEY_POSITION, 255) != 0 THEN 1 ELSE 0 END) AS PARTITIONING_KEY_COUNT, SUM(CASE WHEN BITAND(C.PARTITION_KEY_POSITION, 65280)/256 != 0 THEN 1 ELSE 0 END) AS SUBPARTITIONING_KEY_COUNT from PARTITIONED_INDEXES PI join SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C on PI.PART_INFO_T_ID = C.TABLE_ID AND C.TENANT_ID = EFFECTIVE_TENANT_ID() group by I_ID ), LOCAL_INDEX_PREFIXED as ( select I.TABLE_ID AS I_ID, 1 AS IS_PREFIXED from SYS.ALL_VIRTUAL_TABLE_REAL_AGENT I where I.TABLE_TYPE = 5 AND I.INDEX_TYPE in (1,2) AND I.TENANT_ID = EFFECTIVE_TENANT_ID() and not exists (select * from ( select * from SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C where C.TABLE_ID = I.DATA_TABLE_ID AND C.PARTITION_KEY_POSITION != 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() ) PART_COLUMNS left join ( select * from SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C WHERE C.TABLE_ID = I.TABLE_ID AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.INDEX_POSITION != 0 ) INDEX_COLUMNS ON PART_COLUMNS.COLUMN_ID = INDEX_COLUMNS.COLUMN_ID where (BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 255) != 0 AND (INDEX_COLUMNS.INDEX_POSITION is null or BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 255) != INDEX_COLUMNS.INDEX_POSITION)) or (BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 65280)/256 != 0 AND (INDEX_COLUMNS.INDEX_POSITION is null)) ) ) SELECT CAST(PI.I_OWNER AS VARCHAR2(128)) AS OWNER, CAST(PI.I_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(PI.T_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE PI.I_PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END AS VARCHAR2(9)) AS PARTITIONING_TYPE, CAST( CASE WHEN PI.I_PART_LEVEL < 2 THEN 'NONE' ELSE CASE PI.I_SUB_PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END END AS VARCHAR2(9)) AS SUBPARTITIONING_TYPE, CAST(PI.I_PART_NUM AS NUMBER) AS PARTITION_COUNT, CAST(CASE WHEN PI.I_PART_LEVEL < 2 THEN 0 ELSE PI.I_SUB_PART_NUM END AS NUMBER) AS DEF_SUBPARTITION_COUNT, CAST(PKC.PARTITIONING_KEY_COUNT AS NUMBER) AS PARTITIONING_KEY_COUNT, CAST(PKC.SUBPARTITIONING_KEY_COUNT AS NUMBER) AS SUBPARTITIONING_KEY_COUNT, CAST(CASE WHEN PI.IS_LOCAL = 1 THEN 'LOCAL' ELSE 'GLOBAL' END AS VARCHAR2(6)) AS LOCALITY, CAST(CASE WHEN (PI.IS_LOCAL = 0 or (PI.IS_LOCAL = 1 and LIP.IS_PREFIXED = 1)) THEN 'PREFIXED' ELSE 'NON_PREFIXED' END AS VARCHAR2(12)) AS ALIGNMENT, CAST(PI.TABLESPACE_NAME AS VARCHAR2(30)) AS DEF_TABLESPACE_NAME, CAST(0 AS NUMBER) AS DEF_PCT_FREE, CAST(0 AS NUMBER) AS DEF_INI_TRANS, CAST(0 AS NUMBER) AS DEF_MAX_TRANS, CAST(NULL AS VARCHAR2(40)) AS DEF_INITIAL_EXTENT, CAST(NULL AS VARCHAR2(40)) AS DEF_NEXT_EXTENT, CAST(NULL AS VARCHAR2(40)) AS DEF_MIN_EXTENTS, CAST(NULL AS VARCHAR2(40)) AS DEF_MAX_EXTENTS, CAST(NULL AS VARCHAR2(40)) AS DEF_MAX_SIZE, CAST(NULL AS VARCHAR2(40)) AS DEF_PCT_INCREASE, CAST(0 AS NUMBER) AS DEF_FREELISTS, CAST(0 AS NUMBER) AS DEF_FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS DEF_LOGGING, CAST(NULL AS VARCHAR2(7)) AS DEF_BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS DEF_FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS DEF_CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(1000)) AS DEF_PARAMETERS, CAST(NULL AS VARCHAR2(1000)) AS INTERVAL from PARTITIONED_INDEXES PI join PART_KEY_COUNT PKC on PI.I_ID = PKC.I_ID left join LOCAL_INDEX_PREFIXED LIP on PI.I_ID = LIP.I_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1856,17 +1788,16 @@ int ObInnerTableSchema::dba_part_indexes_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_part_indexes_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_part_indexes_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1897,9 +1828,7 @@ int ObInnerTableSchema::all_part_indexes_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL( - table_schema - .set_view_definition(R"__( with PARTITIONED_INDEXES as ( SELECT CASE when I.INDEX_TYPE IN (1, 2) then 1 else 0 end as IS_LOCAL, DB.DATABASE_NAME AS I_OWNER, CASE WHEN DB.DATABASE_NAME != '__recyclebin' THEN SUBSTR(I.TABLE_NAME, 7 + INSTR(SUBSTR(I.TABLE_NAME, 7), '_')) ELSE I.TABLE_NAME END AS I_NAME, T.TABLE_NAME AS T_NAME, I.DATA_TABLE_ID AS T_ID, I.TABLE_ID AS I_ID, TP.TABLESPACE_NAME, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN I.DATA_TABLE_ID ELSE I.TABLE_ID END AS PART_INFO_T_ID, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_LEVEL ELSE I.PART_LEVEL END AS I_PART_LEVEL, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_FUNC_TYPE ELSE I.PART_FUNC_TYPE END AS I_PART_FUNC_TYPE, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.SUB_PART_FUNC_TYPE ELSE I.SUB_PART_FUNC_TYPE END AS I_SUB_PART_FUNC_TYPE, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_NUM ELSE I.PART_NUM END AS I_PART_NUM, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.SUB_PART_NUM ELSE I.SUB_PART_NUM END AS I_SUB_PART_NUM FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT I JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB ON I.DATABASE_ID = DB.DATABASE_ID AND I.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T ON I.DATA_TABLE_ID = T.TABLE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND (I.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, I.DATA_TABLE_ID, 1) = 1) LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = I.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE I.TABLE_TYPE = 5 AND (I.INDEX_TYPE NOT IN (1, 2) and I.PART_LEVEL != 0 or I.INDEX_TYPE IN (1, 2) and T.PART_LEVEL != 0) ), PART_KEY_COUNT as ( select PI.I_ID, SUM(CASE WHEN BITAND(C.PARTITION_KEY_POSITION, 255) != 0 THEN 1 ELSE 0 END) AS PARTITIONING_KEY_COUNT, SUM(CASE WHEN BITAND(C.PARTITION_KEY_POSITION, 65280)/256 != 0 THEN 1 ELSE 0 END) AS SUBPARTITIONING_KEY_COUNT from PARTITIONED_INDEXES PI join SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C on PI.PART_INFO_T_ID = C.TABLE_ID AND C.TENANT_ID = EFFECTIVE_TENANT_ID() group by I_ID ), LOCAL_INDEX_PREFIXED as ( select I.TABLE_ID AS I_ID, 1 AS IS_PREFIXED from SYS.ALL_VIRTUAL_TABLE_REAL_AGENT I where I.TABLE_TYPE = 5 AND I.INDEX_TYPE in (1,2) AND I.TENANT_ID = EFFECTIVE_TENANT_ID() AND (I.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, I.DATA_TABLE_ID, I.DATABASE_ID) = 1) and not exists (select * from ( select * from SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C where C.TABLE_ID = I.DATA_TABLE_ID AND C.PARTITION_KEY_POSITION != 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() ) PART_COLUMNS left join ( select * from SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C WHERE C.TABLE_ID = I.TABLE_ID AND C.INDEX_POSITION != 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() ) INDEX_COLUMNS ON PART_COLUMNS.COLUMN_ID = INDEX_COLUMNS.COLUMN_ID where (BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 255) != 0 AND (INDEX_COLUMNS.INDEX_POSITION is null or BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 255) != INDEX_COLUMNS.INDEX_POSITION)) or (BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 65280)/256 != 0 AND (INDEX_COLUMNS.INDEX_POSITION is null)) ) ) SELECT CAST(PI.I_OWNER AS VARCHAR2(128)) AS OWNER, CAST(PI.I_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(PI.T_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE PI.I_PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END AS VARCHAR2(9)) AS PARTITIONING_TYPE, CAST( CASE WHEN PI.I_PART_LEVEL < 2 THEN 'NONE' ELSE CASE PI.I_SUB_PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END END AS VARCHAR2(9)) AS SUBPARTITIONING_TYPE, CAST(PI.I_PART_NUM AS NUMBER) AS PARTITION_COUNT, CAST(CASE WHEN PI.I_PART_LEVEL < 2 THEN 0 ELSE PI.I_SUB_PART_NUM END AS NUMBER) AS DEF_SUBPARTITION_COUNT, CAST(PKC.PARTITIONING_KEY_COUNT AS NUMBER) AS PARTITIONING_KEY_COUNT, CAST(PKC.SUBPARTITIONING_KEY_COUNT AS NUMBER) AS SUBPARTITIONING_KEY_COUNT, CAST(CASE WHEN PI.IS_LOCAL = 1 THEN 'LOCAL' ELSE 'GLOBAL' END AS VARCHAR2(6)) AS LOCALITY, CAST(CASE WHEN (PI.IS_LOCAL = 0 or (PI.IS_LOCAL = 1 and LIP.IS_PREFIXED = 1)) THEN 'PREFIXED' ELSE 'NON_PREFIXED' END AS VARCHAR2(12)) AS ALIGNMENT, CAST(PI.TABLESPACE_NAME AS VARCHAR2(30)) AS DEF_TABLESPACE_NAME, CAST(0 AS NUMBER) AS DEF_PCT_FREE, CAST(0 AS NUMBER) AS DEF_INI_TRANS, CAST(0 AS NUMBER) AS DEF_MAX_TRANS, CAST(NULL AS VARCHAR2(40)) AS DEF_INITIAL_EXTENT, CAST(NULL AS VARCHAR2(40)) AS DEF_NEXT_EXTENT, CAST(NULL AS VARCHAR2(40)) AS DEF_MIN_EXTENTS, CAST(NULL AS VARCHAR2(40)) AS DEF_MAX_EXTENTS, CAST(NULL AS VARCHAR2(40)) AS DEF_MAX_SIZE, CAST(NULL AS VARCHAR2(40)) AS DEF_PCT_INCREASE, CAST(0 AS NUMBER) AS DEF_FREELISTS, CAST(0 AS NUMBER) AS DEF_FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS DEF_LOGGING, CAST(NULL AS VARCHAR2(7)) AS DEF_BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS DEF_FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS DEF_CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(1000)) AS DEF_PARAMETERS, CAST(NULL AS VARCHAR2(1000)) AS INTERVAL from PARTITIONED_INDEXES PI join PART_KEY_COUNT PKC on PI.I_ID = PKC.I_ID left join LOCAL_INDEX_PREFIXED LIP on PI.I_ID = LIP.I_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( with PARTITIONED_INDEXES as ( SELECT CASE when I.INDEX_TYPE IN (1, 2) then 1 else 0 end as IS_LOCAL, DB.DATABASE_NAME AS I_OWNER, CASE WHEN DB.DATABASE_NAME != '__recyclebin' THEN SUBSTR(I.TABLE_NAME, 7 + INSTR(SUBSTR(I.TABLE_NAME, 7), '_')) ELSE I.TABLE_NAME END AS I_NAME, T.TABLE_NAME AS T_NAME, I.DATA_TABLE_ID AS T_ID, I.TABLE_ID AS I_ID, TP.TABLESPACE_NAME, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN I.DATA_TABLE_ID ELSE I.TABLE_ID END AS PART_INFO_T_ID, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_LEVEL ELSE I.PART_LEVEL END AS I_PART_LEVEL, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_FUNC_TYPE ELSE I.PART_FUNC_TYPE END AS I_PART_FUNC_TYPE, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.SUB_PART_FUNC_TYPE ELSE I.SUB_PART_FUNC_TYPE END AS I_SUB_PART_FUNC_TYPE, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_NUM ELSE I.PART_NUM END AS I_PART_NUM, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.SUB_PART_NUM ELSE I.SUB_PART_NUM END AS I_SUB_PART_NUM FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT I JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB ON I.DATABASE_ID = DB.DATABASE_ID AND I.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T ON I.DATA_TABLE_ID = T.TABLE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND (I.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, I.DATA_TABLE_ID, 1) = 1) LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = I.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE I.TABLE_TYPE = 5 AND (I.INDEX_TYPE NOT IN (1, 2) and I.PART_LEVEL != 0 or I.INDEX_TYPE IN (1, 2) and T.PART_LEVEL != 0) ), PART_KEY_COUNT as ( select PI.I_ID, SUM(CASE WHEN BITAND(C.PARTITION_KEY_POSITION, 255) != 0 THEN 1 ELSE 0 END) AS PARTITIONING_KEY_COUNT, SUM(CASE WHEN BITAND(C.PARTITION_KEY_POSITION, 65280)/256 != 0 THEN 1 ELSE 0 END) AS SUBPARTITIONING_KEY_COUNT from PARTITIONED_INDEXES PI join SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C on PI.PART_INFO_T_ID = C.TABLE_ID AND C.TENANT_ID = EFFECTIVE_TENANT_ID() group by I_ID ), LOCAL_INDEX_PREFIXED as ( select I.TABLE_ID AS I_ID, 1 AS IS_PREFIXED from SYS.ALL_VIRTUAL_TABLE_REAL_AGENT I where I.TABLE_TYPE = 5 AND I.INDEX_TYPE in (1,2) AND I.TENANT_ID = EFFECTIVE_TENANT_ID() AND (I.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, I.DATA_TABLE_ID, I.DATABASE_ID) = 1) and not exists (select * from ( select * from SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C where C.TABLE_ID = I.DATA_TABLE_ID AND C.PARTITION_KEY_POSITION != 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() ) PART_COLUMNS left join ( select * from SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C WHERE C.TABLE_ID = I.TABLE_ID AND C.INDEX_POSITION != 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() ) INDEX_COLUMNS ON PART_COLUMNS.COLUMN_ID = INDEX_COLUMNS.COLUMN_ID where (BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 255) != 0 AND (INDEX_COLUMNS.INDEX_POSITION is null or BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 255) != INDEX_COLUMNS.INDEX_POSITION)) or (BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 65280)/256 != 0 AND (INDEX_COLUMNS.INDEX_POSITION is null)) ) ) SELECT CAST(PI.I_OWNER AS VARCHAR2(128)) AS OWNER, CAST(PI.I_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(PI.T_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE PI.I_PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END AS VARCHAR2(9)) AS PARTITIONING_TYPE, CAST( CASE WHEN PI.I_PART_LEVEL < 2 THEN 'NONE' ELSE CASE PI.I_SUB_PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END END AS VARCHAR2(9)) AS SUBPARTITIONING_TYPE, CAST(PI.I_PART_NUM AS NUMBER) AS PARTITION_COUNT, CAST(CASE WHEN PI.I_PART_LEVEL < 2 THEN 0 ELSE PI.I_SUB_PART_NUM END AS NUMBER) AS DEF_SUBPARTITION_COUNT, CAST(PKC.PARTITIONING_KEY_COUNT AS NUMBER) AS PARTITIONING_KEY_COUNT, CAST(PKC.SUBPARTITIONING_KEY_COUNT AS NUMBER) AS SUBPARTITIONING_KEY_COUNT, CAST(CASE WHEN PI.IS_LOCAL = 1 THEN 'LOCAL' ELSE 'GLOBAL' END AS VARCHAR2(6)) AS LOCALITY, CAST(CASE WHEN (PI.IS_LOCAL = 0 or (PI.IS_LOCAL = 1 and LIP.IS_PREFIXED = 1)) THEN 'PREFIXED' ELSE 'NON_PREFIXED' END AS VARCHAR2(12)) AS ALIGNMENT, CAST(PI.TABLESPACE_NAME AS VARCHAR2(30)) AS DEF_TABLESPACE_NAME, CAST(0 AS NUMBER) AS DEF_PCT_FREE, CAST(0 AS NUMBER) AS DEF_INI_TRANS, CAST(0 AS NUMBER) AS DEF_MAX_TRANS, CAST(NULL AS VARCHAR2(40)) AS DEF_INITIAL_EXTENT, CAST(NULL AS VARCHAR2(40)) AS DEF_NEXT_EXTENT, CAST(NULL AS VARCHAR2(40)) AS DEF_MIN_EXTENTS, CAST(NULL AS VARCHAR2(40)) AS DEF_MAX_EXTENTS, CAST(NULL AS VARCHAR2(40)) AS DEF_MAX_SIZE, CAST(NULL AS VARCHAR2(40)) AS DEF_PCT_INCREASE, CAST(0 AS NUMBER) AS DEF_FREELISTS, CAST(0 AS NUMBER) AS DEF_FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS DEF_LOGGING, CAST(NULL AS VARCHAR2(7)) AS DEF_BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS DEF_FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS DEF_CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(1000)) AS DEF_PARAMETERS, CAST(NULL AS VARCHAR2(1000)) AS INTERVAL from PARTITIONED_INDEXES PI join PART_KEY_COUNT PKC on PI.I_ID = PKC.I_ID left join LOCAL_INDEX_PREFIXED LIP on PI.I_ID = LIP.I_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1911,17 +1840,16 @@ int ObInnerTableSchema::all_part_indexes_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_part_indexes_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_part_indexes_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1952,8 +1880,7 @@ int ObInnerTableSchema::user_part_indexes_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( with PARTITIONED_INDEXES as ( SELECT CASE when I.INDEX_TYPE IN (1, 2) then 1 else 0 end as IS_LOCAL, DB.DATABASE_NAME AS I_OWNER, CASE WHEN DB.DATABASE_NAME != '__recyclebin' THEN SUBSTR(I.TABLE_NAME, 7 + INSTR(SUBSTR(I.TABLE_NAME, 7), '_')) ELSE I.TABLE_NAME END AS I_NAME, T.TABLE_NAME AS T_NAME, I.DATA_TABLE_ID AS T_ID, I.TABLE_ID AS I_ID, TP.TABLESPACE_NAME, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN I.DATA_TABLE_ID ELSE I.TABLE_ID END AS PART_INFO_T_ID, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_LEVEL ELSE I.PART_LEVEL END AS I_PART_LEVEL, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_FUNC_TYPE ELSE I.PART_FUNC_TYPE END AS I_PART_FUNC_TYPE, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.SUB_PART_FUNC_TYPE ELSE I.SUB_PART_FUNC_TYPE END AS I_SUB_PART_FUNC_TYPE, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_NUM ELSE I.PART_NUM END AS I_PART_NUM, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.SUB_PART_NUM ELSE I.SUB_PART_NUM END AS I_SUB_PART_NUM FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT I JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB ON I.DATABASE_ID = DB.DATABASE_ID AND I.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND I.DATABASE_ID = USERENV('SCHEMAID') JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T ON I.DATA_TABLE_ID = T.TABLE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = I.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE I.TABLE_TYPE = 5 AND (I.INDEX_TYPE NOT IN (1, 2) and I.PART_LEVEL != 0 or I.INDEX_TYPE IN (1, 2) and T.PART_LEVEL != 0) ), PART_KEY_COUNT as ( select PI.I_ID, SUM(CASE WHEN BITAND(C.PARTITION_KEY_POSITION, 255) != 0 THEN 1 ELSE 0 END) AS PARTITIONING_KEY_COUNT, SUM(CASE WHEN BITAND(C.PARTITION_KEY_POSITION, 65280)/256 != 0 THEN 1 ELSE 0 END) AS SUBPARTITIONING_KEY_COUNT from PARTITIONED_INDEXES PI join SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C on PI.PART_INFO_T_ID = C.TABLE_ID AND C.TENANT_ID = EFFECTIVE_TENANT_ID() group by I_ID ), LOCAL_INDEX_PREFIXED as ( select I.TABLE_ID AS I_ID, 1 AS IS_PREFIXED from SYS.ALL_VIRTUAL_TABLE_REAL_AGENT I where I.TABLE_TYPE = 5 AND I.INDEX_TYPE in (1,2) AND I.TENANT_ID = EFFECTIVE_TENANT_ID() and not exists (select * from ( select * from SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C where C.TABLE_ID = I.DATA_TABLE_ID AND C.PARTITION_KEY_POSITION != 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() ) PART_COLUMNS left join ( select * from SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C WHERE C.TABLE_ID = I.TABLE_ID AND C.INDEX_POSITION != 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() ) INDEX_COLUMNS ON PART_COLUMNS.COLUMN_ID = INDEX_COLUMNS.COLUMN_ID where (BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 255) != 0 AND (INDEX_COLUMNS.INDEX_POSITION is null or BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 255) != INDEX_COLUMNS.INDEX_POSITION)) or (BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 65280)/256 != 0 AND (INDEX_COLUMNS.INDEX_POSITION is null)) ) ) SELECT CAST(PI.I_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(PI.T_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE PI.I_PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END AS VARCHAR2(9)) AS PARTITIONING_TYPE, CAST( CASE WHEN PI.I_PART_LEVEL < 2 THEN 'NONE' ELSE CASE PI.I_SUB_PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END END AS VARCHAR2(9)) AS SUBPARTITIONING_TYPE, CAST(PI.I_PART_NUM AS NUMBER) AS PARTITION_COUNT, CAST(CASE WHEN PI.I_PART_LEVEL < 2 THEN 0 ELSE PI.I_SUB_PART_NUM END AS NUMBER) AS DEF_SUBPARTITION_COUNT, CAST(PKC.PARTITIONING_KEY_COUNT AS NUMBER) AS PARTITIONING_KEY_COUNT, CAST(PKC.SUBPARTITIONING_KEY_COUNT AS NUMBER) AS SUBPARTITIONING_KEY_COUNT, CAST(CASE WHEN PI.IS_LOCAL = 1 THEN 'LOCAL' ELSE 'GLOBAL' END AS VARCHAR2(6)) AS LOCALITY, CAST(CASE WHEN (PI.IS_LOCAL = 0 or (PI.IS_LOCAL = 1 and LIP.IS_PREFIXED = 1)) THEN 'PREFIXED' ELSE 'NON_PREFIXED' END AS VARCHAR2(12)) AS ALIGNMENT, CAST(PI.TABLESPACE_NAME AS VARCHAR2(30)) AS DEF_TABLESPACE_NAME, CAST(0 AS NUMBER) AS DEF_PCT_FREE, CAST(0 AS NUMBER) AS DEF_INI_TRANS, CAST(0 AS NUMBER) AS DEF_MAX_TRANS, CAST(NULL AS VARCHAR2(40)) AS DEF_INITIAL_EXTENT, CAST(NULL AS VARCHAR2(40)) AS DEF_NEXT_EXTENT, CAST(NULL AS VARCHAR2(40)) AS DEF_MIN_EXTENTS, CAST(NULL AS VARCHAR2(40)) AS DEF_MAX_EXTENTS, CAST(NULL AS VARCHAR2(40)) AS DEF_MAX_SIZE, CAST(NULL AS VARCHAR2(40)) AS DEF_PCT_INCREASE, CAST(0 AS NUMBER) AS DEF_FREELISTS, CAST(0 AS NUMBER) AS DEF_FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS DEF_LOGGING, CAST(NULL AS VARCHAR2(7)) AS DEF_BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS DEF_FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS DEF_CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(1000)) AS DEF_PARAMETERS, CAST(NULL AS VARCHAR2(1000)) AS INTERVAL from PARTITIONED_INDEXES PI join PART_KEY_COUNT PKC on PI.I_ID = PKC.I_ID left join LOCAL_INDEX_PREFIXED LIP on PI.I_ID = LIP.I_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( with PARTITIONED_INDEXES as ( SELECT CASE when I.INDEX_TYPE IN (1, 2) then 1 else 0 end as IS_LOCAL, DB.DATABASE_NAME AS I_OWNER, CASE WHEN DB.DATABASE_NAME != '__recyclebin' THEN SUBSTR(I.TABLE_NAME, 7 + INSTR(SUBSTR(I.TABLE_NAME, 7), '_')) ELSE I.TABLE_NAME END AS I_NAME, T.TABLE_NAME AS T_NAME, I.DATA_TABLE_ID AS T_ID, I.TABLE_ID AS I_ID, TP.TABLESPACE_NAME, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN I.DATA_TABLE_ID ELSE I.TABLE_ID END AS PART_INFO_T_ID, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_LEVEL ELSE I.PART_LEVEL END AS I_PART_LEVEL, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_FUNC_TYPE ELSE I.PART_FUNC_TYPE END AS I_PART_FUNC_TYPE, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.SUB_PART_FUNC_TYPE ELSE I.SUB_PART_FUNC_TYPE END AS I_SUB_PART_FUNC_TYPE, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.PART_NUM ELSE I.PART_NUM END AS I_PART_NUM, CASE WHEN I.INDEX_TYPE IN (1, 2) THEN T.SUB_PART_NUM ELSE I.SUB_PART_NUM END AS I_SUB_PART_NUM FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT I JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB ON I.DATABASE_ID = DB.DATABASE_ID AND I.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND I.DATABASE_ID = USERENV('SCHEMAID') JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T ON I.DATA_TABLE_ID = T.TABLE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() LEFT JOIN SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT TP ON TP.TABLESPACE_ID = I.TABLESPACE_ID AND TP.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE I.TABLE_TYPE = 5 AND (I.INDEX_TYPE NOT IN (1, 2) and I.PART_LEVEL != 0 or I.INDEX_TYPE IN (1, 2) and T.PART_LEVEL != 0) ), PART_KEY_COUNT as ( select PI.I_ID, SUM(CASE WHEN BITAND(C.PARTITION_KEY_POSITION, 255) != 0 THEN 1 ELSE 0 END) AS PARTITIONING_KEY_COUNT, SUM(CASE WHEN BITAND(C.PARTITION_KEY_POSITION, 65280)/256 != 0 THEN 1 ELSE 0 END) AS SUBPARTITIONING_KEY_COUNT from PARTITIONED_INDEXES PI join SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C on PI.PART_INFO_T_ID = C.TABLE_ID AND C.TENANT_ID = EFFECTIVE_TENANT_ID() group by I_ID ), LOCAL_INDEX_PREFIXED as ( select I.TABLE_ID AS I_ID, 1 AS IS_PREFIXED from SYS.ALL_VIRTUAL_TABLE_REAL_AGENT I where I.TABLE_TYPE = 5 AND I.INDEX_TYPE in (1,2) AND I.TENANT_ID = EFFECTIVE_TENANT_ID() and not exists (select * from ( select * from SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C where C.TABLE_ID = I.DATA_TABLE_ID AND C.PARTITION_KEY_POSITION != 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() ) PART_COLUMNS left join ( select * from SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C WHERE C.TABLE_ID = I.TABLE_ID AND C.INDEX_POSITION != 0 AND C.TENANT_ID = EFFECTIVE_TENANT_ID() ) INDEX_COLUMNS ON PART_COLUMNS.COLUMN_ID = INDEX_COLUMNS.COLUMN_ID where (BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 255) != 0 AND (INDEX_COLUMNS.INDEX_POSITION is null or BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 255) != INDEX_COLUMNS.INDEX_POSITION)) or (BITAND(PART_COLUMNS.PARTITION_KEY_POSITION, 65280)/256 != 0 AND (INDEX_COLUMNS.INDEX_POSITION is null)) ) ) SELECT CAST(PI.I_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(PI.T_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE PI.I_PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END AS VARCHAR2(9)) AS PARTITIONING_TYPE, CAST( CASE WHEN PI.I_PART_LEVEL < 2 THEN 'NONE' ELSE CASE PI.I_SUB_PART_FUNC_TYPE WHEN 0 THEN 'HASH' WHEN 1 THEN 'KEY' WHEN 2 THEN 'KEY' WHEN 3 THEN 'RANGE' WHEN 4 THEN 'RANGE' WHEN 5 THEN 'LIST' WHEN 6 THEN 'KEY' WHEN 7 THEN 'LIST' WHEN 8 THEN 'HASH' WHEN 9 THEN 'KEY' WHEN 10 THEN 'KEY' END END AS VARCHAR2(9)) AS SUBPARTITIONING_TYPE, CAST(PI.I_PART_NUM AS NUMBER) AS PARTITION_COUNT, CAST(CASE WHEN PI.I_PART_LEVEL < 2 THEN 0 ELSE PI.I_SUB_PART_NUM END AS NUMBER) AS DEF_SUBPARTITION_COUNT, CAST(PKC.PARTITIONING_KEY_COUNT AS NUMBER) AS PARTITIONING_KEY_COUNT, CAST(PKC.SUBPARTITIONING_KEY_COUNT AS NUMBER) AS SUBPARTITIONING_KEY_COUNT, CAST(CASE WHEN PI.IS_LOCAL = 1 THEN 'LOCAL' ELSE 'GLOBAL' END AS VARCHAR2(6)) AS LOCALITY, CAST(CASE WHEN (PI.IS_LOCAL = 0 or (PI.IS_LOCAL = 1 and LIP.IS_PREFIXED = 1)) THEN 'PREFIXED' ELSE 'NON_PREFIXED' END AS VARCHAR2(12)) AS ALIGNMENT, CAST(PI.TABLESPACE_NAME AS VARCHAR2(30)) AS DEF_TABLESPACE_NAME, CAST(0 AS NUMBER) AS DEF_PCT_FREE, CAST(0 AS NUMBER) AS DEF_INI_TRANS, CAST(0 AS NUMBER) AS DEF_MAX_TRANS, CAST(NULL AS VARCHAR2(40)) AS DEF_INITIAL_EXTENT, CAST(NULL AS VARCHAR2(40)) AS DEF_NEXT_EXTENT, CAST(NULL AS VARCHAR2(40)) AS DEF_MIN_EXTENTS, CAST(NULL AS VARCHAR2(40)) AS DEF_MAX_EXTENTS, CAST(NULL AS VARCHAR2(40)) AS DEF_MAX_SIZE, CAST(NULL AS VARCHAR2(40)) AS DEF_PCT_INCREASE, CAST(0 AS NUMBER) AS DEF_FREELISTS, CAST(0 AS NUMBER) AS DEF_FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS DEF_LOGGING, CAST(NULL AS VARCHAR2(7)) AS DEF_BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS DEF_FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS DEF_CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(1000)) AS DEF_PARAMETERS, CAST(NULL AS VARCHAR2(1000)) AS INTERVAL from PARTITIONED_INDEXES PI join PART_KEY_COUNT PKC on PI.I_ID = PKC.I_ID left join LOCAL_INDEX_PREFIXED LIP on PI.I_ID = LIP.I_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1965,17 +1892,16 @@ int ObInnerTableSchema::user_part_indexes_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_all_tables_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_all_tables_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2006,8 +1932,7 @@ int ObInnerTableSchema::all_all_tables_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(db.database_name AS VARCHAR2(128)) AS OWNER, CAST(t.table_name AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_NAME, CAST(NULL AS VARCHAR2(30)) AS IOT_NAME, CAST('VALID' AS VARCHAR2(8)) AS STATUS, CAST(t."PCTFREE" AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS PCT_USED, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS VARCHAR2(1)) AS BACKED_UP, CAST(info.row_count AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS BLOCKS, CAST(NULL AS NUMBER) AS EMPTY_BLOCKS, CAST(NULL AS NUMBER) AS AVG_SPACE, CAST(NULL AS NUMBER) AS CHAIN_CNT, CAST(NULL AS NUMBER) AS AVG_ROW_LEN, CAST(NULL AS NUMBER) AS AVG_SPACE_FREELIST_BLOCKS, CAST(NULL AS NUMBER) AS NUM_FREELIST_BLOCKS, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(NULL AS VARCHAR2(20)) AS CACHE, CAST(NULL AS VARCHAR2(8)) AS TABLE_LOCK, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST( CASE WHEN t.part_level = 0 THEN 'NO' ELSE 'YES' END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(12)) AS IOT_TYPE, CAST(NULL AS VARCHAR2(16)) AS OBJECT_ID_TYPE, CAST(NULL AS VARCHAR2(128)) AS TABLE_TYPE_OWNER, CAST(NULL AS VARCHAR2(128)) AS TABLE_TYPE, CAST(decode (t.table_type, 8, 'YES', 9, 'YES', 'NO') AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST(NULL AS VARCHAR2(3)) AS NESTED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(8)) AS ROW_MOVEMENT, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST( decode (t.table_type, 8, 'SYS$SESSION', 9, 'SYS$TRANSACTION', NULL) AS VARCHAR2(15)) AS DURATION, CAST(NULL AS VARCHAR2(8)) AS SKIP_CORRUPT, CAST(NULL AS VARCHAR2(3)) AS MONITORING, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_OWNER, CAST(NULL AS VARCHAR2(8)) AS DEPENDENCIES, CAST(NULL AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS VARCHAR2(12)) AS COMPRESS_FOR, CAST( CASE WHEN db.database_name = '__recyclebin' THEN 'YES' ELSE 'NO' END AS VARCHAR2(3)) AS DROPPED, CAST(NULL AS VARCHAR2(3)) AS READ_ONLY, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED, CAST(NULL AS VARCHAR2(7)) AS RESULT_CACHE FROM ( SELECT tenant_id, table_id, SUM(row_count) AS row_count FROM sys.ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT p WHERE p.role = 1 AND P.TENANT_ID = EFFECTIVE_TENANT_ID() GROUP BY tenant_id, table_id ) info RIGHT JOIN sys.ALL_VIRTUAL_TABLE_REAL_AGENT t ON t.tenant_id = info.tenant_id AND t.table_id = info.table_id AND T.TENANT_ID = EFFECTIVE_TENANT_ID(), sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db WHERE db.tenant_id = t.tenant_id AND db.database_id = t.database_id AND db.database_name != '__recyclebin' AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND t.table_type != 5 AND (t.database_id = USERENV('SCHEMAID') or user_can_access_obj(1, t.table_id, t.database_id) =1 ) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(db.database_name AS VARCHAR2(128)) AS OWNER, CAST(t.table_name AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_NAME, CAST(NULL AS VARCHAR2(30)) AS IOT_NAME, CAST('VALID' AS VARCHAR2(8)) AS STATUS, CAST(t."PCTFREE" AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS PCT_USED, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS VARCHAR2(1)) AS BACKED_UP, CAST(info.row_count AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS BLOCKS, CAST(NULL AS NUMBER) AS EMPTY_BLOCKS, CAST(NULL AS NUMBER) AS AVG_SPACE, CAST(NULL AS NUMBER) AS CHAIN_CNT, CAST(NULL AS NUMBER) AS AVG_ROW_LEN, CAST(NULL AS NUMBER) AS AVG_SPACE_FREELIST_BLOCKS, CAST(NULL AS NUMBER) AS NUM_FREELIST_BLOCKS, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(NULL AS VARCHAR2(20)) AS CACHE, CAST(NULL AS VARCHAR2(8)) AS TABLE_LOCK, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST( CASE WHEN t.part_level = 0 THEN 'NO' ELSE 'YES' END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(12)) AS IOT_TYPE, CAST(NULL AS VARCHAR2(16)) AS OBJECT_ID_TYPE, CAST(NULL AS VARCHAR2(128)) AS TABLE_TYPE_OWNER, CAST(NULL AS VARCHAR2(128)) AS TABLE_TYPE, CAST(decode (t.table_type, 8, 'YES', 9, 'YES', 'NO') AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST(NULL AS VARCHAR2(3)) AS NESTED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(8)) AS ROW_MOVEMENT, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST( decode (t.table_type, 8, 'SYS$SESSION', 9, 'SYS$TRANSACTION', NULL) AS VARCHAR2(15)) AS DURATION, CAST(NULL AS VARCHAR2(8)) AS SKIP_CORRUPT, CAST(NULL AS VARCHAR2(3)) AS MONITORING, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_OWNER, CAST(NULL AS VARCHAR2(8)) AS DEPENDENCIES, CAST(NULL AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS VARCHAR2(12)) AS COMPRESS_FOR, CAST( CASE WHEN db.database_name = '__recyclebin' THEN 'YES' ELSE 'NO' END AS VARCHAR2(3)) AS DROPPED, CAST(NULL AS VARCHAR2(3)) AS READ_ONLY, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED, CAST(NULL AS VARCHAR2(7)) AS RESULT_CACHE FROM ( SELECT tenant_id, table_id, SUM(row_count) AS row_count FROM sys.ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT p WHERE p.role = 1 AND P.TENANT_ID = EFFECTIVE_TENANT_ID() GROUP BY tenant_id, table_id ) info RIGHT JOIN sys.ALL_VIRTUAL_TABLE_REAL_AGENT t ON t.tenant_id = info.tenant_id AND t.table_id = info.table_id AND T.TENANT_ID = EFFECTIVE_TENANT_ID(), sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db WHERE db.tenant_id = t.tenant_id AND db.database_id = t.database_id AND db.database_name != '__recyclebin' AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND t.table_type != 5 AND (t.database_id = USERENV('SCHEMAID') or user_can_access_obj(1, t.table_id, t.database_id) =1 ) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2019,17 +1944,16 @@ int ObInnerTableSchema::all_all_tables_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_all_tables_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_all_tables_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2060,8 +1984,7 @@ int ObInnerTableSchema::dba_all_tables_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(db.database_name AS VARCHAR2(128)) AS OWNER, CAST(t.table_name AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_NAME, CAST(NULL AS VARCHAR2(30)) AS IOT_NAME, CAST('VALID' AS VARCHAR2(8)) AS STATUS, CAST(t."PCTFREE" AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS PCT_USED, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS VARCHAR2(1)) AS BACKED_UP, CAST(info.row_count AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS BLOCKS, CAST(NULL AS NUMBER) AS EMPTY_BLOCKS, CAST(NULL AS NUMBER) AS AVG_SPACE, CAST(NULL AS NUMBER) AS CHAIN_CNT, CAST(NULL AS NUMBER) AS AVG_ROW_LEN, CAST(NULL AS NUMBER) AS AVG_SPACE_FREELIST_BLOCKS, CAST(NULL AS NUMBER) AS NUM_FREELIST_BLOCKS, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(NULL AS VARCHAR2(20)) AS CACHE, CAST(NULL AS VARCHAR2(8)) AS TABLE_LOCK, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST( CASE WHEN t.part_level = 0 THEN 'NO' ELSE 'YES' END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(12)) AS IOT_TYPE, CAST(NULL AS VARCHAR2(16)) AS OBJECT_ID_TYPE, CAST(NULL AS VARCHAR2(128)) AS TABLE_TYPE_OWNER, CAST(NULL AS VARCHAR2(128)) AS TABLE_TYPE, CAST(decode (t.table_type, 8, 'YES', 9, 'YES', 'NO') AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST(NULL AS VARCHAR2(3)) AS NESTED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(8)) AS ROW_MOVEMENT, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST( decode (t.table_type, 8, 'SYS$SESSION', 9, 'SYS$TRANSACTION', NULL) AS VARCHAR2(15)) AS DURATION, CAST(NULL AS VARCHAR2(8)) AS SKIP_CORRUPT, CAST(NULL AS VARCHAR2(3)) AS MONITORING, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_OWNER, CAST(NULL AS VARCHAR2(8)) AS DEPENDENCIES, CAST(NULL AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS VARCHAR2(12)) AS COMPRESS_FOR, CAST( CASE WHEN db.database_name = '__recyclebin' THEN 'YES' ELSE 'NO' END AS VARCHAR2(3)) AS DROPPED, CAST(NULL AS VARCHAR2(3)) AS READ_ONLY, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED, CAST(NULL AS VARCHAR2(7)) AS RESULT_CACHE FROM ( SELECT tenant_id, table_id, SUM(row_count) AS row_count FROM sys.ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT p WHERE p.role = 1 AND P.TENANT_ID = EFFECTIVE_TENANT_ID() GROUP BY tenant_id, table_id ) info RIGHT JOIN sys.ALL_VIRTUAL_TABLE_REAL_AGENT t ON t.tenant_id = info.tenant_id AND t.table_id = info.table_id AND T.TENANT_ID = EFFECTIVE_TENANT_ID(), sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db WHERE db.tenant_id = t.tenant_id AND db.database_id = t.database_id AND db.database_name != '__recyclebin' AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND t.table_type != 5 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(db.database_name AS VARCHAR2(128)) AS OWNER, CAST(t.table_name AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_NAME, CAST(NULL AS VARCHAR2(30)) AS IOT_NAME, CAST('VALID' AS VARCHAR2(8)) AS STATUS, CAST(t."PCTFREE" AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS PCT_USED, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS VARCHAR2(1)) AS BACKED_UP, CAST(info.row_count AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS BLOCKS, CAST(NULL AS NUMBER) AS EMPTY_BLOCKS, CAST(NULL AS NUMBER) AS AVG_SPACE, CAST(NULL AS NUMBER) AS CHAIN_CNT, CAST(NULL AS NUMBER) AS AVG_ROW_LEN, CAST(NULL AS NUMBER) AS AVG_SPACE_FREELIST_BLOCKS, CAST(NULL AS NUMBER) AS NUM_FREELIST_BLOCKS, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(NULL AS VARCHAR2(20)) AS CACHE, CAST(NULL AS VARCHAR2(8)) AS TABLE_LOCK, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST( CASE WHEN t.part_level = 0 THEN 'NO' ELSE 'YES' END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(12)) AS IOT_TYPE, CAST(NULL AS VARCHAR2(16)) AS OBJECT_ID_TYPE, CAST(NULL AS VARCHAR2(128)) AS TABLE_TYPE_OWNER, CAST(NULL AS VARCHAR2(128)) AS TABLE_TYPE, CAST(decode (t.table_type, 8, 'YES', 9, 'YES', 'NO') AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST(NULL AS VARCHAR2(3)) AS NESTED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(8)) AS ROW_MOVEMENT, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST( decode (t.table_type, 8, 'SYS$SESSION', 9, 'SYS$TRANSACTION', NULL) AS VARCHAR2(15)) AS DURATION, CAST(NULL AS VARCHAR2(8)) AS SKIP_CORRUPT, CAST(NULL AS VARCHAR2(3)) AS MONITORING, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_OWNER, CAST(NULL AS VARCHAR2(8)) AS DEPENDENCIES, CAST(NULL AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS VARCHAR2(12)) AS COMPRESS_FOR, CAST( CASE WHEN db.database_name = '__recyclebin' THEN 'YES' ELSE 'NO' END AS VARCHAR2(3)) AS DROPPED, CAST(NULL AS VARCHAR2(3)) AS READ_ONLY, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED, CAST(NULL AS VARCHAR2(7)) AS RESULT_CACHE FROM ( SELECT tenant_id, table_id, SUM(row_count) AS row_count FROM sys.ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT p WHERE p.role = 1 AND P.TENANT_ID = EFFECTIVE_TENANT_ID() GROUP BY tenant_id, table_id ) info RIGHT JOIN sys.ALL_VIRTUAL_TABLE_REAL_AGENT t ON t.tenant_id = info.tenant_id AND t.table_id = info.table_id AND T.TENANT_ID = EFFECTIVE_TENANT_ID(), sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db WHERE db.tenant_id = t.tenant_id AND db.database_id = t.database_id AND db.database_name != '__recyclebin' AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND t.table_type != 5 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2073,17 +1996,16 @@ int ObInnerTableSchema::dba_all_tables_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_all_tables_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_all_tables_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2114,8 +2036,7 @@ int ObInnerTableSchema::user_all_tables_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(t.table_name AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_NAME, CAST(NULL AS VARCHAR2(30)) AS IOT_NAME, CAST('VALID' AS VARCHAR2(8)) AS STATUS, CAST(t."PCTFREE" AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS PCT_USED, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS VARCHAR2(1)) AS BACKED_UP, CAST(info.row_count AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS BLOCKS, CAST(NULL AS NUMBER) AS EMPTY_BLOCKS, CAST(NULL AS NUMBER) AS AVG_SPACE, CAST(NULL AS NUMBER) AS CHAIN_CNT, CAST(NULL AS NUMBER) AS AVG_ROW_LEN, CAST(NULL AS NUMBER) AS AVG_SPACE_FREELIST_BLOCKS, CAST(NULL AS NUMBER) AS NUM_FREELIST_BLOCKS, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(NULL AS VARCHAR2(20)) AS CACHE, CAST(NULL AS VARCHAR2(8)) AS TABLE_LOCK, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST( CASE WHEN t.part_level = 0 THEN 'NO' ELSE 'YES' END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(12)) AS IOT_TYPE, CAST(NULL AS VARCHAR2(16)) AS OBJECT_ID_TYPE, CAST(NULL AS VARCHAR2(128)) AS TABLE_TYPE_OWNER, CAST(NULL AS VARCHAR2(128)) AS TABLE_TYPE, CAST(decode (t.table_type, 8, 'YES', 9, 'YES', 'NO') AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST(NULL AS VARCHAR2(3)) AS NESTED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(8)) AS ROW_MOVEMENT, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST( decode (t.table_type, 8, 'SYS$SESSION', 9, 'SYS$TRANSACTION', NULL) AS VARCHAR2(15)) AS DURATION, CAST(NULL AS VARCHAR2(8)) AS SKIP_CORRUPT, CAST(NULL AS VARCHAR2(3)) AS MONITORING, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_OWNER, CAST(NULL AS VARCHAR2(8)) AS DEPENDENCIES, CAST(NULL AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS VARCHAR2(12)) AS COMPRESS_FOR, CAST( CASE WHEN db.database_name = '__recyclebin' THEN 'YES' ELSE 'NO' END AS VARCHAR2(3)) AS DROPPED, CAST(NULL AS VARCHAR2(3)) AS READ_ONLY, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED, CAST(NULL AS VARCHAR2(7)) AS RESULT_CACHE FROM ( SELECT tenant_id, table_id, SUM(row_count) AS row_count FROM sys.ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT p WHERE p.role = 1 AND P.TENANT_ID = EFFECTIVE_TENANT_ID() GROUP BY tenant_id, table_id ) info RIGHT JOIN sys.ALL_VIRTUAL_TABLE_REAL_AGENT t ON t.tenant_id = info.tenant_id AND t.table_id = info.table_id AND T.TENANT_ID = EFFECTIVE_TENANT_ID(), sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db WHERE db.tenant_id = t.tenant_id AND db.database_id = t.database_id AND t.database_id = USERENV('SCHEMAID') AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND t.table_type != 5 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(t.table_name AS VARCHAR2(128)) AS TABLE_NAME, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_NAME, CAST(NULL AS VARCHAR2(30)) AS IOT_NAME, CAST('VALID' AS VARCHAR2(8)) AS STATUS, CAST(t."PCTFREE" AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS PCT_USED, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENTS, CAST(NULL AS NUMBER) AS MAX_EXTENTS, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(3)) AS LOGGING, CAST(NULL AS VARCHAR2(1)) AS BACKED_UP, CAST(info.row_count AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS BLOCKS, CAST(NULL AS NUMBER) AS EMPTY_BLOCKS, CAST(NULL AS NUMBER) AS AVG_SPACE, CAST(NULL AS NUMBER) AS CHAIN_CNT, CAST(NULL AS NUMBER) AS AVG_ROW_LEN, CAST(NULL AS NUMBER) AS AVG_SPACE_FREELIST_BLOCKS, CAST(NULL AS NUMBER) AS NUM_FREELIST_BLOCKS, CAST(NULL AS VARCHAR2(40)) AS DEGREE, CAST(NULL AS VARCHAR2(40)) AS INSTANCES, CAST(NULL AS VARCHAR2(20)) AS CACHE, CAST(NULL AS VARCHAR2(8)) AS TABLE_LOCK, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST( CASE WHEN t.part_level = 0 THEN 'NO' ELSE 'YES' END AS VARCHAR2(3)) AS PARTITIONED, CAST(NULL AS VARCHAR2(12)) AS IOT_TYPE, CAST(NULL AS VARCHAR2(16)) AS OBJECT_ID_TYPE, CAST(NULL AS VARCHAR2(128)) AS TABLE_TYPE_OWNER, CAST(NULL AS VARCHAR2(128)) AS TABLE_TYPE, CAST(decode (t.table_type, 8, 'YES', 9, 'YES', 'NO') AS VARCHAR2(1)) AS TEMPORARY, CAST(NULL AS VARCHAR2(1)) AS SECONDARY, CAST(NULL AS VARCHAR2(3)) AS NESTED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(8)) AS ROW_MOVEMENT, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST( decode (t.table_type, 8, 'SYS$SESSION', 9, 'SYS$TRANSACTION', NULL) AS VARCHAR2(15)) AS DURATION, CAST(NULL AS VARCHAR2(8)) AS SKIP_CORRUPT, CAST(NULL AS VARCHAR2(3)) AS MONITORING, CAST(NULL AS VARCHAR2(30)) AS CLUSTER_OWNER, CAST(NULL AS VARCHAR2(8)) AS DEPENDENCIES, CAST(NULL AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS VARCHAR2(12)) AS COMPRESS_FOR, CAST( CASE WHEN db.database_name = '__recyclebin' THEN 'YES' ELSE 'NO' END AS VARCHAR2(3)) AS DROPPED, CAST(NULL AS VARCHAR2(3)) AS READ_ONLY, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED, CAST(NULL AS VARCHAR2(7)) AS RESULT_CACHE FROM ( SELECT tenant_id, table_id, SUM(row_count) AS row_count FROM sys.ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT p WHERE p.role = 1 AND P.TENANT_ID = EFFECTIVE_TENANT_ID() GROUP BY tenant_id, table_id ) info RIGHT JOIN sys.ALL_VIRTUAL_TABLE_REAL_AGENT t ON t.tenant_id = info.tenant_id AND t.table_id = info.table_id AND T.TENANT_ID = EFFECTIVE_TENANT_ID(), sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db WHERE db.tenant_id = t.tenant_id AND db.database_id = t.database_id AND t.database_id = USERENV('SCHEMAID') AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND t.table_type != 5 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2127,17 +2048,16 @@ int ObInnerTableSchema::user_all_tables_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_profiles_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_profiles_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2168,8 +2088,7 @@ int ObInnerTableSchema::dba_profiles_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT PROFILE, RESOURCE_NAME, RESOURCE_TYPE, LIMIT FROM (SELECT PROFILE_NAME AS PROFILE, CAST('FAILED_LOGIN_ATTEMPTS' AS VARCHAR2(32)) AS RESOURCE_NAME, CAST('PASSWORD' AS VARCHAR2(8)) AS RESOURCE_TYPE, CAST(DECODE(FAILED_LOGIN_ATTEMPTS, -1, 'UNLIMITED', 9223372036854775807, 'UNLIMITED', 10, 'DEFAULT', FAILED_LOGIN_ATTEMPTS) AS VARCHAR2(128)) AS LIMIT FROM sys.ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT UNION ALL SELECT PROFILE_NAME AS PROFILE, CAST('PASSWORD_LOCK_TIME' AS VARCHAR2(32)) AS RESOURCE_NAME, CAST('PASSWORD' AS VARCHAR2(8)) AS RESOURCE_TYPE, CAST(DECODE(PASSWORD_LOCK_TIME, -1, 'UNLIMITED', 9223372036854775807, 'UNLIMITED', 86400000000, 'DEFAULT', PASSWORD_LOCK_TIME) AS VARCHAR2(128)) AS LIMIT FROM sys.ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT UNION ALL SELECT PROFILE_NAME AS PROFILE, CAST('PASSWORD_VERIFY_FUNCTION' AS VARCHAR2(32)) AS RESOURCE_NAME, CAST('PASSWORD' AS VARCHAR2(8)) AS RESOURCE_TYPE, CAST(DECODE(PASSWORD_VERIFY_FUNCTION, NULL, 'NULL', PASSWORD_VERIFY_FUNCTION) AS VARCHAR2(128)) AS LIMIT FROM sys.ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT UNION ALL SELECT PROFILE_NAME AS PROFILE, CAST('PASSWORD_LIFE_TIME' AS VARCHAR2(32)) AS RESOURCE_NAME, CAST('PASSWORD' AS VARCHAR2(8)) AS RESOURCE_TYPE, CAST(DECODE(PASSWORD_LIFE_TIME, -1, 'UNLIMITED', 9223372036854775807, 'UNLIMITED', 15552000000000, 'DEFAULT', PASSWORD_LIFE_TIME) AS VARCHAR2(128)) AS LIMIT FROM sys.ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT UNION ALL SELECT PROFILE_NAME AS PROFILE, CAST('PASSWORD_GRACE_TIME' AS VARCHAR2(32)) AS RESOURCE_NAME, CAST('PASSWORD' AS VARCHAR2(8)) AS RESOURCE_TYPE, CAST(DECODE(PASSWORD_GRACE_TIME, -1, 'UNLIMITED', 9223372036854775807, 'UNLIMITED', 604800000000, 'DEFAULT', PASSWORD_GRACE_TIME) AS VARCHAR2(128)) AS LIMIT FROM sys.ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT) ORDER BY PROFILE, RESOURCE_NAME )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT PROFILE, RESOURCE_NAME, RESOURCE_TYPE, LIMIT FROM (SELECT PROFILE_NAME AS PROFILE, CAST('FAILED_LOGIN_ATTEMPTS' AS VARCHAR2(32)) AS RESOURCE_NAME, CAST('PASSWORD' AS VARCHAR2(8)) AS RESOURCE_TYPE, CAST(DECODE(FAILED_LOGIN_ATTEMPTS, -1, 'UNLIMITED', 9223372036854775807, 'UNLIMITED', 10, 'DEFAULT', FAILED_LOGIN_ATTEMPTS) AS VARCHAR2(128)) AS LIMIT FROM sys.ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT UNION ALL SELECT PROFILE_NAME AS PROFILE, CAST('PASSWORD_LOCK_TIME' AS VARCHAR2(32)) AS RESOURCE_NAME, CAST('PASSWORD' AS VARCHAR2(8)) AS RESOURCE_TYPE, CAST(DECODE(PASSWORD_LOCK_TIME, -1, 'UNLIMITED', 9223372036854775807, 'UNLIMITED', 86400000000, 'DEFAULT', PASSWORD_LOCK_TIME) AS VARCHAR2(128)) AS LIMIT FROM sys.ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT UNION ALL SELECT PROFILE_NAME AS PROFILE, CAST('PASSWORD_VERIFY_FUNCTION' AS VARCHAR2(32)) AS RESOURCE_NAME, CAST('PASSWORD' AS VARCHAR2(8)) AS RESOURCE_TYPE, CAST(DECODE(PASSWORD_VERIFY_FUNCTION, NULL, 'NULL', PASSWORD_VERIFY_FUNCTION) AS VARCHAR2(128)) AS LIMIT FROM sys.ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT UNION ALL SELECT PROFILE_NAME AS PROFILE, CAST('PASSWORD_LIFE_TIME' AS VARCHAR2(32)) AS RESOURCE_NAME, CAST('PASSWORD' AS VARCHAR2(8)) AS RESOURCE_TYPE, CAST(DECODE(PASSWORD_LIFE_TIME, -1, 'UNLIMITED', 9223372036854775807, 'UNLIMITED', 15552000000000, 'DEFAULT', PASSWORD_LIFE_TIME) AS VARCHAR2(128)) AS LIMIT FROM sys.ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT UNION ALL SELECT PROFILE_NAME AS PROFILE, CAST('PASSWORD_GRACE_TIME' AS VARCHAR2(32)) AS RESOURCE_NAME, CAST('PASSWORD' AS VARCHAR2(8)) AS RESOURCE_TYPE, CAST(DECODE(PASSWORD_GRACE_TIME, -1, 'UNLIMITED', 9223372036854775807, 'UNLIMITED', 604800000000, 'DEFAULT', PASSWORD_GRACE_TIME) AS VARCHAR2(128)) AS LIMIT FROM sys.ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT) ORDER BY PROFILE, RESOURCE_NAME )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2181,17 +2100,16 @@ int ObInnerTableSchema::dba_profiles_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_profiles_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_profiles_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2222,8 +2140,7 @@ int ObInnerTableSchema::user_profiles_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(t.profile_name AS VARCHAR2(30)) AS PROFILE, CAST(NULL AS VARCHAR2(32)) AS RESOURCE_NAME, CAST(NULL AS VARCHAR2(8)) AS RESOURCE_TYPE, CAST(NULL AS VARCHAR2(40)) AS LIMIT_ON_RESOURCE FROM SYS.ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT t WHERE T.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(t.profile_name AS VARCHAR2(30)) AS PROFILE, CAST(NULL AS VARCHAR2(32)) AS RESOURCE_NAME, CAST(NULL AS VARCHAR2(8)) AS RESOURCE_TYPE, CAST(NULL AS VARCHAR2(40)) AS LIMIT_ON_RESOURCE FROM SYS.ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT t WHERE T.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2235,17 +2152,16 @@ int ObInnerTableSchema::user_profiles_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_profiles_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_profiles_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2276,8 +2192,7 @@ int ObInnerTableSchema::all_profiles_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(t.profile_name AS VARCHAR2(30)) AS PROFILE, CAST(NULL AS VARCHAR2(32)) AS RESOURCE_NAME, CAST(NULL AS VARCHAR2(8)) AS RESOURCE_TYPE, CAST(NULL AS VARCHAR2(40)) AS LIMIT_ON_RESOURCE FROM SYS.ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT t WHERE T.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(t.profile_name AS VARCHAR2(30)) AS PROFILE, CAST(NULL AS VARCHAR2(32)) AS RESOURCE_NAME, CAST(NULL AS VARCHAR2(8)) AS RESOURCE_TYPE, CAST(NULL AS VARCHAR2(40)) AS LIMIT_ON_RESOURCE FROM SYS.ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT t WHERE T.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2289,17 +2204,16 @@ int ObInnerTableSchema::all_profiles_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_mview_comments_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_mview_comments_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2330,8 +2244,7 @@ int ObInnerTableSchema::all_mview_comments_ora_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT db.DATABASE_NAME AS OWNER, CAST(t.TABLE_NAME AS VARCHAR2(128)) AS MVIEW_NAME, CAST(t."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT db, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT t WHERE db.DATABASE_ID = t.DATABASE_ID AND t.TABLE_TYPE = 7 AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT db.DATABASE_NAME AS OWNER, CAST(t.TABLE_NAME AS VARCHAR2(128)) AS MVIEW_NAME, CAST(t."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT db, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT t WHERE db.DATABASE_ID = t.DATABASE_ID AND t.TABLE_TYPE = 7 AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2343,17 +2256,16 @@ int ObInnerTableSchema::all_mview_comments_ora_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_mview_comments_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_mview_comments_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2384,8 +2296,7 @@ int ObInnerTableSchema::user_mview_comments_ora_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT db.DATABASE_NAME AS OWNER, CAST(t.TABLE_NAME AS VARCHAR2(128)) AS MVIEW_NAME, CAST(t."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT db, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT t WHERE db.DATABASE_ID = t.DATABASE_ID AND t.TABLE_TYPE = 7 AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND db.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT db.DATABASE_NAME AS OWNER, CAST(t.TABLE_NAME AS VARCHAR2(128)) AS MVIEW_NAME, CAST(t."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT db, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT t WHERE db.DATABASE_ID = t.DATABASE_ID AND t.TABLE_TYPE = 7 AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND db.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2397,17 +2308,16 @@ int ObInnerTableSchema::user_mview_comments_ora_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_mview_comments_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_mview_comments_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2438,8 +2348,7 @@ int ObInnerTableSchema::dba_mview_comments_ora_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT db.DATABASE_NAME AS OWNER, CAST(t.TABLE_NAME AS VARCHAR2(128)) AS MVIEW_NAME, CAST(t."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT db, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT t WHERE db.DATABASE_ID = t.DATABASE_ID AND t.TABLE_TYPE = 7 AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT db.DATABASE_NAME AS OWNER, CAST(t.TABLE_NAME AS VARCHAR2(128)) AS MVIEW_NAME, CAST(t."COMMENT" AS VARCHAR(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT db, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT t WHERE db.DATABASE_ID = t.DATABASE_ID AND t.TABLE_TYPE = 7 AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2451,17 +2360,16 @@ int ObInnerTableSchema::dba_mview_comments_ora_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_scheduler_program_args_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_scheduler_program_args_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2492,8 +2400,7 @@ int ObInnerTableSchema::all_scheduler_program_args_ora_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS OWNER, CAST(NULL AS VARCHAR2(30)) AS PROGRAM_NAME, CAST(NULL AS VARCHAR2(30)) AS ARGUMENT_NAME, CAST(NULL AS NUMBER) AS ARGUMENT_POSITION, CAST(NULL AS VARCHAR2(61)) AS ARGUMENT_TYPE, CAST(NULL AS VARCHAR2(19)) AS METADATA_ATTRIBUTE, CAST(NULL AS VARCHAR2(4000)) AS DEFAULT_VALUE, CAST(NULL as /* TODO: RAW */ VARCHAR(128)) AS DEFAULT_ANYDATA_VALUE, CAST(NULL AS VARCHAR2(5)) AS OUT_ARGUMENT FROM DUAL WHERE 1 = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS OWNER, CAST(NULL AS VARCHAR2(30)) AS PROGRAM_NAME, CAST(NULL AS VARCHAR2(30)) AS ARGUMENT_NAME, CAST(NULL AS NUMBER) AS ARGUMENT_POSITION, CAST(NULL AS VARCHAR2(61)) AS ARGUMENT_TYPE, CAST(NULL AS VARCHAR2(19)) AS METADATA_ATTRIBUTE, CAST(NULL AS VARCHAR2(4000)) AS DEFAULT_VALUE, CAST(NULL as /* TODO: RAW */ VARCHAR(128)) AS DEFAULT_ANYDATA_VALUE, CAST(NULL AS VARCHAR2(5)) AS OUT_ARGUMENT FROM DUAL WHERE 1 = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2505,17 +2412,16 @@ int ObInnerTableSchema::all_scheduler_program_args_ora_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_scheduler_program_args_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_scheduler_program_args_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2546,8 +2452,7 @@ int ObInnerTableSchema::dba_scheduler_program_args_ora_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS OWNER, CAST(NULL AS VARCHAR2(30)) AS PROGRAM_NAME, CAST(NULL AS VARCHAR2(30)) AS ARGUMENT_NAME, CAST(NULL AS NUMBER) AS ARGUMENT_POSITION, CAST(NULL AS VARCHAR2(61)) AS ARGUMENT_TYPE, CAST(NULL AS VARCHAR2(19)) AS METADATA_ATTRIBUTE, CAST(NULL AS VARCHAR2(4000)) AS DEFAULT_VALUE, CAST(NULL as /* TODO: RAW */ VARCHAR(128)) AS DEFAULT_ANYDATA_VALUE, CAST(NULL AS VARCHAR2(5)) AS OUT_ARGUMENT FROM DUAL WHERE 1 = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS OWNER, CAST(NULL AS VARCHAR2(30)) AS PROGRAM_NAME, CAST(NULL AS VARCHAR2(30)) AS ARGUMENT_NAME, CAST(NULL AS NUMBER) AS ARGUMENT_POSITION, CAST(NULL AS VARCHAR2(61)) AS ARGUMENT_TYPE, CAST(NULL AS VARCHAR2(19)) AS METADATA_ATTRIBUTE, CAST(NULL AS VARCHAR2(4000)) AS DEFAULT_VALUE, CAST(NULL as /* TODO: RAW */ VARCHAR(128)) AS DEFAULT_ANYDATA_VALUE, CAST(NULL AS VARCHAR2(5)) AS OUT_ARGUMENT FROM DUAL WHERE 1 = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2559,17 +2464,16 @@ int ObInnerTableSchema::dba_scheduler_program_args_ora_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_scheduler_program_args_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_scheduler_program_args_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2600,8 +2504,7 @@ int ObInnerTableSchema::user_scheduler_program_args_ora_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS PROGRAM_NAME, CAST(NULL AS VARCHAR2(30)) AS ARGUMENT_NAME, CAST(NULL AS NUMBER) AS ARGUMENT_POSITION, CAST(NULL AS VARCHAR2(61)) AS ARGUMENT_TYPE, CAST(NULL AS VARCHAR2(19)) AS METADATA_ATTRIBUTE, CAST(NULL AS VARCHAR2(4000)) AS DEFAULT_VALUE, CAST(NULL as /* TODO: RAW */ VARCHAR(128)) AS DEFAULT_ANYDATA_VALUE, CAST(NULL AS VARCHAR2(5)) AS OUT_ARGUMENT FROM DUAL WHERE 1 = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS PROGRAM_NAME, CAST(NULL AS VARCHAR2(30)) AS ARGUMENT_NAME, CAST(NULL AS NUMBER) AS ARGUMENT_POSITION, CAST(NULL AS VARCHAR2(61)) AS ARGUMENT_TYPE, CAST(NULL AS VARCHAR2(19)) AS METADATA_ATTRIBUTE, CAST(NULL AS VARCHAR2(4000)) AS DEFAULT_VALUE, CAST(NULL as /* TODO: RAW */ VARCHAR(128)) AS DEFAULT_ANYDATA_VALUE, CAST(NULL AS VARCHAR2(5)) AS OUT_ARGUMENT FROM DUAL WHERE 1 = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2613,17 +2516,16 @@ int ObInnerTableSchema::user_scheduler_program_args_ora_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_scheduler_job_args_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_scheduler_job_args_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2654,8 +2556,7 @@ int ObInnerTableSchema::all_scheduler_job_args_ora_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS OWNER, CAST(NULL AS VARCHAR2(30)) AS JOB_NAME, CAST(NULL AS VARCHAR2(30)) AS ARGUMENT_NAME, CAST(NULL AS NUMBER) AS ARGUMENT_POSITION, CAST(NULL AS VARCHAR2(61)) AS ARGUMENT_TYPE, CAST(NULL AS VARCHAR2(4000)) AS VALUE, CAST(NULL as /* TODO: RAW */ VARCHAR(128)) AS DEFAULT_ANYDATA_VALUE, CAST(NULL AS VARCHAR2(5)) AS OUT_ARGUMENT FROM DUAL WHERE 1 = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS OWNER, CAST(NULL AS VARCHAR2(30)) AS JOB_NAME, CAST(NULL AS VARCHAR2(30)) AS ARGUMENT_NAME, CAST(NULL AS NUMBER) AS ARGUMENT_POSITION, CAST(NULL AS VARCHAR2(61)) AS ARGUMENT_TYPE, CAST(NULL AS VARCHAR2(4000)) AS VALUE, CAST(NULL as /* TODO: RAW */ VARCHAR(128)) AS DEFAULT_ANYDATA_VALUE, CAST(NULL AS VARCHAR2(5)) AS OUT_ARGUMENT FROM DUAL WHERE 1 = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2667,17 +2568,16 @@ int ObInnerTableSchema::all_scheduler_job_args_ora_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_scheduler_job_args_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_scheduler_job_args_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2708,8 +2608,7 @@ int ObInnerTableSchema::dba_scheduler_job_args_ora_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS OWNER, CAST(NULL AS VARCHAR2(30)) AS JOB_NAME, CAST(NULL AS VARCHAR2(30)) AS ARGUMENT_NAME, CAST(NULL AS NUMBER) AS ARGUMENT_POSITION, CAST(NULL AS VARCHAR2(61)) AS ARGUMENT_TYPE, CAST(NULL AS VARCHAR2(4000)) AS VALUE, CAST(NULL as /* TODO: RAW */ VARCHAR(128)) AS DEFAULT_ANYDATA_VALUE, CAST(NULL AS VARCHAR2(5)) AS OUT_ARGUMENT FROM DUAL WHERE 1 = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS OWNER, CAST(NULL AS VARCHAR2(30)) AS JOB_NAME, CAST(NULL AS VARCHAR2(30)) AS ARGUMENT_NAME, CAST(NULL AS NUMBER) AS ARGUMENT_POSITION, CAST(NULL AS VARCHAR2(61)) AS ARGUMENT_TYPE, CAST(NULL AS VARCHAR2(4000)) AS VALUE, CAST(NULL as /* TODO: RAW */ VARCHAR(128)) AS DEFAULT_ANYDATA_VALUE, CAST(NULL AS VARCHAR2(5)) AS OUT_ARGUMENT FROM DUAL WHERE 1 = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2721,10 +2620,10 @@ int ObInnerTableSchema::dba_scheduler_job_args_ora_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.25101_25150.cpp b/src/share/inner_table/ob_inner_table_schema.25101_25150.cpp index 40017a0f2..2d6c4fa3d 100644 --- a/src/share/inner_table/ob_inner_table_schema.25101_25150.cpp +++ b/src/share/inner_table/ob_inner_table_schema.25101_25150.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::user_scheduler_job_args_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_scheduler_job_args_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -58,8 +60,7 @@ int ObInnerTableSchema::user_scheduler_job_args_ora_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS JOB_NAME, CAST(NULL AS VARCHAR2(30)) AS ARGUMENT_NAME, CAST(NULL AS NUMBER) AS ARGUMENT_POSITION, CAST(NULL AS VARCHAR2(61)) AS ARGUMENT_TYPE, CAST(NULL AS VARCHAR2(4000)) AS VALUE, CAST(NULL as /* TODO: RAW */ VARCHAR(128)) AS DEFAULT_ANYDATA_VALUE, CAST(NULL AS VARCHAR2(5)) AS OUT_ARGUMENT FROM DUAL WHERE 1 = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS JOB_NAME, CAST(NULL AS VARCHAR2(30)) AS ARGUMENT_NAME, CAST(NULL AS NUMBER) AS ARGUMENT_POSITION, CAST(NULL AS VARCHAR2(61)) AS ARGUMENT_TYPE, CAST(NULL AS VARCHAR2(4000)) AS VALUE, CAST(NULL as /* TODO: RAW */ VARCHAR(128)) AS DEFAULT_ANYDATA_VALUE, CAST(NULL AS VARCHAR2(5)) AS OUT_ARGUMENT FROM DUAL WHERE 1 = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -71,17 +72,16 @@ int ObInnerTableSchema::user_scheduler_job_args_ora_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_errors_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_errors_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -112,8 +112,7 @@ int ObInnerTableSchema::all_errors_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(o.owner AS VARCHAR2(128)) AS OWNER, CAST(o.object_name AS VARCHAR2(128)) AS NAME, CAST(o.object_type AS VARCHAR2(19)) AS TYPE, CAST(e.obj_seq AS NUMBER) AS SEQUENCE, CAST(e.line AS NUMBER) AS LINE, CAST(e.position AS NUMBER) AS POSITION, CAST(e.text as VARCHAR2(4000)) AS TEXT, CAST(DECODE(e.property, 0, 'ERROR', 1, 'WARNING', 'UNDEFINED') AS VARCHAR2(9)) AS ATTRIBUTE, CAST(e.error_number AS NUMBER) AS MESSAGE_NUMBER FROM all_objects o, (select obj_id, obj_seq, line, position, text, property, error_number, CAST( UPPER(decode(obj_type, 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 12, 'PROCEDURE', 'MAXTYPE')) AS VARCHAR2(23)) object_type from sys.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) e WHERE o.object_id = e.obj_id AND o.object_type like e.object_type AND o.object_type IN (UPPER('package'), UPPER('type'), UPPER('procedure'), UPPER('function'), UPPER('package body'), UPPER('view'), UPPER('trigger'), UPPER('type body'), UPPER('library'), UPPER('queue'), UPPER('java source'), UPPER('java class'), UPPER('dimension'), UPPER('assembly'), UPPER('hierarchy'), UPPER('arrtibute dimension'), UPPER('analytic view')) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(o.owner AS VARCHAR2(128)) AS OWNER, CAST(o.object_name AS VARCHAR2(128)) AS NAME, CAST(o.object_type AS VARCHAR2(19)) AS TYPE, CAST(e.obj_seq AS NUMBER) AS SEQUENCE, CAST(e.line AS NUMBER) AS LINE, CAST(e.position AS NUMBER) AS POSITION, CAST(e.text as VARCHAR2(4000)) AS TEXT, CAST(DECODE(e.property, 0, 'ERROR', 1, 'WARNING', 'UNDEFINED') AS VARCHAR2(9)) AS ATTRIBUTE, CAST(e.error_number AS NUMBER) AS MESSAGE_NUMBER FROM all_objects o, (select obj_id, obj_seq, line, position, text, property, error_number, CAST( UPPER(decode(obj_type, 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 12, 'PROCEDURE', 'MAXTYPE')) AS VARCHAR2(23)) object_type from sys.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) e WHERE o.object_id = e.obj_id AND o.object_type like e.object_type AND o.object_type IN (UPPER('package'), UPPER('type'), UPPER('procedure'), UPPER('function'), UPPER('package body'), UPPER('view'), UPPER('trigger'), UPPER('type body'), UPPER('library'), UPPER('queue'), UPPER('java source'), UPPER('java class'), UPPER('dimension'), UPPER('assembly'), UPPER('hierarchy'), UPPER('arrtibute dimension'), UPPER('analytic view')) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -125,17 +124,16 @@ int ObInnerTableSchema::all_errors_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_errors_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_errors_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -166,8 +164,7 @@ int ObInnerTableSchema::dba_errors_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(o.owner AS VARCHAR2(128)) AS OWNER, CAST(o.object_name AS VARCHAR2(128)) AS NAME, CAST(o.object_type AS VARCHAR2(19)) AS TYPE, CAST(e.obj_seq AS NUMBER) AS SEQUENCE, CAST(e.line AS NUMBER) AS LINE, CAST(e.position AS NUMBER) AS POSITION, CAST(e.text as VARCHAR2(4000)) AS TEXT, CAST(DECODE(e.property, 0, 'ERROR', 1, 'WARNING', 'UNDEFINED') AS VARCHAR2(9)) AS ATTRIBUTE, CAST(e.error_number AS NUMBER) AS MESSAGE_NUMBER FROM all_objects o, (select obj_id, obj_seq, line, position, text, property, error_number, CAST( UPPER(decode(obj_type, 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 12, 'PROCEDURE', 'MAXTYPE')) AS VARCHAR2(23)) object_type from sys.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) e WHERE o.object_id = e.obj_id AND o.object_type like e.object_type AND o.object_type IN (UPPER('package'), UPPER('type'), UPPER('procedure'), UPPER('function'), UPPER('package body'), UPPER('view'), UPPER('trigger'), UPPER('type body'), UPPER('library'), UPPER('queue'), UPPER('java source'), UPPER('java class'), UPPER('dimension'), UPPER('assembly'), UPPER('hierarchy'), UPPER('arrtibute dimension'), UPPER('analytic view')) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(o.owner AS VARCHAR2(128)) AS OWNER, CAST(o.object_name AS VARCHAR2(128)) AS NAME, CAST(o.object_type AS VARCHAR2(19)) AS TYPE, CAST(e.obj_seq AS NUMBER) AS SEQUENCE, CAST(e.line AS NUMBER) AS LINE, CAST(e.position AS NUMBER) AS POSITION, CAST(e.text as VARCHAR2(4000)) AS TEXT, CAST(DECODE(e.property, 0, 'ERROR', 1, 'WARNING', 'UNDEFINED') AS VARCHAR2(9)) AS ATTRIBUTE, CAST(e.error_number AS NUMBER) AS MESSAGE_NUMBER FROM all_objects o, (select obj_id, obj_seq, line, position, text, property, error_number, CAST( UPPER(decode(obj_type, 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 12, 'PROCEDURE', 'MAXTYPE')) AS VARCHAR2(23)) object_type from sys.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) e WHERE o.object_id = e.obj_id AND o.object_type like e.object_type AND o.object_type IN (UPPER('package'), UPPER('type'), UPPER('procedure'), UPPER('function'), UPPER('package body'), UPPER('view'), UPPER('trigger'), UPPER('type body'), UPPER('library'), UPPER('queue'), UPPER('java source'), UPPER('java class'), UPPER('dimension'), UPPER('assembly'), UPPER('hierarchy'), UPPER('arrtibute dimension'), UPPER('analytic view')) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -179,17 +176,16 @@ int ObInnerTableSchema::dba_errors_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_errors_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_errors_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -220,8 +216,7 @@ int ObInnerTableSchema::user_errors_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(o.owner AS VARCHAR2(128)) AS OWNER, CAST(o.object_name AS VARCHAR2(128)) AS NAME, CAST(o.object_type AS VARCHAR2(19)) AS TYPE, CAST(e.obj_seq AS NUMBER) AS SEQUENCE, CAST(e.line AS NUMBER) AS LINE, CAST(e.position AS NUMBER) AS POSITION, CAST(e.text as VARCHAR2(4000)) AS TEXT, CAST(DECODE(e.property, 0, 'ERROR', 1, 'WARNING', 'UNDEFINED') AS VARCHAR2(9)) AS ATTRIBUTE, CAST(e.error_number AS NUMBER) AS MESSAGE_NUMBER FROM all_objects o, (select obj_id, obj_seq, line, position, text, property, error_number, CAST( UPPER(decode(obj_type, 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 12, 'PROCEDURE', 'MAXTYPE')) AS VARCHAR2(23)) object_type from sys.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) e, all_users u WHERE o.object_id = e.obj_id AND o.object_type like e.object_type AND o.object_type IN (UPPER('package'), UPPER('type'), UPPER('procedure'), UPPER('function'), UPPER('package body'), UPPER('view'), UPPER('trigger'), UPPER('type body'), UPPER('library'), UPPER('queue'), UPPER('java source'), UPPER('java class'), UPPER('dimension'), UPPER('assembly'), UPPER('hierarchy'), UPPER('arrtibute dimension'), UPPER('analytic view')) AND u.username=o.owner AND u.userid IN (USERENV('SCHEMAID')) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(o.owner AS VARCHAR2(128)) AS OWNER, CAST(o.object_name AS VARCHAR2(128)) AS NAME, CAST(o.object_type AS VARCHAR2(19)) AS TYPE, CAST(e.obj_seq AS NUMBER) AS SEQUENCE, CAST(e.line AS NUMBER) AS LINE, CAST(e.position AS NUMBER) AS POSITION, CAST(e.text as VARCHAR2(4000)) AS TEXT, CAST(DECODE(e.property, 0, 'ERROR', 1, 'WARNING', 'UNDEFINED') AS VARCHAR2(9)) AS ATTRIBUTE, CAST(e.error_number AS NUMBER) AS MESSAGE_NUMBER FROM all_objects o, (select obj_id, obj_seq, line, position, text, property, error_number, CAST( UPPER(decode(obj_type, 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 12, 'PROCEDURE', 'MAXTYPE')) AS VARCHAR2(23)) object_type from sys.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) e, all_users u WHERE o.object_id = e.obj_id AND o.object_type like e.object_type AND o.object_type IN (UPPER('package'), UPPER('type'), UPPER('procedure'), UPPER('function'), UPPER('package body'), UPPER('view'), UPPER('trigger'), UPPER('type body'), UPPER('library'), UPPER('queue'), UPPER('java source'), UPPER('java class'), UPPER('dimension'), UPPER('assembly'), UPPER('hierarchy'), UPPER('arrtibute dimension'), UPPER('analytic view')) AND u.username=o.owner AND u.userid IN (USERENV('SCHEMAID')) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -233,17 +228,16 @@ int ObInnerTableSchema::user_errors_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_type_methods_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_type_methods_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -274,8 +268,7 @@ int ObInnerTableSchema::all_type_methods_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS OWNER, CAST(NULL AS VARCHAR2(30)) AS TYPE_NAME, CAST(NULL AS VARCHAR2(30)) AS METHOD_NAME, CAST(NULL AS NUMBER) AS METHOD_NO, CAST(NULL AS VARCHAR2(6)) AS METHOD_TYPE, CAST(NULL AS NUMBER) AS PARAMETERS, CAST(NULL AS NUMBER) AS RESULTS, CAST(NULL AS VARCHAR2(3)) AS FINAL, CAST(NULL AS VARCHAR2(3)) AS INSTANTIABLE, CAST(NULL AS VARCHAR2(3)) AS OVERRIDING, CAST(NULL AS VARCHAR2(3)) AS INHERITED FROM DUAL WHERE 1 = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS OWNER, CAST(NULL AS VARCHAR2(30)) AS TYPE_NAME, CAST(NULL AS VARCHAR2(30)) AS METHOD_NAME, CAST(NULL AS NUMBER) AS METHOD_NO, CAST(NULL AS VARCHAR2(6)) AS METHOD_TYPE, CAST(NULL AS NUMBER) AS PARAMETERS, CAST(NULL AS NUMBER) AS RESULTS, CAST(NULL AS VARCHAR2(3)) AS FINAL, CAST(NULL AS VARCHAR2(3)) AS INSTANTIABLE, CAST(NULL AS VARCHAR2(3)) AS OVERRIDING, CAST(NULL AS VARCHAR2(3)) AS INHERITED FROM DUAL WHERE 1 = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -287,17 +280,16 @@ int ObInnerTableSchema::all_type_methods_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_type_methods_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_type_methods_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -328,8 +320,7 @@ int ObInnerTableSchema::dba_type_methods_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS OWNER, CAST(NULL AS VARCHAR2(30)) AS TYPE_NAME, CAST(NULL AS VARCHAR2(30)) AS METHOD_NAME, CAST(NULL AS NUMBER) AS METHOD_NO, CAST(NULL AS VARCHAR2(6)) AS METHOD_TYPE, CAST(NULL AS NUMBER) AS PARAMETERS, CAST(NULL AS NUMBER) AS RESULTS, CAST(NULL AS VARCHAR2(3)) AS FINAL, CAST(NULL AS VARCHAR2(3)) AS INSTANTIABLE, CAST(NULL AS VARCHAR2(3)) AS OVERRIDING, CAST(NULL AS VARCHAR2(3)) AS INHERITED FROM DUAL WHERE 1 = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS OWNER, CAST(NULL AS VARCHAR2(30)) AS TYPE_NAME, CAST(NULL AS VARCHAR2(30)) AS METHOD_NAME, CAST(NULL AS NUMBER) AS METHOD_NO, CAST(NULL AS VARCHAR2(6)) AS METHOD_TYPE, CAST(NULL AS NUMBER) AS PARAMETERS, CAST(NULL AS NUMBER) AS RESULTS, CAST(NULL AS VARCHAR2(3)) AS FINAL, CAST(NULL AS VARCHAR2(3)) AS INSTANTIABLE, CAST(NULL AS VARCHAR2(3)) AS OVERRIDING, CAST(NULL AS VARCHAR2(3)) AS INHERITED FROM DUAL WHERE 1 = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -341,17 +332,16 @@ int ObInnerTableSchema::dba_type_methods_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_type_methods_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_type_methods_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -382,8 +372,7 @@ int ObInnerTableSchema::user_type_methods_ora_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS TYPE_NAME, CAST(NULL AS VARCHAR2(30)) AS METHOD_NAME, CAST(NULL AS NUMBER) AS METHOD_NO, CAST(NULL AS VARCHAR2(6)) AS METHOD_TYPE, CAST(NULL AS NUMBER) AS PARAMETERS, CAST(NULL AS NUMBER) AS RESULTS, CAST(NULL AS VARCHAR2(3)) AS FINAL, CAST(NULL AS VARCHAR2(3)) AS INSTANTIABLE, CAST(NULL AS VARCHAR2(3)) AS OVERRIDING, CAST(NULL AS VARCHAR2(3)) AS INHERITED FROM DUAL WHERE 1 = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS TYPE_NAME, CAST(NULL AS VARCHAR2(30)) AS METHOD_NAME, CAST(NULL AS NUMBER) AS METHOD_NO, CAST(NULL AS VARCHAR2(6)) AS METHOD_TYPE, CAST(NULL AS NUMBER) AS PARAMETERS, CAST(NULL AS NUMBER) AS RESULTS, CAST(NULL AS VARCHAR2(3)) AS FINAL, CAST(NULL AS VARCHAR2(3)) AS INSTANTIABLE, CAST(NULL AS VARCHAR2(3)) AS OVERRIDING, CAST(NULL AS VARCHAR2(3)) AS INHERITED FROM DUAL WHERE 1 = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -395,17 +384,16 @@ int ObInnerTableSchema::user_type_methods_ora_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_method_params_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_method_params_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -436,8 +424,7 @@ int ObInnerTableSchema::all_method_params_ora_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS OWNER, CAST(NULL AS VARCHAR2(30)) AS TYPE_NAME, CAST(NULL AS VARCHAR2(30)) AS METHOD_NAME, CAST(NULL AS NUMBER) AS METHOD_NO, CAST(NULL AS VARCHAR2(30)) AS PARAM_NAME, CAST(NULL AS NUMBER) AS PARAM_NO, CAST(NULL AS VARCHAR2(6)) AS PARAM_MODE, CAST(NULL AS VARCHAR2(7)) AS PARAM_TYPE_MOD, CAST(NULL AS VARCHAR2(30)) AS PARAM_TYPE_OWNER, CAST(NULL AS VARCHAR2(30)) AS PARAM_TYPE_NAME, CAST(NULL AS VARCHAR2(44)) AS CHARACTER_SET_NAME FROM DUAL WHERE 1 = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS OWNER, CAST(NULL AS VARCHAR2(30)) AS TYPE_NAME, CAST(NULL AS VARCHAR2(30)) AS METHOD_NAME, CAST(NULL AS NUMBER) AS METHOD_NO, CAST(NULL AS VARCHAR2(30)) AS PARAM_NAME, CAST(NULL AS NUMBER) AS PARAM_NO, CAST(NULL AS VARCHAR2(6)) AS PARAM_MODE, CAST(NULL AS VARCHAR2(7)) AS PARAM_TYPE_MOD, CAST(NULL AS VARCHAR2(30)) AS PARAM_TYPE_OWNER, CAST(NULL AS VARCHAR2(30)) AS PARAM_TYPE_NAME, CAST(NULL AS VARCHAR2(44)) AS CHARACTER_SET_NAME FROM DUAL WHERE 1 = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -449,17 +436,16 @@ int ObInnerTableSchema::all_method_params_ora_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_method_params_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_method_params_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -490,8 +476,7 @@ int ObInnerTableSchema::dba_method_params_ora_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS OWNER, CAST(NULL AS VARCHAR2(30)) AS TYPE_NAME, CAST(NULL AS VARCHAR2(30)) AS METHOD_NAME, CAST(NULL AS NUMBER) AS METHOD_NO, CAST(NULL AS VARCHAR2(30)) AS PARAM_NAME, CAST(NULL AS NUMBER) AS PARAM_NO, CAST(NULL AS VARCHAR2(6)) AS PARAM_MODE, CAST(NULL AS VARCHAR2(7)) AS PARAM_TYPE_MOD, CAST(NULL AS VARCHAR2(30)) AS PARAM_TYPE_OWNER, CAST(NULL AS VARCHAR2(30)) AS PARAM_TYPE_NAME, CAST(NULL AS VARCHAR2(44)) AS CHARACTER_SET_NAME FROM DUAL WHERE 1 = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS OWNER, CAST(NULL AS VARCHAR2(30)) AS TYPE_NAME, CAST(NULL AS VARCHAR2(30)) AS METHOD_NAME, CAST(NULL AS NUMBER) AS METHOD_NO, CAST(NULL AS VARCHAR2(30)) AS PARAM_NAME, CAST(NULL AS NUMBER) AS PARAM_NO, CAST(NULL AS VARCHAR2(6)) AS PARAM_MODE, CAST(NULL AS VARCHAR2(7)) AS PARAM_TYPE_MOD, CAST(NULL AS VARCHAR2(30)) AS PARAM_TYPE_OWNER, CAST(NULL AS VARCHAR2(30)) AS PARAM_TYPE_NAME, CAST(NULL AS VARCHAR2(44)) AS CHARACTER_SET_NAME FROM DUAL WHERE 1 = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -503,17 +488,16 @@ int ObInnerTableSchema::dba_method_params_ora_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_method_params_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_method_params_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -544,8 +528,7 @@ int ObInnerTableSchema::user_method_params_ora_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS TYPE_NAME, CAST(NULL AS VARCHAR2(30)) AS METHOD_NAME, CAST(NULL AS NUMBER) AS METHOD_NO, CAST(NULL AS VARCHAR2(30)) AS PARAM_NAME, CAST(NULL AS NUMBER) AS PARAM_NO, CAST(NULL AS VARCHAR2(6)) AS PARAM_MODE, CAST(NULL AS VARCHAR2(7)) AS PARAM_TYPE_MOD, CAST(NULL AS VARCHAR2(30)) AS PARAM_TYPE_OWNER, CAST(NULL AS VARCHAR2(30)) AS PARAM_TYPE_NAME, CAST(NULL AS VARCHAR2(44)) AS CHARACTER_SET_NAME FROM DUAL WHERE 1 = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS VARCHAR2(30)) AS TYPE_NAME, CAST(NULL AS VARCHAR2(30)) AS METHOD_NAME, CAST(NULL AS NUMBER) AS METHOD_NO, CAST(NULL AS VARCHAR2(30)) AS PARAM_NAME, CAST(NULL AS NUMBER) AS PARAM_NO, CAST(NULL AS VARCHAR2(6)) AS PARAM_MODE, CAST(NULL AS VARCHAR2(7)) AS PARAM_TYPE_MOD, CAST(NULL AS VARCHAR2(30)) AS PARAM_TYPE_OWNER, CAST(NULL AS VARCHAR2(30)) AS PARAM_TYPE_NAME, CAST(NULL AS VARCHAR2(44)) AS CHARACTER_SET_NAME FROM DUAL WHERE 1 = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -557,17 +540,16 @@ int ObInnerTableSchema::user_method_params_ora_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_tablespaces_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_tablespaces_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -598,8 +580,7 @@ int ObInnerTableSchema::dba_tablespaces_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT TABLESPACE_NAME, CAST(NULL AS NUMBER) BLOCK_SIZE, CAST(NULL AS NUMBER) INITIAL_EXTENT, CAST(NULL AS NUMBER) NEXT_EXTENT, CAST(NULL AS NUMBER) MIN_EXTENT, CAST(NULL AS NUMBER) MAX_EXTENT, CAST(NULL AS NUMBER) MAX_SIZE, CAST(NULL AS NUMBER) PCT_INCREASE, CAST(NULL AS NUMBER) MIN_EXTLEN, CAST(NULL AS VARCHAR2(9)) STATUS, CAST(NULL AS VARCHAR2(9)) CONTENTS, CAST(NULL AS VARCHAR2(9)) LOGGING, CAST(NULL AS VARCHAR2(3)) FORCE_LOGGING, CAST(NULL AS VARCHAR2(10)) EXTENT_MANAGEMENT, CAST(NULL AS VARCHAR2(9)) ALLOCATION_TYPE, CAST(NULL AS VARCHAR2(3)) PLUGGED_IN, CAST(NULL AS VARCHAR2(6)) SEGMENT_SPACE_MANAGEMENT, CAST(NULL AS VARCHAR2(8)) DEF_TAB_COMPRESSION, CAST(NULL AS VARCHAR2(11)) RETENTION, CAST(NULL AS VARCHAR2(3)) BIGFILE, CAST(NULL AS VARCHAR2(7)) PREDICATE_EVALUATION, CAST(NULL AS VARCHAR2(3)) ENCRYPTED, CAST(NULL AS VARCHAR2(12)) COMPRESS_FOR FROM SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT TABLESPACE_NAME, CAST(NULL AS NUMBER) BLOCK_SIZE, CAST(NULL AS NUMBER) INITIAL_EXTENT, CAST(NULL AS NUMBER) NEXT_EXTENT, CAST(NULL AS NUMBER) MIN_EXTENT, CAST(NULL AS NUMBER) MAX_EXTENT, CAST(NULL AS NUMBER) MAX_SIZE, CAST(NULL AS NUMBER) PCT_INCREASE, CAST(NULL AS NUMBER) MIN_EXTLEN, CAST(NULL AS VARCHAR2(9)) STATUS, CAST(NULL AS VARCHAR2(9)) CONTENTS, CAST(NULL AS VARCHAR2(9)) LOGGING, CAST(NULL AS VARCHAR2(3)) FORCE_LOGGING, CAST(NULL AS VARCHAR2(10)) EXTENT_MANAGEMENT, CAST(NULL AS VARCHAR2(9)) ALLOCATION_TYPE, CAST(NULL AS VARCHAR2(3)) PLUGGED_IN, CAST(NULL AS VARCHAR2(6)) SEGMENT_SPACE_MANAGEMENT, CAST(NULL AS VARCHAR2(8)) DEF_TAB_COMPRESSION, CAST(NULL AS VARCHAR2(11)) RETENTION, CAST(NULL AS VARCHAR2(3)) BIGFILE, CAST(NULL AS VARCHAR2(7)) PREDICATE_EVALUATION, CAST(NULL AS VARCHAR2(3)) ENCRYPTED, CAST(NULL AS VARCHAR2(12)) COMPRESS_FOR FROM SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -611,17 +592,16 @@ int ObInnerTableSchema::dba_tablespaces_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_tablespaces_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_tablespaces_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -652,8 +632,7 @@ int ObInnerTableSchema::user_tablespaces_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT TABLESPACE_NAME, CAST(NULL AS NUMBER) BLOCK_SIZE, CAST(NULL AS NUMBER) INITIAL_EXTENT, CAST(NULL AS NUMBER) NEXT_EXTENT, CAST(NULL AS NUMBER) MIN_EXTENT, CAST(NULL AS NUMBER) MAX_EXTENT, CAST(NULL AS NUMBER) MAX_SIZE, CAST(NULL AS NUMBER) PCT_INCREASE, CAST(NULL AS NUMBER) MIN_EXTLEN, CAST(NULL AS VARCHAR2(9)) STATUS, CAST(NULL AS VARCHAR2(9)) CONTENTS, CAST(NULL AS VARCHAR2(9)) LOGGING, CAST(NULL AS VARCHAR2(3)) FORCE_LOGGING, CAST(NULL AS VARCHAR2(10)) EXTENT_MANAGEMENT, CAST(NULL AS VARCHAR2(9)) ALLOCATION_TYPE, CAST(NULL AS VARCHAR2(6)) SEGMENT_SPACE_MANAGEMENT, CAST(NULL AS VARCHAR2(8)) DEF_TAB_COMPRESSION, CAST(NULL AS VARCHAR2(11)) RETENTION, CAST(NULL AS VARCHAR2(3)) BIGFILE, CAST(NULL AS VARCHAR2(7)) PREDICATE_EVALUATION, CAST(NULL AS VARCHAR2(3)) ENCRYPTED, CAST(NULL AS VARCHAR2(12)) COMPRESS_FOR FROM SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT TABLESPACE_NAME, CAST(NULL AS NUMBER) BLOCK_SIZE, CAST(NULL AS NUMBER) INITIAL_EXTENT, CAST(NULL AS NUMBER) NEXT_EXTENT, CAST(NULL AS NUMBER) MIN_EXTENT, CAST(NULL AS NUMBER) MAX_EXTENT, CAST(NULL AS NUMBER) MAX_SIZE, CAST(NULL AS NUMBER) PCT_INCREASE, CAST(NULL AS NUMBER) MIN_EXTLEN, CAST(NULL AS VARCHAR2(9)) STATUS, CAST(NULL AS VARCHAR2(9)) CONTENTS, CAST(NULL AS VARCHAR2(9)) LOGGING, CAST(NULL AS VARCHAR2(3)) FORCE_LOGGING, CAST(NULL AS VARCHAR2(10)) EXTENT_MANAGEMENT, CAST(NULL AS VARCHAR2(9)) ALLOCATION_TYPE, CAST(NULL AS VARCHAR2(6)) SEGMENT_SPACE_MANAGEMENT, CAST(NULL AS VARCHAR2(8)) DEF_TAB_COMPRESSION, CAST(NULL AS VARCHAR2(11)) RETENTION, CAST(NULL AS VARCHAR2(3)) BIGFILE, CAST(NULL AS VARCHAR2(7)) PREDICATE_EVALUATION, CAST(NULL AS VARCHAR2(3)) ENCRYPTED, CAST(NULL AS VARCHAR2(12)) COMPRESS_FOR FROM SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -665,17 +644,16 @@ int ObInnerTableSchema::user_tablespaces_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_ind_expressions_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_ind_expressions_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -706,9 +684,7 @@ int ObInnerTableSchema::dba_ind_expressions_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema - .set_view_definition( - R"__( SELECT CAST(INDEX_OWNER AS VARCHAR2(128)) AS INDEX_OWNER, CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(TABLE_OWNER AS VARCHAR2(128)) AS TABLE_OWNER, CAST(H.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(COLUMN_EXPRESSION /* TODO: LONG */ AS VARCHAR2(1000)) AS COLUMN_EXPRESSION, COLUMN_POSITION FROM ( SELECT INDEX_OWNER, INDEX_NAME, TABLE_OWNER, F.CUR_DEFAULT_VALUE_V2 AS COLUMN_EXPRESSION, E.INDEX_POSITION AS COLUMN_POSITION, E.TABLE_ID AS TABLE_ID FROM (SELECT INDEX_OWNER, INDEX_NAME, TABLE_OWNER, C.TABLE_ID AS TABLE_ID, C.INDEX_ID AS INDEX_ID, D.COLUMN_ID AS COLUMN_ID, D.COLUMN_NAME AS COLUMN_NAME, D.INDEX_POSITION AS INDEX_POSITION FROM (SELECT DATABASE_NAME AS INDEX_OWNER, SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) AS INDEX_NAME, DATABASE_NAME AS TABLE_OWNER, A.DATA_TABLE_ID AS TABLE_ID, A.TABLE_ID AS INDEX_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND B.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE TABLE_TYPE=5 ) C JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT D ON C.INDEX_ID=D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID()) E JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT F ON F.TABLE_ID=E.TABLE_ID AND F.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.COLUMN_ID=E.COLUMN_ID AND F.COLUMN_FLAGS=1) G JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT H ON G.TABLE_ID=H.TABLE_ID AND H.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(INDEX_OWNER AS VARCHAR2(128)) AS INDEX_OWNER, CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(TABLE_OWNER AS VARCHAR2(128)) AS TABLE_OWNER, CAST(H.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(COLUMN_EXPRESSION /* TODO: LONG */ AS VARCHAR2(1000)) AS COLUMN_EXPRESSION, COLUMN_POSITION FROM ( SELECT INDEX_OWNER, INDEX_NAME, TABLE_OWNER, F.CUR_DEFAULT_VALUE_V2 AS COLUMN_EXPRESSION, E.INDEX_POSITION AS COLUMN_POSITION, E.TABLE_ID AS TABLE_ID FROM (SELECT INDEX_OWNER, INDEX_NAME, TABLE_OWNER, C.TABLE_ID AS TABLE_ID, C.INDEX_ID AS INDEX_ID, D.COLUMN_ID AS COLUMN_ID, D.COLUMN_NAME AS COLUMN_NAME, D.INDEX_POSITION AS INDEX_POSITION FROM (SELECT DATABASE_NAME AS INDEX_OWNER, SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) AS INDEX_NAME, DATABASE_NAME AS TABLE_OWNER, A.DATA_TABLE_ID AS TABLE_ID, A.TABLE_ID AS INDEX_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND B.DATABASE_NAME != '__recyclebin' AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE TABLE_TYPE=5 ) C JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT D ON C.INDEX_ID=D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID()) E JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT F ON F.TABLE_ID=E.TABLE_ID AND F.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.COLUMN_ID=E.COLUMN_ID AND F.COLUMN_FLAGS=1) G JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT H ON G.TABLE_ID=H.TABLE_ID AND H.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -720,17 +696,16 @@ int ObInnerTableSchema::dba_ind_expressions_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_ind_expressions_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_ind_expressions_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -761,8 +736,7 @@ int ObInnerTableSchema::user_ind_expressions_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(H.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(COLUMN_EXPRESSION /* TODO: LONG */ AS VARCHAR2(1000)) AS COLUMN_EXPRESSION, COLUMN_POSITION FROM ( SELECT INDEX_NAME, F.CUR_DEFAULT_VALUE_V2 AS COLUMN_EXPRESSION, E.INDEX_POSITION AS COLUMN_POSITION, E.TABLE_ID AS TABLE_ID FROM (SELECT INDEX_NAME, C.TABLE_ID AS TABLE_ID, C.INDEX_ID AS INDEX_ID, D.COLUMN_ID AS COLUMN_ID, D.COLUMN_NAME AS COLUMN_NAME, D.INDEX_POSITION AS INDEX_POSITION FROM (SELECT SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) AS INDEX_NAME, A.DATA_TABLE_ID AS TABLE_ID, A.TABLE_ID AS INDEX_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND B.DATABASE_NAME != '__recyclebin' AND A.DATABASE_ID = USERENV('SCHEMAID') AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE TABLE_TYPE=5 ) C JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT D ON C.INDEX_ID=D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID()) E JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT F ON F.TABLE_ID=E.TABLE_ID AND F.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.COLUMN_ID=E.COLUMN_ID AND F.COLUMN_FLAGS=1) G JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT H ON G.TABLE_ID=H.TABLE_ID AND H.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(H.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(COLUMN_EXPRESSION /* TODO: LONG */ AS VARCHAR2(1000)) AS COLUMN_EXPRESSION, COLUMN_POSITION FROM ( SELECT INDEX_NAME, F.CUR_DEFAULT_VALUE_V2 AS COLUMN_EXPRESSION, E.INDEX_POSITION AS COLUMN_POSITION, E.TABLE_ID AS TABLE_ID FROM (SELECT INDEX_NAME, C.TABLE_ID AS TABLE_ID, C.INDEX_ID AS INDEX_ID, D.COLUMN_ID AS COLUMN_ID, D.COLUMN_NAME AS COLUMN_NAME, D.INDEX_POSITION AS INDEX_POSITION FROM (SELECT SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) AS INDEX_NAME, A.DATA_TABLE_ID AS TABLE_ID, A.TABLE_ID AS INDEX_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND B.DATABASE_NAME != '__recyclebin' AND A.DATABASE_ID = USERENV('SCHEMAID') AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE TABLE_TYPE=5 ) C JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT D ON C.INDEX_ID=D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID()) E JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT F ON F.TABLE_ID=E.TABLE_ID AND F.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.COLUMN_ID=E.COLUMN_ID AND F.COLUMN_FLAGS=1) G JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT H ON G.TABLE_ID=H.TABLE_ID AND H.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -774,17 +748,16 @@ int ObInnerTableSchema::user_ind_expressions_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_ind_expressions_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_ind_expressions_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -815,8 +788,7 @@ int ObInnerTableSchema::all_ind_expressions_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(INDEX_OWNER AS VARCHAR2(128)) AS INDEX_OWNER, CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(TABLE_OWNER AS VARCHAR2(128)) AS TABLE_OWNER, CAST(H.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(COLUMN_EXPRESSION /* TODO: LONG */ AS VARCHAR2(1000)) AS COLUMN_EXPRESSION, COLUMN_POSITION FROM ( SELECT INDEX_OWNER, INDEX_NAME, TABLE_OWNER, F.CUR_DEFAULT_VALUE_V2 AS COLUMN_EXPRESSION, E.INDEX_POSITION AS COLUMN_POSITION, E.TABLE_ID AS TABLE_ID FROM (SELECT INDEX_OWNER, INDEX_NAME, TABLE_OWNER, C.TABLE_ID AS TABLE_ID, C.INDEX_ID AS INDEX_ID, D.COLUMN_ID AS COLUMN_ID, D.COLUMN_NAME AS COLUMN_NAME, D.INDEX_POSITION AS INDEX_POSITION FROM (SELECT DATABASE_NAME AS INDEX_OWNER, SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) AS INDEX_NAME, DATABASE_NAME AS TABLE_OWNER, A.DATA_TABLE_ID AS TABLE_ID, A.TABLE_ID AS INDEX_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, A.DATA_TABLE_ID, A.DATABASE_ID) = 1) AND B.DATABASE_NAME != '__recyclebin' WHERE TABLE_TYPE=5 ) C JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT D ON C.INDEX_ID=D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID()) E JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT F ON F.TABLE_ID=E.TABLE_ID AND F.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.COLUMN_ID=E.COLUMN_ID AND F.COLUMN_FLAGS=1) G JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT H ON G.TABLE_ID=H.TABLE_ID AND H.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(INDEX_OWNER AS VARCHAR2(128)) AS INDEX_OWNER, CAST(INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(TABLE_OWNER AS VARCHAR2(128)) AS TABLE_OWNER, CAST(H.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(COLUMN_EXPRESSION /* TODO: LONG */ AS VARCHAR2(1000)) AS COLUMN_EXPRESSION, COLUMN_POSITION FROM ( SELECT INDEX_OWNER, INDEX_NAME, TABLE_OWNER, F.CUR_DEFAULT_VALUE_V2 AS COLUMN_EXPRESSION, E.INDEX_POSITION AS COLUMN_POSITION, E.TABLE_ID AS TABLE_ID FROM (SELECT INDEX_OWNER, INDEX_NAME, TABLE_OWNER, C.TABLE_ID AS TABLE_ID, C.INDEX_ID AS INDEX_ID, D.COLUMN_ID AS COLUMN_ID, D.COLUMN_NAME AS COLUMN_NAME, D.INDEX_POSITION AS INDEX_POSITION FROM (SELECT DATABASE_NAME AS INDEX_OWNER, SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')) AS INDEX_NAME, DATABASE_NAME AS TABLE_OWNER, A.DATA_TABLE_ID AS TABLE_ID, A.TABLE_ID AS INDEX_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT A JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B ON A.DATABASE_ID = B.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND (A.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, A.DATA_TABLE_ID, A.DATABASE_ID) = 1) AND B.DATABASE_NAME != '__recyclebin' WHERE TABLE_TYPE=5 ) C JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT D ON C.INDEX_ID=D.TABLE_ID AND D.TENANT_ID = EFFECTIVE_TENANT_ID()) E JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT F ON F.TABLE_ID=E.TABLE_ID AND F.TENANT_ID = EFFECTIVE_TENANT_ID() AND F.COLUMN_ID=E.COLUMN_ID AND F.COLUMN_FLAGS=1) G JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT H ON G.TABLE_ID=H.TABLE_ID AND H.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -828,17 +800,16 @@ int ObInnerTableSchema::all_ind_expressions_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_ind_partitions_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_ind_partitions_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -869,8 +840,7 @@ int ObInnerTableSchema::all_ind_partitions_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(B.INDEX_OWNER AS VARCHAR2(128)) AS INDEX_OWNER, CAST(B.INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(CASE WHEN PART.SUB_PART_NUM <=0 THEN 'NO' ELSE 'YES' END AS VARCHAR(3)) AS COMPOSITE, CAST(PART.PART_NAME AS VARCHAR2(128)) AS PARTITION_NAME, PART.SUB_PART_NUM AS SUBPARTITION_COUNT, CAST(PART.HIGH_BOUND_VAL AS VARCHAR2(1024)) AS HIGH_VALUE, CAST(LENGTH(PART.HIGH_BOUND_VAL) AS NUMBER) AS HIGH_VALUE_LENGTH, PART.PART_ID + 1 AS PARTITION_POSITION, CAST(NULL AS VARCHAR2(8)) AS STATUS, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENT, CAST(NULL AS NUMBER) AS MAX_EXTENT, CAST(NULL AS NUMBER) AS MAX_SIZE, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS INTERVAL, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM( SELECT A.INDEX_OWNER AS INDEX_OWNER, A.INDEX_NAME AS INDEX_NAME, A.INDEX_TABLE_ID AS TABLE_ID, /*INDEX TABLE ID*/ A.DATA_TABLE_ID AS DATA_TABLE_ID, CAST(CASE WHEN A.PART_LEVEL=1 THEN 'FALSE' ELSE 'TRUE' END AS VARCHAR2(5)) IS_LOCAL FROM( SELECT DB.DATABASE_NAME AS INDEX_OWNER, SUBSTR(TB1.TABLE_NAME, 7 + INSTR(SUBSTR(TB1.TABLE_NAME, 7), '_')) AS INDEX_NAME, TB1.TABLE_ID AS INDEX_TABLE_ID, TB1.DATA_TABLE_ID AS DATA_TABLE_ID, TB1.INDEX_TYPE AS INDEX_TYPE, TB1.PART_LEVEL AS PART_LEVEL /*USE DATA TABLE'S PART_LEVEL IF INDEX IS LOCAL INDEX*/ FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB1, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE DB.DATABASE_NAME!='__recyclebin' AND TB1.DATABASE_ID=DB.DATABASE_ID AND TB1.TABLE_TYPE=5 AND TB1.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND (TB1.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, TB1.DATA_TABLE_ID, TB1.DATABASE_ID) = 1) ) A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB2 ON A.DATA_TABLE_ID=TB2.TABLE_ID AND TB2.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE A.PART_LEVEL=1 OR ((A.INDEX_TYPE=1 OR A.INDEX_TYPE=2) AND TB2.PART_LEVEL=1) ) B JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT PART ON ((B.TABLE_ID=PART.TABLE_ID AND B.IS_LOCAL='FALSE') OR (B.DATA_TABLE_ID=PART.TABLE_ID AND B.IS_LOCAL='TRUE')) AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(B.INDEX_OWNER AS VARCHAR2(128)) AS INDEX_OWNER, CAST(B.INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(CASE WHEN PART.SUB_PART_NUM <=0 THEN 'NO' ELSE 'YES' END AS VARCHAR(3)) AS COMPOSITE, CAST(PART.PART_NAME AS VARCHAR2(128)) AS PARTITION_NAME, PART.SUB_PART_NUM AS SUBPARTITION_COUNT, CAST(PART.HIGH_BOUND_VAL AS VARCHAR2(1024)) AS HIGH_VALUE, CAST(LENGTH(PART.HIGH_BOUND_VAL) AS NUMBER) AS HIGH_VALUE_LENGTH, PART.PART_ID + 1 AS PARTITION_POSITION, CAST(NULL AS VARCHAR2(8)) AS STATUS, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENT, CAST(NULL AS NUMBER) AS MAX_EXTENT, CAST(NULL AS NUMBER) AS MAX_SIZE, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS INTERVAL, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM( SELECT A.INDEX_OWNER AS INDEX_OWNER, A.INDEX_NAME AS INDEX_NAME, A.INDEX_TABLE_ID AS TABLE_ID, /*INDEX TABLE ID*/ A.DATA_TABLE_ID AS DATA_TABLE_ID, CAST(CASE WHEN A.PART_LEVEL=1 THEN 'FALSE' ELSE 'TRUE' END AS VARCHAR2(5)) IS_LOCAL FROM( SELECT DB.DATABASE_NAME AS INDEX_OWNER, SUBSTR(TB1.TABLE_NAME, 7 + INSTR(SUBSTR(TB1.TABLE_NAME, 7), '_')) AS INDEX_NAME, TB1.TABLE_ID AS INDEX_TABLE_ID, TB1.DATA_TABLE_ID AS DATA_TABLE_ID, TB1.INDEX_TYPE AS INDEX_TYPE, TB1.PART_LEVEL AS PART_LEVEL /*USE DATA TABLE'S PART_LEVEL IF INDEX IS LOCAL INDEX*/ FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB1, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE DB.DATABASE_NAME!='__recyclebin' AND TB1.DATABASE_ID=DB.DATABASE_ID AND TB1.TABLE_TYPE=5 AND TB1.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND (TB1.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, TB1.DATA_TABLE_ID, TB1.DATABASE_ID) = 1) ) A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB2 ON A.DATA_TABLE_ID=TB2.TABLE_ID AND TB2.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE A.PART_LEVEL=1 OR ((A.INDEX_TYPE=1 OR A.INDEX_TYPE=2) AND TB2.PART_LEVEL=1) ) B JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT PART ON ((B.TABLE_ID=PART.TABLE_ID AND B.IS_LOCAL='FALSE') OR (B.DATA_TABLE_ID=PART.TABLE_ID AND B.IS_LOCAL='TRUE')) AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -882,17 +852,16 @@ int ObInnerTableSchema::all_ind_partitions_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_ind_partitions_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_ind_partitions_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -923,8 +892,7 @@ int ObInnerTableSchema::user_ind_partitions_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(B.INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(CASE WHEN PART.SUB_PART_NUM <=0 THEN 'NO' ELSE 'YES' END AS VARCHAR(3)) AS COMPOSITE, CAST(PART.PART_NAME AS VARCHAR2(128)) AS PARTITION_NAME, PART.SUB_PART_NUM AS SUBPARTITION_COUNT, CAST(PART.HIGH_BOUND_VAL AS VARCHAR2(1024)) AS HIGH_VALUE, CAST(LENGTH(PART.HIGH_BOUND_VAL) AS NUMBER) AS HIGH_VALUE_LENGTH, PART.PART_ID + 1 AS PARTITION_POSITION, CAST(NULL AS VARCHAR2(8)) AS STATUS, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENT, CAST(NULL AS NUMBER) AS MAX_EXTENT, CAST(NULL AS NUMBER) AS MAX_SIZE, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS INTERVAL, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM( SELECT A.INDEX_OWNER AS INDEX_OWNER, A.INDEX_NAME AS INDEX_NAME, A.INDEX_TABLE_ID AS TABLE_ID, /*INDEX TABLE ID */ A.DATA_TABLE_ID AS DATA_TABLE_ID, CAST(CASE WHEN A.PART_LEVEL=1 THEN 'FALSE' ELSE 'TRUE' END AS VARCHAR2(5)) IS_LOCAL FROM( SELECT DB.DATABASE_NAME AS INDEX_OWNER, SUBSTR(TB1.TABLE_NAME, 7 + INSTR(SUBSTR(TB1.TABLE_NAME, 7), '_')) AS INDEX_NAME, TB1.TABLE_ID AS INDEX_TABLE_ID, TB1.DATA_TABLE_ID AS DATA_TABLE_ID, TB1.INDEX_TYPE AS INDEX_TYPE, TB1.PART_LEVEL AS PART_LEVEL /*USE DATA TABLE'S PART_LEVEL IF INDEX IS LOCAL INDEX*/ FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB1, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE DB.DATABASE_NAME!='__recyclebin' AND TB1.DATABASE_ID=DB.DATABASE_ID AND TB1.TABLE_TYPE=5 AND TB1.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() ) A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB2 ON A.DATA_TABLE_ID=TB2.TABLE_ID AND TB2.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE A.PART_LEVEL=1 OR ((A.INDEX_TYPE=1 OR A.INDEX_TYPE=2) AND TB2.PART_LEVEL=1) ) B JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT PART ON ((B.TABLE_ID=PART.TABLE_ID AND B.IS_LOCAL='FALSE') OR (B.DATA_TABLE_ID=PART.TABLE_ID AND B.IS_LOCAL='TRUE')) AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(B.INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(CASE WHEN PART.SUB_PART_NUM <=0 THEN 'NO' ELSE 'YES' END AS VARCHAR(3)) AS COMPOSITE, CAST(PART.PART_NAME AS VARCHAR2(128)) AS PARTITION_NAME, PART.SUB_PART_NUM AS SUBPARTITION_COUNT, CAST(PART.HIGH_BOUND_VAL AS VARCHAR2(1024)) AS HIGH_VALUE, CAST(LENGTH(PART.HIGH_BOUND_VAL) AS NUMBER) AS HIGH_VALUE_LENGTH, PART.PART_ID + 1 AS PARTITION_POSITION, CAST(NULL AS VARCHAR2(8)) AS STATUS, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENT, CAST(NULL AS NUMBER) AS MAX_EXTENT, CAST(NULL AS NUMBER) AS MAX_SIZE, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS INTERVAL, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM( SELECT A.INDEX_OWNER AS INDEX_OWNER, A.INDEX_NAME AS INDEX_NAME, A.INDEX_TABLE_ID AS TABLE_ID, /*INDEX TABLE ID */ A.DATA_TABLE_ID AS DATA_TABLE_ID, CAST(CASE WHEN A.PART_LEVEL=1 THEN 'FALSE' ELSE 'TRUE' END AS VARCHAR2(5)) IS_LOCAL FROM( SELECT DB.DATABASE_NAME AS INDEX_OWNER, SUBSTR(TB1.TABLE_NAME, 7 + INSTR(SUBSTR(TB1.TABLE_NAME, 7), '_')) AS INDEX_NAME, TB1.TABLE_ID AS INDEX_TABLE_ID, TB1.DATA_TABLE_ID AS DATA_TABLE_ID, TB1.INDEX_TYPE AS INDEX_TYPE, TB1.PART_LEVEL AS PART_LEVEL /*USE DATA TABLE'S PART_LEVEL IF INDEX IS LOCAL INDEX*/ FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB1, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE DB.DATABASE_NAME!='__recyclebin' AND TB1.DATABASE_ID=DB.DATABASE_ID AND TB1.TABLE_TYPE=5 AND TB1.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() ) A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB2 ON A.DATA_TABLE_ID=TB2.TABLE_ID AND TB2.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE A.PART_LEVEL=1 OR ((A.INDEX_TYPE=1 OR A.INDEX_TYPE=2) AND TB2.PART_LEVEL=1) ) B JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT PART ON ((B.TABLE_ID=PART.TABLE_ID AND B.IS_LOCAL='FALSE') OR (B.DATA_TABLE_ID=PART.TABLE_ID AND B.IS_LOCAL='TRUE')) AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -936,17 +904,16 @@ int ObInnerTableSchema::user_ind_partitions_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_ind_partitions_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_ind_partitions_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -977,8 +944,7 @@ int ObInnerTableSchema::dba_ind_partitions_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(B.INDEX_OWNER AS VARCHAR2(128)) AS INDEX_OWNER, CAST(B.INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(CASE WHEN PART.SUB_PART_NUM <=0 THEN 'NO' ELSE 'YES' END AS VARCHAR(3)) AS COMPOSITE, CAST(PART.PART_NAME AS VARCHAR2(128)) AS PARTITION_NAME, PART.SUB_PART_NUM AS SUBPARTITION_COUNT, CAST(PART.HIGH_BOUND_VAL AS VARCHAR2(1024)) AS HIGH_VALUE, CAST(LENGTH(PART.HIGH_BOUND_VAL) AS NUMBER) AS HIGH_VALUE_LENGTH, PART.PART_ID + 1 AS PARTITION_POSITION, CAST(NULL AS VARCHAR2(8)) AS STATUS, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENT, CAST(NULL AS NUMBER) AS MAX_EXTENT, CAST(NULL AS NUMBER) AS MAX_SIZE, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS INTERVAL, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM( SELECT A.INDEX_OWNER AS INDEX_OWNER, A.INDEX_NAME AS INDEX_NAME, A.INDEX_TABLE_ID AS TABLE_ID, /*INDEX TABLE ID*/ A.DATA_TABLE_ID AS DATA_TABLE_ID, CAST(CASE WHEN A.PART_LEVEL=1 THEN 'FALSE' ELSE 'TRUE' END AS VARCHAR2(5)) IS_LOCAL FROM( SELECT DB.DATABASE_NAME AS INDEX_OWNER, SUBSTR(TB1.TABLE_NAME, 7 + INSTR(SUBSTR(TB1.TABLE_NAME, 7), '_')) AS INDEX_NAME, TB1.TABLE_ID AS INDEX_TABLE_ID, TB1.DATA_TABLE_ID AS DATA_TABLE_ID, TB1.INDEX_TYPE AS INDEX_TYPE, TB1.PART_LEVEL AS PART_LEVEL /*USE DATA TABLE'S PART_LEVEL IF INDEX IS LOCAL INDEX*/ FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB1, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE DB.DATABASE_NAME!='__recyclebin' AND TB1.DATABASE_ID=DB.DATABASE_ID AND TB1.TABLE_TYPE=5 AND TB1.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() ) A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB2 ON A.DATA_TABLE_ID=TB2.TABLE_ID AND TB2.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE A.PART_LEVEL=1 OR ((A.INDEX_TYPE=1 OR A.INDEX_TYPE=2) AND TB2.PART_LEVEL=1) ) B JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT PART ON ((B.TABLE_ID=PART.TABLE_ID AND B.IS_LOCAL='FALSE') OR (B.DATA_TABLE_ID=PART.TABLE_ID AND B.IS_LOCAL='TRUE')) AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(B.INDEX_OWNER AS VARCHAR2(128)) AS INDEX_OWNER, CAST(B.INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(CASE WHEN PART.SUB_PART_NUM <=0 THEN 'NO' ELSE 'YES' END AS VARCHAR(3)) AS COMPOSITE, CAST(PART.PART_NAME AS VARCHAR2(128)) AS PARTITION_NAME, PART.SUB_PART_NUM AS SUBPARTITION_COUNT, CAST(PART.HIGH_BOUND_VAL AS VARCHAR2(1024)) AS HIGH_VALUE, CAST(LENGTH(PART.HIGH_BOUND_VAL) AS NUMBER) AS HIGH_VALUE_LENGTH, PART.PART_ID + 1 AS PARTITION_POSITION, CAST(NULL AS VARCHAR2(8)) AS STATUS, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENT, CAST(NULL AS NUMBER) AS MAX_EXTENT, CAST(NULL AS NUMBER) AS MAX_SIZE, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS INTERVAL, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM( SELECT A.INDEX_OWNER AS INDEX_OWNER, A.INDEX_NAME AS INDEX_NAME, A.INDEX_TABLE_ID AS TABLE_ID, /*INDEX TABLE ID*/ A.DATA_TABLE_ID AS DATA_TABLE_ID, CAST(CASE WHEN A.PART_LEVEL=1 THEN 'FALSE' ELSE 'TRUE' END AS VARCHAR2(5)) IS_LOCAL FROM( SELECT DB.DATABASE_NAME AS INDEX_OWNER, SUBSTR(TB1.TABLE_NAME, 7 + INSTR(SUBSTR(TB1.TABLE_NAME, 7), '_')) AS INDEX_NAME, TB1.TABLE_ID AS INDEX_TABLE_ID, TB1.DATA_TABLE_ID AS DATA_TABLE_ID, TB1.INDEX_TYPE AS INDEX_TYPE, TB1.PART_LEVEL AS PART_LEVEL /*USE DATA TABLE'S PART_LEVEL IF INDEX IS LOCAL INDEX*/ FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB1, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE DB.DATABASE_NAME!='__recyclebin' AND TB1.DATABASE_ID=DB.DATABASE_ID AND TB1.TABLE_TYPE=5 AND TB1.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() ) A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB2 ON A.DATA_TABLE_ID=TB2.TABLE_ID AND TB2.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE A.PART_LEVEL=1 OR ((A.INDEX_TYPE=1 OR A.INDEX_TYPE=2) AND TB2.PART_LEVEL=1) ) B JOIN SYS.ALL_VIRTUAL_PART_REAL_AGENT PART ON ((B.TABLE_ID=PART.TABLE_ID AND B.IS_LOCAL='FALSE') OR (B.DATA_TABLE_ID=PART.TABLE_ID AND B.IS_LOCAL='TRUE')) AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -990,17 +956,16 @@ int ObInnerTableSchema::dba_ind_partitions_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_ind_subpartitions_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_ind_subpartitions_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1031,8 +996,7 @@ int ObInnerTableSchema::dba_ind_subpartitions_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(B.INDEX_OWNER AS VARCHAR2(128)) AS INDEX_OWNER, CAST(B.INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(PART.PART_NAME AS VARCHAR2(128)) AS PARTITION_NAME, CAST(SUB_PART.SUB_PART_NAME AS VARCHAR2(128)) AS SUBPARTITION_NAME, CAST(SUB_PART.HIGH_BOUND_VAL AS VARCHAR2(1024)) AS HIGH_VALUE, CAST(LENGTH(SUB_PART.HIGH_BOUND_VAL) AS NUMBER) AS HIGH_VALUE_LENGTH, SUB_PART.SUB_PART_ID + 1 AS SUBPARTITION_POSITION, CAST(NULL AS VARCHAR2(8)) AS STATUS, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENT, CAST(NULL AS NUMBER) AS MAX_EXTENT, CAST(NULL AS NUMBER) AS MAX_SIZE, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS INTERVAL, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM( SELECT A.INDEX_OWNER AS INDEX_OWNER, A.INDEX_NAME AS INDEX_NAME, A.INDEX_TABLE_ID AS TABLE_ID, /*INDEX TABLE ID*/ A.DATA_TABLE_ID AS DATA_TABLE_ID, A.PART_LEVEL AS INDEX_TABLE_PART_LEVEL, TB2.PART_LEVEL AS DATA_TABLE_PART_LEVEL, /* CAST(CASE WHEN A.PART_LEVEL=2 THEN 'FALSE' ELSE 'TRUE' END AS VARCHAR2(5)) IS_LOCAL */ CAST('TRUE' AS VARCHAR2(5)) AS IS_LOCAL FROM( SELECT DB.DATABASE_NAME AS INDEX_OWNER, SUBSTR(TB1.TABLE_NAME, 7 + INSTR(SUBSTR(TB1.TABLE_NAME, 7), '_')) AS INDEX_NAME, TB1.TABLE_ID AS INDEX_TABLE_ID, TB1.DATA_TABLE_ID AS DATA_TABLE_ID, TB1.INDEX_TYPE AS INDEX_TYPE, TB1.PART_LEVEL AS PART_LEVEL /*USE DATA TABLE'S PART_LEVEL IF INDEX IS LOCAL INDEX*/ FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB1, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE DB.DATABASE_NAME!='__recyclebin' AND TB1.DATABASE_ID=DB.DATABASE_ID AND TB1.TABLE_TYPE=5 AND TB1.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() ) A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB2 ON A.DATA_TABLE_ID=TB2.TABLE_ID AND TB2.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE A.PART_LEVEL=2 OR ((A.INDEX_TYPE=1 OR A.INDEX_TYPE=2) AND TB2.PART_LEVEL=2) ) B, SYS.ALL_VIRTUAL_PART_REAL_AGENT PART, SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT SUB_PART WHERE ((B.IS_LOCAL='FALSE' AND B.TABLE_ID=PART.TABLE_ID AND PART.TABLE_ID=SUB_PART.TABLE_ID AND PART.PART_ID=SUB_PART.PART_ID) OR (B.IS_LOCAL='TRUE' AND B.DATA_TABLE_ID=PART.TABLE_ID AND PART.TABLE_ID=SUB_PART.TABLE_ID AND PART.PART_ID=SUB_PART.PART_ID)) AND SUB_PART.TENANT_ID = EFFECTIVE_TENANT_ID() AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(B.INDEX_OWNER AS VARCHAR2(128)) AS INDEX_OWNER, CAST(B.INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(PART.PART_NAME AS VARCHAR2(128)) AS PARTITION_NAME, CAST(SUB_PART.SUB_PART_NAME AS VARCHAR2(128)) AS SUBPARTITION_NAME, CAST(SUB_PART.HIGH_BOUND_VAL AS VARCHAR2(1024)) AS HIGH_VALUE, CAST(LENGTH(SUB_PART.HIGH_BOUND_VAL) AS NUMBER) AS HIGH_VALUE_LENGTH, SUB_PART.SUB_PART_ID + 1 AS SUBPARTITION_POSITION, CAST(NULL AS VARCHAR2(8)) AS STATUS, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENT, CAST(NULL AS NUMBER) AS MAX_EXTENT, CAST(NULL AS NUMBER) AS MAX_SIZE, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS INTERVAL, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM( SELECT A.INDEX_OWNER AS INDEX_OWNER, A.INDEX_NAME AS INDEX_NAME, A.INDEX_TABLE_ID AS TABLE_ID, /*INDEX TABLE ID*/ A.DATA_TABLE_ID AS DATA_TABLE_ID, A.PART_LEVEL AS INDEX_TABLE_PART_LEVEL, TB2.PART_LEVEL AS DATA_TABLE_PART_LEVEL, /* CAST(CASE WHEN A.PART_LEVEL=2 THEN 'FALSE' ELSE 'TRUE' END AS VARCHAR2(5)) IS_LOCAL */ CAST('TRUE' AS VARCHAR2(5)) AS IS_LOCAL FROM( SELECT DB.DATABASE_NAME AS INDEX_OWNER, SUBSTR(TB1.TABLE_NAME, 7 + INSTR(SUBSTR(TB1.TABLE_NAME, 7), '_')) AS INDEX_NAME, TB1.TABLE_ID AS INDEX_TABLE_ID, TB1.DATA_TABLE_ID AS DATA_TABLE_ID, TB1.INDEX_TYPE AS INDEX_TYPE, TB1.PART_LEVEL AS PART_LEVEL /*USE DATA TABLE'S PART_LEVEL IF INDEX IS LOCAL INDEX*/ FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB1, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE DB.DATABASE_NAME!='__recyclebin' AND TB1.DATABASE_ID=DB.DATABASE_ID AND TB1.TABLE_TYPE=5 AND TB1.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() ) A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB2 ON A.DATA_TABLE_ID=TB2.TABLE_ID AND TB2.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE A.PART_LEVEL=2 OR ((A.INDEX_TYPE=1 OR A.INDEX_TYPE=2) AND TB2.PART_LEVEL=2) ) B, SYS.ALL_VIRTUAL_PART_REAL_AGENT PART, SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT SUB_PART WHERE ((B.IS_LOCAL='FALSE' AND B.TABLE_ID=PART.TABLE_ID AND PART.TABLE_ID=SUB_PART.TABLE_ID AND PART.PART_ID=SUB_PART.PART_ID) OR (B.IS_LOCAL='TRUE' AND B.DATA_TABLE_ID=PART.TABLE_ID AND PART.TABLE_ID=SUB_PART.TABLE_ID AND PART.PART_ID=SUB_PART.PART_ID)) AND SUB_PART.TENANT_ID = EFFECTIVE_TENANT_ID() AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1044,17 +1008,16 @@ int ObInnerTableSchema::dba_ind_subpartitions_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_ind_subpartitions_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_ind_subpartitions_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1085,8 +1048,7 @@ int ObInnerTableSchema::all_ind_subpartitions_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(B.INDEX_OWNER AS VARCHAR2(128)) AS INDEX_OWNER, CAST(B.INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(PART.PART_NAME AS VARCHAR2(128)) AS PARTITION_NAME, CAST(SUB_PART.SUB_PART_NAME AS VARCHAR2(128)) AS SUBPARTITION_NAME, CAST(SUB_PART.HIGH_BOUND_VAL AS VARCHAR2(1024)) AS HIGH_VALUE, CAST(LENGTH(SUB_PART.HIGH_BOUND_VAL) AS NUMBER) AS HIGH_VALUE_LENGTH, SUB_PART.SUB_PART_ID + 1 AS SUBPARTITION_POSITION, CAST(NULL AS VARCHAR2(8)) AS STATUS, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENT, CAST(NULL AS NUMBER) AS MAX_EXTENT, CAST(NULL AS NUMBER) AS MAX_SIZE, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS INTERVAL, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM( SELECT A.INDEX_OWNER AS INDEX_OWNER, A.INDEX_NAME AS INDEX_NAME, A.INDEX_TABLE_ID AS TABLE_ID, /*INDEX TABLE ID*/ A.DATA_TABLE_ID AS DATA_TABLE_ID, A.PART_LEVEL AS INDEX_TABLE_PART_LEVEL, TB2.PART_LEVEL AS DATA_TABLE_PART_LEVEL, /* CAST(CASE WHEN A.PART_LEVEL=2 THEN 'FALSE' ELSE 'TRUE' END AS VARCHAR2(5)) IS_LOCAL */ CAST('TRUE' AS VARCHAR2(5)) AS IS_LOCAL FROM( SELECT DB.DATABASE_NAME AS INDEX_OWNER, SUBSTR(TB1.TABLE_NAME, 7 + INSTR(SUBSTR(TB1.TABLE_NAME, 7), '_')) AS INDEX_NAME, TB1.TABLE_ID AS INDEX_TABLE_ID, TB1.DATA_TABLE_ID AS DATA_TABLE_ID, TB1.INDEX_TYPE AS INDEX_TYPE, TB1.PART_LEVEL AS PART_LEVEL /*USE DATA TABLE'S PART_LEVEL IF INDEX IS LOCAL INDEX*/ FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB1, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE DB.DATABASE_NAME!='__recyclebin' AND TB1.DATABASE_ID=DB.DATABASE_ID AND TB1.TABLE_TYPE=5 AND TB1.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND (TB1.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, TB1.DATA_TABLE_ID, TB1.DATABASE_ID) = 1) ) A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB2 ON A.DATA_TABLE_ID=TB2.TABLE_ID AND TB2.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE A.PART_LEVEL=2 OR ((A.INDEX_TYPE=1 OR A.INDEX_TYPE=2) AND TB2.PART_LEVEL=2) ) B, SYS.ALL_VIRTUAL_PART_REAL_AGENT PART, SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT SUB_PART WHERE ((B.IS_LOCAL='FALSE' AND B.TABLE_ID=PART.TABLE_ID AND PART.TABLE_ID=SUB_PART.TABLE_ID AND PART.PART_ID=SUB_PART.PART_ID) OR (B.IS_LOCAL='TRUE' AND B.DATA_TABLE_ID=PART.TABLE_ID AND PART.TABLE_ID=SUB_PART.TABLE_ID AND PART.PART_ID=SUB_PART.PART_ID)) AND SUB_PART.TENANT_ID = EFFECTIVE_TENANT_ID() AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(B.INDEX_OWNER AS VARCHAR2(128)) AS INDEX_OWNER, CAST(B.INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(PART.PART_NAME AS VARCHAR2(128)) AS PARTITION_NAME, CAST(SUB_PART.SUB_PART_NAME AS VARCHAR2(128)) AS SUBPARTITION_NAME, CAST(SUB_PART.HIGH_BOUND_VAL AS VARCHAR2(1024)) AS HIGH_VALUE, CAST(LENGTH(SUB_PART.HIGH_BOUND_VAL) AS NUMBER) AS HIGH_VALUE_LENGTH, SUB_PART.SUB_PART_ID + 1 AS SUBPARTITION_POSITION, CAST(NULL AS VARCHAR2(8)) AS STATUS, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENT, CAST(NULL AS NUMBER) AS MAX_EXTENT, CAST(NULL AS NUMBER) AS MAX_SIZE, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS INTERVAL, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM( SELECT A.INDEX_OWNER AS INDEX_OWNER, A.INDEX_NAME AS INDEX_NAME, A.INDEX_TABLE_ID AS TABLE_ID, /*INDEX TABLE ID*/ A.DATA_TABLE_ID AS DATA_TABLE_ID, A.PART_LEVEL AS INDEX_TABLE_PART_LEVEL, TB2.PART_LEVEL AS DATA_TABLE_PART_LEVEL, /* CAST(CASE WHEN A.PART_LEVEL=2 THEN 'FALSE' ELSE 'TRUE' END AS VARCHAR2(5)) IS_LOCAL */ CAST('TRUE' AS VARCHAR2(5)) AS IS_LOCAL FROM( SELECT DB.DATABASE_NAME AS INDEX_OWNER, SUBSTR(TB1.TABLE_NAME, 7 + INSTR(SUBSTR(TB1.TABLE_NAME, 7), '_')) AS INDEX_NAME, TB1.TABLE_ID AS INDEX_TABLE_ID, TB1.DATA_TABLE_ID AS DATA_TABLE_ID, TB1.INDEX_TYPE AS INDEX_TYPE, TB1.PART_LEVEL AS PART_LEVEL /*USE DATA TABLE'S PART_LEVEL IF INDEX IS LOCAL INDEX*/ FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB1, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE DB.DATABASE_NAME!='__recyclebin' AND TB1.DATABASE_ID=DB.DATABASE_ID AND TB1.TABLE_TYPE=5 AND TB1.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND (TB1.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, TB1.DATA_TABLE_ID, TB1.DATABASE_ID) = 1) ) A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB2 ON A.DATA_TABLE_ID=TB2.TABLE_ID AND TB2.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE A.PART_LEVEL=2 OR ((A.INDEX_TYPE=1 OR A.INDEX_TYPE=2) AND TB2.PART_LEVEL=2) ) B, SYS.ALL_VIRTUAL_PART_REAL_AGENT PART, SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT SUB_PART WHERE ((B.IS_LOCAL='FALSE' AND B.TABLE_ID=PART.TABLE_ID AND PART.TABLE_ID=SUB_PART.TABLE_ID AND PART.PART_ID=SUB_PART.PART_ID) OR (B.IS_LOCAL='TRUE' AND B.DATA_TABLE_ID=PART.TABLE_ID AND PART.TABLE_ID=SUB_PART.TABLE_ID AND PART.PART_ID=SUB_PART.PART_ID)) AND SUB_PART.TENANT_ID = EFFECTIVE_TENANT_ID() AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1098,17 +1060,16 @@ int ObInnerTableSchema::all_ind_subpartitions_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_ind_subpartitions_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_ind_subpartitions_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1139,8 +1100,7 @@ int ObInnerTableSchema::user_ind_subpartitions_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(B.INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(PART.PART_NAME AS VARCHAR2(30)) AS PARTITION_NAME, CAST(SUB_PART.SUB_PART_NAME AS VARCHAR2(128)) AS SUBPARTITION_NAME, CAST(SUB_PART.HIGH_BOUND_VAL AS VARCHAR2(1024)) AS HIGH_VALUE, CAST(LENGTH(SUB_PART.HIGH_BOUND_VAL) AS NUMBER) AS HIGH_VALUE_LENGTH, SUB_PART.SUB_PART_ID + 1 AS SUBPARTITION_POSITION, CAST(NULL AS VARCHAR2(8)) AS STATUS, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENT, CAST(NULL AS NUMBER) AS MAX_EXTENT, CAST(NULL AS NUMBER) AS MAX_SIZE, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS INTERVAL, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM( SELECT A.INDEX_OWNER AS INDEX_OWNER, A.INDEX_NAME AS INDEX_NAME, A.INDEX_TABLE_ID AS TABLE_ID, /*INDEX TABLE ID */ A.DATA_TABLE_ID AS DATA_TABLE_ID, A.PART_LEVEL AS INDEX_TABLE_PART_LEVEL, TB2.PART_LEVEL AS DATA_TABLE_PART_LEVEL, /* CAST(CASE WHEN A.PART_LEVEL=2 THEN 'FALSE' ELSE 'TRUE' END AS VARCHAR2(5)) IS_LOCAL */ CAST('TRUE' AS VARCHAR2(5)) AS IS_LOCAL FROM( SELECT DB.DATABASE_NAME AS INDEX_OWNER, SUBSTR(TB1.TABLE_NAME, 7 + INSTR(SUBSTR(TB1.TABLE_NAME, 7), '_')) AS INDEX_NAME, TB1.TABLE_ID AS INDEX_TABLE_ID, TB1.DATA_TABLE_ID AS DATA_TABLE_ID, TB1.INDEX_TYPE AS INDEX_TYPE, TB1.PART_LEVEL AS PART_LEVEL /*USE DATA TABLE'S PART_LEVEL IF INDEX IS LOCAL INDEX*/ FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB1, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE DB.DATABASE_NAME!='__recyclebin' AND TB1.DATABASE_ID=DB.DATABASE_ID AND TB1.TABLE_TYPE=5 AND TB1.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() ) A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB2 ON A.DATA_TABLE_ID=TB2.TABLE_ID AND TB2.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE A.PART_LEVEL=2 OR ((A.INDEX_TYPE=1 OR A.INDEX_TYPE=2) AND TB2.PART_LEVEL=2) ) B, SYS.ALL_VIRTUAL_PART_REAL_AGENT PART, SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT SUB_PART WHERE ((B.IS_LOCAL='FALSE' AND B.TABLE_ID=PART.TABLE_ID AND PART.TABLE_ID=SUB_PART.TABLE_ID AND PART.PART_ID=SUB_PART.PART_ID) OR (B.IS_LOCAL='TRUE' AND B.DATA_TABLE_ID=PART.TABLE_ID AND PART.TABLE_ID=SUB_PART.TABLE_ID AND PART.PART_ID=SUB_PART.PART_ID)) AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() AND SUB_PART.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(B.INDEX_NAME AS VARCHAR2(128)) AS INDEX_NAME, CAST(PART.PART_NAME AS VARCHAR2(30)) AS PARTITION_NAME, CAST(SUB_PART.SUB_PART_NAME AS VARCHAR2(128)) AS SUBPARTITION_NAME, CAST(SUB_PART.HIGH_BOUND_VAL AS VARCHAR2(1024)) AS HIGH_VALUE, CAST(LENGTH(SUB_PART.HIGH_BOUND_VAL) AS NUMBER) AS HIGH_VALUE_LENGTH, SUB_PART.SUB_PART_ID + 1 AS SUBPARTITION_POSITION, CAST(NULL AS VARCHAR2(8)) AS STATUS, CAST(NULL AS VARCHAR2(30)) AS TABLESPACE_NAME, CAST(NULL AS NUMBER) AS PCT_FREE, CAST(NULL AS NUMBER) AS INI_TRANS, CAST(NULL AS NUMBER) AS MAX_TRANS, CAST(NULL AS NUMBER) AS INITIAL_EXTENT, CAST(NULL AS NUMBER) AS NEXT_EXTENT, CAST(NULL AS NUMBER) AS MIN_EXTENT, CAST(NULL AS NUMBER) AS MAX_EXTENT, CAST(NULL AS NUMBER) AS MAX_SIZE, CAST(NULL AS NUMBER) AS PCT_INCREASE, CAST(NULL AS NUMBER) AS FREELISTS, CAST(NULL AS NUMBER) AS FREELIST_GROUPS, CAST(NULL AS VARCHAR2(7)) AS LOGGING, CAST(CASE WHEN PART.COMPRESS_FUNC_NAME IS NULL THEN 'DISABLED' ELSE 'ENABLED' END AS VARCHAR2(8)) AS COMPRESSION, CAST(NULL AS NUMBER) AS BLEVEL, CAST(NULL AS NUMBER) AS LEAF_BLOCKS, CAST(NULL AS NUMBER) AS DISTINCT_KEYS, CAST(NULL AS NUMBER) AS AVG_LEAF_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS AVG_DATA_BLOCKS_PER_KEY, CAST(NULL AS NUMBER) AS CLUSTERING_FACTOR, CAST(NULL AS NUMBER) AS NUM_ROWS, CAST(NULL AS NUMBER) AS SAMPLE_SIZE, CAST(NULL AS DATE) AS LAST_ANALYZED, CAST(NULL AS VARCHAR2(7)) AS BUFFER_POOL, CAST(NULL AS VARCHAR2(7)) AS FLASH_CACHE, CAST(NULL AS VARCHAR2(7)) AS CELL_FLASH_CACHE, CAST(NULL AS VARCHAR2(3)) AS USER_STATS, CAST(NULL AS NUMBER) AS PCT_DIRECT_ACCESS, CAST(NULL AS VARCHAR2(3)) AS GLOBAL_STATS, CAST(NULL AS VARCHAR2(6)) AS DOMIDX_OPSTATUS, CAST(NULL AS VARCHAR2(1000)) AS PARAMETERS, CAST(NULL AS VARCHAR2(3)) AS INTERVAL, CAST(NULL AS VARCHAR2(3)) AS SEGMENT_CREATED FROM( SELECT A.INDEX_OWNER AS INDEX_OWNER, A.INDEX_NAME AS INDEX_NAME, A.INDEX_TABLE_ID AS TABLE_ID, /*INDEX TABLE ID */ A.DATA_TABLE_ID AS DATA_TABLE_ID, A.PART_LEVEL AS INDEX_TABLE_PART_LEVEL, TB2.PART_LEVEL AS DATA_TABLE_PART_LEVEL, /* CAST(CASE WHEN A.PART_LEVEL=2 THEN 'FALSE' ELSE 'TRUE' END AS VARCHAR2(5)) IS_LOCAL */ CAST('TRUE' AS VARCHAR2(5)) AS IS_LOCAL FROM( SELECT DB.DATABASE_NAME AS INDEX_OWNER, SUBSTR(TB1.TABLE_NAME, 7 + INSTR(SUBSTR(TB1.TABLE_NAME, 7), '_')) AS INDEX_NAME, TB1.TABLE_ID AS INDEX_TABLE_ID, TB1.DATA_TABLE_ID AS DATA_TABLE_ID, TB1.INDEX_TYPE AS INDEX_TYPE, TB1.PART_LEVEL AS PART_LEVEL /*USE DATA TABLE'S PART_LEVEL IF INDEX IS LOCAL INDEX*/ FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB1, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB WHERE DB.DATABASE_NAME!='__recyclebin' AND TB1.DATABASE_ID=DB.DATABASE_ID AND TB1.TABLE_TYPE=5 AND TB1.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() ) A JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TB2 ON A.DATA_TABLE_ID=TB2.TABLE_ID AND TB2.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE A.PART_LEVEL=2 OR ((A.INDEX_TYPE=1 OR A.INDEX_TYPE=2) AND TB2.PART_LEVEL=2) ) B, SYS.ALL_VIRTUAL_PART_REAL_AGENT PART, SYS.ALL_VIRTUAL_SUB_PART_REAL_AGENT SUB_PART WHERE ((B.IS_LOCAL='FALSE' AND B.TABLE_ID=PART.TABLE_ID AND PART.TABLE_ID=SUB_PART.TABLE_ID AND PART.PART_ID=SUB_PART.PART_ID) OR (B.IS_LOCAL='TRUE' AND B.DATA_TABLE_ID=PART.TABLE_ID AND PART.TABLE_ID=SUB_PART.TABLE_ID AND PART.PART_ID=SUB_PART.PART_ID)) AND PART.TENANT_ID = EFFECTIVE_TENANT_ID() AND SUB_PART.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1152,17 +1112,16 @@ int ObInnerTableSchema::user_ind_subpartitions_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_roles_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_roles_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1193,8 +1152,7 @@ int ObInnerTableSchema::dba_roles_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT CAST(USER_NAME AS VARCHAR2(30)) ROLE, CAST('NO' AS VARCHAR2(8)) PASSWORD_REQUIRED, CAST('NONE' AS VARCHAR2(11)) AUTHENTICATION_TYPE FROM SYS.ALL_VIRTUAL_USER_REAL_AGENT U WHERE U.TYPE = 1 AND U.TENANT_ID = EFFECTIVE_TENANT_ID())__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(USER_NAME AS VARCHAR2(30)) ROLE, CAST('NO' AS VARCHAR2(8)) PASSWORD_REQUIRED, CAST('NONE' AS VARCHAR2(11)) AUTHENTICATION_TYPE FROM SYS.ALL_VIRTUAL_USER_REAL_AGENT U WHERE U.TYPE = 1 AND U.TENANT_ID = EFFECTIVE_TENANT_ID())__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1206,17 +1164,16 @@ int ObInnerTableSchema::dba_roles_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_role_privs_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_role_privs_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1247,8 +1204,7 @@ int ObInnerTableSchema::dba_role_privs_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT CAST(A.USER_NAME AS VARCHAR2(30)) GRANTEE, CAST(B.USER_NAME AS VARCHAR2(30)) GRANTED_ROLE, DECODE(R.ADMIN_OPTION, 0, 'NO', 1, 'YES', '') AS ADMIN_OPTION , DECODE(R.DISABLE_FLAG, 0, 'YES', 1, 'NO', '') AS DEFAULT_ROLE FROM SYS.ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT R, SYS.ALL_VIRTUAL_USER_REAL_AGENT A, SYS.ALL_VIRTUAL_USER_REAL_AGENT B WHERE R.GRANTEE_ID = A.USER_ID AND R.ROLE_ID = B.USER_ID AND B.TYPE = 1 AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID())__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(A.USER_NAME AS VARCHAR2(30)) GRANTEE, CAST(B.USER_NAME AS VARCHAR2(30)) GRANTED_ROLE, DECODE(R.ADMIN_OPTION, 0, 'NO', 1, 'YES', '') AS ADMIN_OPTION , DECODE(R.DISABLE_FLAG, 0, 'YES', 1, 'NO', '') AS DEFAULT_ROLE FROM SYS.ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT R, SYS.ALL_VIRTUAL_USER_REAL_AGENT A, SYS.ALL_VIRTUAL_USER_REAL_AGENT B WHERE R.GRANTEE_ID = A.USER_ID AND R.ROLE_ID = B.USER_ID AND B.TYPE = 1 AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID())__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1260,17 +1216,16 @@ int ObInnerTableSchema::dba_role_privs_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_role_privs_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_role_privs_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1301,8 +1256,7 @@ int ObInnerTableSchema::user_role_privs_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT CAST(A.USER_NAME AS VARCHAR2(30)) GRANTEE, CAST(B.USER_NAME AS VARCHAR2(30)) GRANTED_ROLE, DECODE(R.ADMIN_OPTION, 0, 'NO', 1, 'YES', '') AS ADMIN_OPTION , DECODE(R.DISABLE_FLAG, 0, 'YES', 1, 'NO', '') AS DEFAULT_ROLE FROM SYS.ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT R, SYS.ALL_VIRTUAL_USER_REAL_AGENT A, SYS.ALL_VIRTUAL_USER_REAL_AGENT B WHERE R.GRANTEE_ID = A.USER_ID AND R.ROLE_ID = B.USER_ID AND B.TYPE = 1 AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND A.USER_NAME = SYS_CONTEXT('USERENV','CURRENT_USER'))__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(A.USER_NAME AS VARCHAR2(30)) GRANTEE, CAST(B.USER_NAME AS VARCHAR2(30)) GRANTED_ROLE, DECODE(R.ADMIN_OPTION, 0, 'NO', 1, 'YES', '') AS ADMIN_OPTION , DECODE(R.DISABLE_FLAG, 0, 'YES', 1, 'NO', '') AS DEFAULT_ROLE FROM SYS.ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT R, SYS.ALL_VIRTUAL_USER_REAL_AGENT A, SYS.ALL_VIRTUAL_USER_REAL_AGENT B WHERE R.GRANTEE_ID = A.USER_ID AND R.ROLE_ID = B.USER_ID AND B.TYPE = 1 AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND A.USER_NAME = SYS_CONTEXT('USERENV','CURRENT_USER'))__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1314,17 +1268,16 @@ int ObInnerTableSchema::user_role_privs_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_tab_privs_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_tab_privs_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1355,8 +1308,7 @@ int ObInnerTableSchema::dba_tab_privs_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT C.USER_NAME AS GRANTEE, E.DATABASE_NAME AS OWNER, CAST (DECODE(A.OBJTYPE,11, SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')), D.TABLE_NAME) AS VARCHAR(128)) AS TABLE_NAME, B.USER_NAME AS GRANTOR, CAST (DECODE(A.PRIV_ID, 1, 'ALTER', 2, 'AUDIT', 3, 'COMMENT', 4, 'DELETE', 5, 'GRANT', 6, 'INDEX', 7, 'INSERT', 8, 'LOCK', 9, 'RENAME', 10, 'SELECT', 11, 'UPDATE', 12, 'REFERENCES', 13, 'EXECUTE', 14, 'CREATE', 15, 'FLASHBACK', 16, 'READ', 17, 'WRITE', 'OTHERS') AS VARCHAR(40)) AS PRIVILEGE, DECODE(A.PRIV_OPTION,0,'NO', 1,'YES','') AS GRANTABLE, CAST('NO' AS VARCHAR(10)) AS HIERARCHY FROM SYS.ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT A , SYS.ALL_VIRTUAL_USER_REAL_AGENT B, SYS.ALL_VIRTUAL_USER_REAL_AGENT C, (SELECT TABLE_ID, TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT PACKAGE_ID AS TABLE_ID, PACKAGE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT ROUTINE_ID AS TABLE_ID, ROUTINE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT SEQUENCE_ID AS TABLE_ID, SEQUENCE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() ) D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E WHERE A.GRANTOR_ID = B.USER_ID AND A.GRANTEE_ID = C.USER_ID AND A.COL_ID = 65535 AND A.OBJ_ID = D.TABLE_ID AND D.DATABASE_ID=E.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.DATABASE_NAME != '__recyclebin' )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT C.USER_NAME AS GRANTEE, E.DATABASE_NAME AS OWNER, CAST (DECODE(A.OBJTYPE,11, SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')), D.TABLE_NAME) AS VARCHAR(128)) AS TABLE_NAME, B.USER_NAME AS GRANTOR, CAST (DECODE(A.PRIV_ID, 1, 'ALTER', 2, 'AUDIT', 3, 'COMMENT', 4, 'DELETE', 5, 'GRANT', 6, 'INDEX', 7, 'INSERT', 8, 'LOCK', 9, 'RENAME', 10, 'SELECT', 11, 'UPDATE', 12, 'REFERENCES', 13, 'EXECUTE', 14, 'CREATE', 15, 'FLASHBACK', 16, 'READ', 17, 'WRITE', 'OTHERS') AS VARCHAR(40)) AS PRIVILEGE, DECODE(A.PRIV_OPTION,0,'NO', 1,'YES','') AS GRANTABLE, CAST('NO' AS VARCHAR(10)) AS HIERARCHY FROM SYS.ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT A , SYS.ALL_VIRTUAL_USER_REAL_AGENT B, SYS.ALL_VIRTUAL_USER_REAL_AGENT C, (SELECT TABLE_ID, TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT PACKAGE_ID AS TABLE_ID, PACKAGE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT ROUTINE_ID AS TABLE_ID, ROUTINE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT SEQUENCE_ID AS TABLE_ID, SEQUENCE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() ) D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E WHERE A.GRANTOR_ID = B.USER_ID AND A.GRANTEE_ID = C.USER_ID AND A.COL_ID = 65535 AND A.OBJ_ID = D.TABLE_ID AND D.DATABASE_ID=E.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.DATABASE_NAME != '__recyclebin' )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1368,17 +1320,16 @@ int ObInnerTableSchema::dba_tab_privs_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tab_privs_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tab_privs_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1409,8 +1360,7 @@ int ObInnerTableSchema::all_tab_privs_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT B.USER_NAME AS GRANTOR, C.USER_NAME AS GRANTEE, E.DATABASE_NAME AS TABLE_SCHEMA, CAST (DECODE(A.OBJTYPE,11, SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')), D.TABLE_NAME) AS VARCHAR(128)) AS TABLE_NAME, CAST (DECODE(A.PRIV_ID, 1, 'ALTER', 2, 'AUDIT', 3, 'COMMENT', 4, 'DELETE', 5, 'GRANT', 6, 'INDEX', 7, 'INSERT', 8, 'LOCK', 9, 'RENAME', 10, 'SELECT', 11, 'UPDATE', 12, 'REFERENCES', 13, 'EXECUTE', 14, 'CREATE', 15, 'FLASHBACK', 16, 'READ', 17, 'WRITE', 'OTHERS') AS VARCHAR(40)) AS PRIVILEGE, DECODE(A.PRIV_OPTION,0,'NO', 1,'YES','') AS GRANTABLE, CAST('NO' AS VARCHAR(10)) AS HIERARCHY FROM SYS.ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT A , SYS.ALL_VIRTUAL_USER_REAL_AGENT B, SYS.ALL_VIRTUAL_USER_REAL_AGENT C, (SELECT TABLE_ID, TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT PACKAGE_ID AS TABLE_ID, PACKAGE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT ROUTINE_ID AS TABLE_ID, ROUTINE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT SEQUENCE_ID AS TABLE_ID, SEQUENCE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() ) D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E WHERE A.GRANTOR_ID = B.USER_ID AND A.GRANTEE_ID = C.USER_ID AND A.COL_ID = 65535 AND A.OBJ_ID = D.TABLE_ID AND D.DATABASE_ID=E.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.DATABASE_NAME != '__recyclebin' AND (C.USER_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') OR E.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') OR B.USER_NAME = SYS_CONTEXT('USERENV','CURRENT_USER')) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT B.USER_NAME AS GRANTOR, C.USER_NAME AS GRANTEE, E.DATABASE_NAME AS TABLE_SCHEMA, CAST (DECODE(A.OBJTYPE,11, SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')), D.TABLE_NAME) AS VARCHAR(128)) AS TABLE_NAME, CAST (DECODE(A.PRIV_ID, 1, 'ALTER', 2, 'AUDIT', 3, 'COMMENT', 4, 'DELETE', 5, 'GRANT', 6, 'INDEX', 7, 'INSERT', 8, 'LOCK', 9, 'RENAME', 10, 'SELECT', 11, 'UPDATE', 12, 'REFERENCES', 13, 'EXECUTE', 14, 'CREATE', 15, 'FLASHBACK', 16, 'READ', 17, 'WRITE', 'OTHERS') AS VARCHAR(40)) AS PRIVILEGE, DECODE(A.PRIV_OPTION,0,'NO', 1,'YES','') AS GRANTABLE, CAST('NO' AS VARCHAR(10)) AS HIERARCHY FROM SYS.ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT A , SYS.ALL_VIRTUAL_USER_REAL_AGENT B, SYS.ALL_VIRTUAL_USER_REAL_AGENT C, (SELECT TABLE_ID, TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT PACKAGE_ID AS TABLE_ID, PACKAGE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT ROUTINE_ID AS TABLE_ID, ROUTINE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT SEQUENCE_ID AS TABLE_ID, SEQUENCE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() ) D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E WHERE A.GRANTOR_ID = B.USER_ID AND A.GRANTEE_ID = C.USER_ID AND A.COL_ID = 65535 AND A.OBJ_ID = D.TABLE_ID AND D.DATABASE_ID=E.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.DATABASE_NAME != '__recyclebin' AND (C.USER_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') OR E.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') OR B.USER_NAME = SYS_CONTEXT('USERENV','CURRENT_USER')) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1422,17 +1372,16 @@ int ObInnerTableSchema::all_tab_privs_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_tab_privs_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_tab_privs_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1463,8 +1412,7 @@ int ObInnerTableSchema::user_tab_privs_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT C.USER_NAME AS GRANTEE, E.DATABASE_NAME AS OWNER, CAST (DECODE(A.OBJTYPE,11, SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')), D.TABLE_NAME) AS VARCHAR(128)) AS TABLE_NAME, B.USER_NAME AS GRANTOR, CAST (DECODE(A.PRIV_ID, 1, 'ALTER', 2, 'AUDIT', 3, 'COMMENT', 4, 'DELETE', 5, 'GRANT', 6, 'INDEX', 7, 'INSERT', 8, 'LOCK', 9, 'RENAME', 10, 'SELECT', 11, 'UPDATE', 12, 'REFERENCES', 13, 'EXECUTE', 14, 'CREATE', 15, 'FLASHBACK', 16, 'READ', 17, 'WRITE', 'OTHERS') AS VARCHAR(40)) AS PRIVILEGE, DECODE(A.PRIV_OPTION,0,'NO', 1,'YES','') AS GRANTABLE, CAST('NO' AS VARCHAR(10)) AS HIERARCHY FROM SYS.ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT A , SYS.ALL_VIRTUAL_USER_REAL_AGENT B, SYS.ALL_VIRTUAL_USER_REAL_AGENT C, (SELECT TABLE_ID, TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT PACKAGE_ID AS TABLE_ID, PACKAGE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT ROUTINE_ID AS TABLE_ID, ROUTINE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT SEQUENCE_ID AS TABLE_ID, SEQUENCE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() ) D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E WHERE A.GRANTOR_ID = B.USER_ID AND A.GRANTEE_ID = C.USER_ID AND A.COL_ID = 65535 AND A.OBJ_ID = D.TABLE_ID AND D.DATABASE_ID=E.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.DATABASE_NAME != '__recyclebin' AND (SYS_CONTEXT('USERENV','CURRENT_USER') IN (C.USER_NAME, B.USER_NAME) OR E.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER')) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT C.USER_NAME AS GRANTEE, E.DATABASE_NAME AS OWNER, CAST (DECODE(A.OBJTYPE,11, SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')), D.TABLE_NAME) AS VARCHAR(128)) AS TABLE_NAME, B.USER_NAME AS GRANTOR, CAST (DECODE(A.PRIV_ID, 1, 'ALTER', 2, 'AUDIT', 3, 'COMMENT', 4, 'DELETE', 5, 'GRANT', 6, 'INDEX', 7, 'INSERT', 8, 'LOCK', 9, 'RENAME', 10, 'SELECT', 11, 'UPDATE', 12, 'REFERENCES', 13, 'EXECUTE', 14, 'CREATE', 15, 'FLASHBACK', 16, 'READ', 17, 'WRITE', 'OTHERS') AS VARCHAR(40)) AS PRIVILEGE, DECODE(A.PRIV_OPTION,0,'NO', 1,'YES','') AS GRANTABLE, CAST('NO' AS VARCHAR(10)) AS HIERARCHY FROM SYS.ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT A , SYS.ALL_VIRTUAL_USER_REAL_AGENT B, SYS.ALL_VIRTUAL_USER_REAL_AGENT C, (SELECT TABLE_ID, TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT PACKAGE_ID AS TABLE_ID, PACKAGE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT ROUTINE_ID AS TABLE_ID, ROUTINE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT SEQUENCE_ID AS TABLE_ID, SEQUENCE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() ) D, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT E WHERE A.GRANTOR_ID = B.USER_ID AND A.GRANTEE_ID = C.USER_ID AND A.COL_ID = 65535 AND A.OBJ_ID = D.TABLE_ID AND D.DATABASE_ID=E.DATABASE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.TENANT_ID = EFFECTIVE_TENANT_ID() AND E.DATABASE_NAME != '__recyclebin' AND (SYS_CONTEXT('USERENV','CURRENT_USER') IN (C.USER_NAME, B.USER_NAME) OR E.DATABASE_NAME = SYS_CONTEXT('USERENV','CURRENT_USER')) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1476,17 +1424,16 @@ int ObInnerTableSchema::user_tab_privs_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_sys_privs_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_sys_privs_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1517,8 +1464,7 @@ int ObInnerTableSchema::dba_sys_privs_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema - .set_view_definition(R"__( SELECT B.USER_NAME AS GRANTEE, CAST (DECODE(A.PRIV_ID, 1, 'CREATE SESSION', 2, 'EXEMPT REDACT POLICY', 3, 'SYSDBA', 4, 'SYSOPER', 5, 'SYSBACKUP', 6, 'CREATE TABLE', 7, 'CREATE ANY TABLE', 8, 'ALTER ANY TABLE', 9, 'BACKUP ANY TABLE', 10, 'DROP ANY TABLE', 11, 'LOCK ANY TABLE', 12, 'COMMENT ANY TABLE', 13, 'SELECT ANY TABLE', 14, 'INSERT ANY TABLE', 15, 'UPDATE ANY TABLE', 16, 'DELETE ANY TABLE', 17, 'FLASHBACK ANY TABLE', 18, 'CREATE ROLE', 19, 'DROP ANY ROLE', 20, 'GRANT ANY ROLE', 21, 'ALTER ANY ROLE', 22, 'AUDIT ANY', 23, 'GRANT ANY PRIVILEGE', 24, 'GRANT ANY OBJECT PRIVILEGE', 25, 'CREATE ANY INDEX', 26, 'ALTER ANY INDEX', 27, 'DROP ANY INDEX', 28, 'CREATE ANY VIEW', 29, 'DROP ANY VIEW', 30, 'CREATE VIEW', 31, 'SELECT ANY DICTIONARY', 32, 'CREATE PROCEDURE', 33, 'CREATE ANY PROCEDURE', 34, 'ALTER ANY PROCEDURE', 35, 'DROP ANY PROCEDURE', 36, 'EXECUTE ANY PROCEDURE', 37, 'CREATE SYNONYM', 38, 'CREATE ANY SYNONYM', 39, 'DROP ANY SYNONYM', 40, 'CREATE PUBLIC SYNONYM', 41, 'DROP PUBLIC SYNONYM', 42, 'CREATE SEQUENCE', 43, 'CREATE ANY SEQUENCE', 44, 'ALTER ANY SEQUENCE', 45, 'DROP ANY SEQUENCE', 46, 'SELECT ANY SEQUENCE', 47, 'CREATE TRIGGER', 48, 'CREATE ANY TRIGGER', 49, 'ALTER ANY TRIGGER', 50, 'DROP ANY TRIGGER', 51, 'CREATE PROFILE', 52, 'ALTER PROFILE', 53, 'DROP PROFILE', 54, 'CREATE USER', 55, 'BECOME USER', 56, 'ALTER USER', 57, 'DROP USER', 58, 'CREATE TYPE', 59, 'CREATE ANY TYPE', 60, 'ALTER ANY TYPE', 61, 'DROP ANY TYPE', 62, 'EXECUTE ANY TYPE', 63, 'UNDER ANY TYPE', 64, 'PURGE DBA_RECYCLEBIN', 65, 'CREATE ANY OUTLINE', 66, 'ALTER ANY OUTLINE', 67, 'DROP ANY OUTLINE', 68, 'SYSKM', 69, 'CREATE TABLESPACE', 70, 'ALTER TABLESPACE', 71, 'DROP TABLESPACE', 72, 'SHOW PROCESS', 73, 'ALTER SYSTEM', 74, 'CREATE DATABASE LINK', 75, 'CREATE PUBLIC DATABASE LINK', 76, 'DROP DATABASE LINK', 77, 'ALTER SESSION', 78, 'ALTER DATABASE', 'OTHER') AS VARCHAR(40)) AS PRIVILEGE, CASE PRIV_OPTION WHEN 0 THEN 'NO' ELSE 'YES' END AS ADMIN_OPTION FROM SYS.ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT A, SYS.ALL_VIRTUAL_USER_REAL_AGENT B WHERE A.GRANTEE_ID = B.USER_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT B.USER_NAME AS GRANTEE, CAST (DECODE(A.PRIV_ID, 1, 'CREATE SESSION', 2, 'EXEMPT REDACT POLICY', 3, 'SYSDBA', 4, 'SYSOPER', 5, 'SYSBACKUP', 6, 'CREATE TABLE', 7, 'CREATE ANY TABLE', 8, 'ALTER ANY TABLE', 9, 'BACKUP ANY TABLE', 10, 'DROP ANY TABLE', 11, 'LOCK ANY TABLE', 12, 'COMMENT ANY TABLE', 13, 'SELECT ANY TABLE', 14, 'INSERT ANY TABLE', 15, 'UPDATE ANY TABLE', 16, 'DELETE ANY TABLE', 17, 'FLASHBACK ANY TABLE', 18, 'CREATE ROLE', 19, 'DROP ANY ROLE', 20, 'GRANT ANY ROLE', 21, 'ALTER ANY ROLE', 22, 'AUDIT ANY', 23, 'GRANT ANY PRIVILEGE', 24, 'GRANT ANY OBJECT PRIVILEGE', 25, 'CREATE ANY INDEX', 26, 'ALTER ANY INDEX', 27, 'DROP ANY INDEX', 28, 'CREATE ANY VIEW', 29, 'DROP ANY VIEW', 30, 'CREATE VIEW', 31, 'SELECT ANY DICTIONARY', 32, 'CREATE PROCEDURE', 33, 'CREATE ANY PROCEDURE', 34, 'ALTER ANY PROCEDURE', 35, 'DROP ANY PROCEDURE', 36, 'EXECUTE ANY PROCEDURE', 37, 'CREATE SYNONYM', 38, 'CREATE ANY SYNONYM', 39, 'DROP ANY SYNONYM', 40, 'CREATE PUBLIC SYNONYM', 41, 'DROP PUBLIC SYNONYM', 42, 'CREATE SEQUENCE', 43, 'CREATE ANY SEQUENCE', 44, 'ALTER ANY SEQUENCE', 45, 'DROP ANY SEQUENCE', 46, 'SELECT ANY SEQUENCE', 47, 'CREATE TRIGGER', 48, 'CREATE ANY TRIGGER', 49, 'ALTER ANY TRIGGER', 50, 'DROP ANY TRIGGER', 51, 'CREATE PROFILE', 52, 'ALTER PROFILE', 53, 'DROP PROFILE', 54, 'CREATE USER', 55, 'BECOME USER', 56, 'ALTER USER', 57, 'DROP USER', 58, 'CREATE TYPE', 59, 'CREATE ANY TYPE', 60, 'ALTER ANY TYPE', 61, 'DROP ANY TYPE', 62, 'EXECUTE ANY TYPE', 63, 'UNDER ANY TYPE', 64, 'PURGE DBA_RECYCLEBIN', 65, 'CREATE ANY OUTLINE', 66, 'ALTER ANY OUTLINE', 67, 'DROP ANY OUTLINE', 68, 'SYSKM', 69, 'CREATE TABLESPACE', 70, 'ALTER TABLESPACE', 71, 'DROP TABLESPACE', 72, 'SHOW PROCESS', 73, 'ALTER SYSTEM', 74, 'CREATE DATABASE LINK', 75, 'CREATE PUBLIC DATABASE LINK', 76, 'DROP DATABASE LINK', 77, 'ALTER SESSION', 78, 'ALTER DATABASE', 'OTHER') AS VARCHAR(40)) AS PRIVILEGE, CASE PRIV_OPTION WHEN 0 THEN 'NO' ELSE 'YES' END AS ADMIN_OPTION FROM SYS.ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT A, SYS.ALL_VIRTUAL_USER_REAL_AGENT B WHERE A.GRANTEE_ID = B.USER_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1530,17 +1476,16 @@ int ObInnerTableSchema::dba_sys_privs_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_sys_privs_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_sys_privs_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1571,8 +1516,7 @@ int ObInnerTableSchema::user_sys_privs_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT B.USER_NAME AS USERNAME, CAST (DECODE(A.PRIV_ID, 1, 'CREATE SESSION', 2, 'EXEMPT REDACT POLICY', 3, 'SYSDBA', 4, 'SYSOPER', 5, 'SYSBACKUP', 6, 'CREATE TABLE', 7, 'CREATE ANY TABLE', 8, 'ALTER ANY TABLE', 9, 'BACKUP ANY TABLE', 10, 'DROP ANY TABLE', 11, 'LOCK ANY TABLE', 12, 'COMMENT ANY TABLE', 13, 'SELECT ANY TABLE', 14, 'INSERT ANY TABLE', 15, 'UPDATE ANY TABLE', 16, 'DELETE ANY TABLE', 17, 'FLASHBACK ANY TABLE', 18, 'CREATE ROLE', 19, 'DROP ANY ROLE', 20, 'GRANT ANY ROLE', 21, 'ALTER ANY ROLE', 22, 'AUDIT ANY', 23, 'GRANT ANY PRIVILEGE', 24, 'GRANT ANY OBJECT PRIVILEGE', 25, 'CREATE ANY INDEX', 26, 'ALTER ANY INDEX', 27, 'DROP ANY INDEX', 28, 'CREATE ANY VIEW', 29, 'DROP ANY VIEW', 30, 'CREATE VIEW', 31, 'SELECT ANY DICTIONARY', 32, 'CREATE PROCEDURE', 33, 'CREATE ANY PROCEDURE', 34, 'ALTER ANY PROCEDURE', 35, 'DROP ANY PROCEDURE', 36, 'EXECUTE ANY PROCEDURE', 37, 'CREATE SYNONYM', 38, 'CREATE ANY SYNONYM', 39, 'DROP ANY SYNONYM', 40, 'CREATE PUBLIC SYNONYM', 41, 'DROP PUBLIC SYNONYM', 42, 'CREATE SEQUENCE', 43, 'CREATE ANY SEQUENCE', 44, 'ALTER ANY SEQUENCE', 45, 'DROP ANY SEQUENCE', 46, 'SELECT ANY SEQUENCE', 47, 'CREATE TRIGGER', 48, 'CREATE ANY TRIGGER', 49, 'ALTER ANY TRIGGER', 50, 'DROP ANY TRIGGER', 51, 'CREATE PROFILE', 52, 'ALTER PROFILE', 53, 'DROP PROFILE', 54, 'CREATE USER', 55, 'BECOME USER', 56, 'ALTER USER', 57, 'DROP USER', 58, 'CREATE TYPE', 59, 'CREATE ANY TYPE', 60, 'ALTER ANY TYPE', 61, 'DROP ANY TYPE', 62, 'EXECUTE ANY TYPE', 63, 'UNDER ANY TYPE', 64, 'PURGE DBA_RECYCLEBIN', 65, 'CREATE ANY OUTLINE', 66, 'ALTER ANY OUTLINE', 67, 'DROP ANY OUTLINE', 68, 'SYSKM', 69, 'CREATE TABLESPACE', 70, 'ALTER TABLESPACE', 71, 'DROP TABLESPACE', 72, 'SHOW PROCESS', 73, 'ALTER SYSTEM', 74, 'CREATE DATABASE LINK', 75, 'CREATE PUBLIC DATABASE LINK', 76, 'DROP DATABASE LINK', 77, 'ALTER SESSION', 78, 'ALTER DATABASE', 'OTHER') AS VARCHAR(40)) AS PRIVILEGE, CASE PRIV_OPTION WHEN 0 THEN 'NO' ELSE 'YES' END AS ADMIN_OPTION FROM SYS.ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT A, SYS.ALL_VIRTUAL_USER_REAL_AGENT B WHERE B.TYPE = 0 AND A.GRANTEE_ID =B.USER_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.USER_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT B.USER_NAME AS USERNAME, CAST (DECODE(A.PRIV_ID, 1, 'CREATE SESSION', 2, 'EXEMPT REDACT POLICY', 3, 'SYSDBA', 4, 'SYSOPER', 5, 'SYSBACKUP', 6, 'CREATE TABLE', 7, 'CREATE ANY TABLE', 8, 'ALTER ANY TABLE', 9, 'BACKUP ANY TABLE', 10, 'DROP ANY TABLE', 11, 'LOCK ANY TABLE', 12, 'COMMENT ANY TABLE', 13, 'SELECT ANY TABLE', 14, 'INSERT ANY TABLE', 15, 'UPDATE ANY TABLE', 16, 'DELETE ANY TABLE', 17, 'FLASHBACK ANY TABLE', 18, 'CREATE ROLE', 19, 'DROP ANY ROLE', 20, 'GRANT ANY ROLE', 21, 'ALTER ANY ROLE', 22, 'AUDIT ANY', 23, 'GRANT ANY PRIVILEGE', 24, 'GRANT ANY OBJECT PRIVILEGE', 25, 'CREATE ANY INDEX', 26, 'ALTER ANY INDEX', 27, 'DROP ANY INDEX', 28, 'CREATE ANY VIEW', 29, 'DROP ANY VIEW', 30, 'CREATE VIEW', 31, 'SELECT ANY DICTIONARY', 32, 'CREATE PROCEDURE', 33, 'CREATE ANY PROCEDURE', 34, 'ALTER ANY PROCEDURE', 35, 'DROP ANY PROCEDURE', 36, 'EXECUTE ANY PROCEDURE', 37, 'CREATE SYNONYM', 38, 'CREATE ANY SYNONYM', 39, 'DROP ANY SYNONYM', 40, 'CREATE PUBLIC SYNONYM', 41, 'DROP PUBLIC SYNONYM', 42, 'CREATE SEQUENCE', 43, 'CREATE ANY SEQUENCE', 44, 'ALTER ANY SEQUENCE', 45, 'DROP ANY SEQUENCE', 46, 'SELECT ANY SEQUENCE', 47, 'CREATE TRIGGER', 48, 'CREATE ANY TRIGGER', 49, 'ALTER ANY TRIGGER', 50, 'DROP ANY TRIGGER', 51, 'CREATE PROFILE', 52, 'ALTER PROFILE', 53, 'DROP PROFILE', 54, 'CREATE USER', 55, 'BECOME USER', 56, 'ALTER USER', 57, 'DROP USER', 58, 'CREATE TYPE', 59, 'CREATE ANY TYPE', 60, 'ALTER ANY TYPE', 61, 'DROP ANY TYPE', 62, 'EXECUTE ANY TYPE', 63, 'UNDER ANY TYPE', 64, 'PURGE DBA_RECYCLEBIN', 65, 'CREATE ANY OUTLINE', 66, 'ALTER ANY OUTLINE', 67, 'DROP ANY OUTLINE', 68, 'SYSKM', 69, 'CREATE TABLESPACE', 70, 'ALTER TABLESPACE', 71, 'DROP TABLESPACE', 72, 'SHOW PROCESS', 73, 'ALTER SYSTEM', 74, 'CREATE DATABASE LINK', 75, 'CREATE PUBLIC DATABASE LINK', 76, 'DROP DATABASE LINK', 77, 'ALTER SESSION', 78, 'ALTER DATABASE', 'OTHER') AS VARCHAR(40)) AS PRIVILEGE, CASE PRIV_OPTION WHEN 0 THEN 'NO' ELSE 'YES' END AS ADMIN_OPTION FROM SYS.ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT A, SYS.ALL_VIRTUAL_USER_REAL_AGENT B WHERE B.TYPE = 0 AND A.GRANTEE_ID =B.USER_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.USER_NAME = SYS_CONTEXT('USERENV','CURRENT_USER') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1584,17 +1528,16 @@ int ObInnerTableSchema::user_sys_privs_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_col_privs_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_col_privs_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1625,8 +1568,7 @@ int ObInnerTableSchema::dba_col_privs_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT u_grantee.user_name as GRANTEE, db.database_name as OWNER, decode(auth.objtype, 1, t.table_name, '') as TABLE_NAME, c.column_name as COLUMN_NAME, u_grantor.user_name as GRANTOR, cast (decode(auth.priv_id, 1, 'ALTER', 2, 'AUDIT', 3, 'COMMENT', 4, 'DELETE', 5, 'GRANT', 6, 'INDEX', 7, 'INSERT', 8, 'LOCK', 9, 'RENAME', 10, 'SELECT', 11, 'UPDATE', 12, 'REFERENCES', 13, 'EXECUTE', 14, 'CREATE', 15, 'FLASHBACK', 16, 'READ', 17, 'WRITE', 'OTHERS') as varchar(40)) as PRIVILEGE, decode(auth.priv_option, 0, 'NO', 1, 'YES', '') as GRANTABLE FROM sys.all_virtual_objauth_agent auth, sys.ALL_VIRTUAL_COLUMN_REAL_AGENT c, sys.ALL_VIRTUAL_TABLE_REAL_AGENT t, sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db, sys.ALL_VIRTUAL_USER_REAL_AGENT u_grantor, sys.ALL_VIRTUAL_USER_REAL_AGENT u_grantee WHERE auth.col_id = c.column_id and auth.obj_id = t.table_id and auth.objtype = 1 and auth.obj_id = c.table_id and db.database_id = t.database_id and u_grantor.user_id = auth.grantor_id and u_grantee.user_id = auth.grantee_id AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND U_GRANTOR.TENANT_ID = EFFECTIVE_TENANT_ID() AND U_GRANTEE.TENANT_ID = EFFECTIVE_TENANT_ID() AND c.column_id != 65535 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT u_grantee.user_name as GRANTEE, db.database_name as OWNER, decode(auth.objtype, 1, t.table_name, '') as TABLE_NAME, c.column_name as COLUMN_NAME, u_grantor.user_name as GRANTOR, cast (decode(auth.priv_id, 1, 'ALTER', 2, 'AUDIT', 3, 'COMMENT', 4, 'DELETE', 5, 'GRANT', 6, 'INDEX', 7, 'INSERT', 8, 'LOCK', 9, 'RENAME', 10, 'SELECT', 11, 'UPDATE', 12, 'REFERENCES', 13, 'EXECUTE', 14, 'CREATE', 15, 'FLASHBACK', 16, 'READ', 17, 'WRITE', 'OTHERS') as varchar(40)) as PRIVILEGE, decode(auth.priv_option, 0, 'NO', 1, 'YES', '') as GRANTABLE FROM sys.all_virtual_objauth_agent auth, sys.ALL_VIRTUAL_COLUMN_REAL_AGENT c, sys.ALL_VIRTUAL_TABLE_REAL_AGENT t, sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db, sys.ALL_VIRTUAL_USER_REAL_AGENT u_grantor, sys.ALL_VIRTUAL_USER_REAL_AGENT u_grantee WHERE auth.col_id = c.column_id and auth.obj_id = t.table_id and auth.objtype = 1 and auth.obj_id = c.table_id and db.database_id = t.database_id and u_grantor.user_id = auth.grantor_id and u_grantee.user_id = auth.grantee_id AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND U_GRANTOR.TENANT_ID = EFFECTIVE_TENANT_ID() AND U_GRANTEE.TENANT_ID = EFFECTIVE_TENANT_ID() AND c.column_id != 65535 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1638,17 +1580,16 @@ int ObInnerTableSchema::dba_col_privs_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_col_privs_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_col_privs_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1679,8 +1620,7 @@ int ObInnerTableSchema::user_col_privs_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT u_grantee.user_name as GRANTEE, db.database_name as OWNER, decode(auth.objtype, 1, t.table_name, '') as TABLE_NAME, c.column_name as COLUMN_NAME, u_grantor.user_name as GRANTOR, cast (decode(auth.priv_id, 1, 'ALTER', 2, 'AUDIT', 3, 'COMMENT', 4, 'DELETE', 5, 'GRANT', 6, 'INDEX', 7, 'INSERT', 8, 'LOCK', 9, 'RENAME', 10, 'SELECT', 11, 'UPDATE', 12, 'REFERENCES', 13, 'EXECUTE', 14, 'CREATE', 15, 'FLASHBACK', 16, 'READ', 17, 'WRITE', 'OTHERS') as varchar(40)) as PRIVILEGE, decode(auth.priv_option, 0, 'NO', 1, 'YES', '') as GRANTABLE FROM sys.all_virtual_objauth_agent auth, sys.ALL_VIRTUAL_COLUMN_REAL_AGENT c, sys.ALL_VIRTUAL_TABLE_REAL_AGENT t, sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db, sys.ALL_VIRTUAL_USER_REAL_AGENT u_grantor, sys.ALL_VIRTUAL_USER_REAL_AGENT u_grantee WHERE auth.col_id = c.column_id and auth.obj_id = t.table_id and auth.objtype = 1 and auth.obj_id = c.table_id and db.database_id = t.database_id and u_grantor.user_id = auth.grantor_id and u_grantee.user_id = auth.grantee_id AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND U_GRANTOR.TENANT_ID = EFFECTIVE_TENANT_ID() AND U_GRANTEE.TENANT_ID = EFFECTIVE_TENANT_ID() AND c.column_id != 65535 and (db.database_name = SYS_CONTEXT('USERENV','CURRENT_USER') or u_grantee.user_name = SYS_CONTEXT('USERENV','CURRENT_USER') or u_grantor.user_name = SYS_CONTEXT('USERENV','CURRENT_USER') ) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT u_grantee.user_name as GRANTEE, db.database_name as OWNER, decode(auth.objtype, 1, t.table_name, '') as TABLE_NAME, c.column_name as COLUMN_NAME, u_grantor.user_name as GRANTOR, cast (decode(auth.priv_id, 1, 'ALTER', 2, 'AUDIT', 3, 'COMMENT', 4, 'DELETE', 5, 'GRANT', 6, 'INDEX', 7, 'INSERT', 8, 'LOCK', 9, 'RENAME', 10, 'SELECT', 11, 'UPDATE', 12, 'REFERENCES', 13, 'EXECUTE', 14, 'CREATE', 15, 'FLASHBACK', 16, 'READ', 17, 'WRITE', 'OTHERS') as varchar(40)) as PRIVILEGE, decode(auth.priv_option, 0, 'NO', 1, 'YES', '') as GRANTABLE FROM sys.all_virtual_objauth_agent auth, sys.ALL_VIRTUAL_COLUMN_REAL_AGENT c, sys.ALL_VIRTUAL_TABLE_REAL_AGENT t, sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db, sys.ALL_VIRTUAL_USER_REAL_AGENT u_grantor, sys.ALL_VIRTUAL_USER_REAL_AGENT u_grantee WHERE auth.col_id = c.column_id and auth.obj_id = t.table_id and auth.objtype = 1 and auth.obj_id = c.table_id and db.database_id = t.database_id and u_grantor.user_id = auth.grantor_id and u_grantee.user_id = auth.grantee_id AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND U_GRANTOR.TENANT_ID = EFFECTIVE_TENANT_ID() AND U_GRANTEE.TENANT_ID = EFFECTIVE_TENANT_ID() AND c.column_id != 65535 and (db.database_name = SYS_CONTEXT('USERENV','CURRENT_USER') or u_grantee.user_name = SYS_CONTEXT('USERENV','CURRENT_USER') or u_grantor.user_name = SYS_CONTEXT('USERENV','CURRENT_USER') ) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1692,17 +1632,16 @@ int ObInnerTableSchema::user_col_privs_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_col_privs_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_col_privs_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1733,8 +1672,7 @@ int ObInnerTableSchema::all_col_privs_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT u_grantor.user_name as GRANTOR, u_grantee.user_name as GRANTEE, db.database_name as OWNER, decode(auth.objtype, 1, t.table_name, '') as TABLE_NAME, c.column_name as COLUMN_NAME, cast (decode(auth.priv_id, 1, 'ALTER', 2, 'AUDIT', 3, 'COMMENT', 4, 'DELETE', 5, 'GRANT', 6, 'INDEX', 7, 'INSERT', 8, 'LOCK', 9, 'RENAME', 10, 'SELECT', 11, 'UPDATE', 12, 'REFERENCES', 13, 'EXECUTE', 14, 'CREATE', 15, 'FLASHBACK', 16, 'READ', 17, 'WRITE', 'OTHERS') as varchar(40)) as PRIVILEGE, decode(auth.priv_option, 0, 'NO', 1, 'YES', '') as GRANTABLE FROM sys.all_virtual_objauth_agent auth, sys.ALL_VIRTUAL_COLUMN_REAL_AGENT c, sys.ALL_VIRTUAL_TABLE_REAL_AGENT t, sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db, sys.ALL_VIRTUAL_USER_REAL_AGENT u_grantor, sys.ALL_VIRTUAL_USER_REAL_AGENT u_grantee WHERE auth.col_id = c.column_id and auth.obj_id = t.table_id and auth.objtype = 1 and auth.obj_id = c.table_id and db.database_id = t.database_id and u_grantor.user_id = auth.grantor_id and u_grantee.user_id = auth.grantee_id AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND U_GRANTOR.TENANT_ID = EFFECTIVE_TENANT_ID() AND U_GRANTEE.TENANT_ID = EFFECTIVE_TENANT_ID() AND c.column_id != 65535 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT u_grantor.user_name as GRANTOR, u_grantee.user_name as GRANTEE, db.database_name as OWNER, decode(auth.objtype, 1, t.table_name, '') as TABLE_NAME, c.column_name as COLUMN_NAME, cast (decode(auth.priv_id, 1, 'ALTER', 2, 'AUDIT', 3, 'COMMENT', 4, 'DELETE', 5, 'GRANT', 6, 'INDEX', 7, 'INSERT', 8, 'LOCK', 9, 'RENAME', 10, 'SELECT', 11, 'UPDATE', 12, 'REFERENCES', 13, 'EXECUTE', 14, 'CREATE', 15, 'FLASHBACK', 16, 'READ', 17, 'WRITE', 'OTHERS') as varchar(40)) as PRIVILEGE, decode(auth.priv_option, 0, 'NO', 1, 'YES', '') as GRANTABLE FROM sys.all_virtual_objauth_agent auth, sys.ALL_VIRTUAL_COLUMN_REAL_AGENT c, sys.ALL_VIRTUAL_TABLE_REAL_AGENT t, sys.ALL_VIRTUAL_DATABASE_REAL_AGENT db, sys.ALL_VIRTUAL_USER_REAL_AGENT u_grantor, sys.ALL_VIRTUAL_USER_REAL_AGENT u_grantee WHERE auth.col_id = c.column_id and auth.obj_id = t.table_id and auth.objtype = 1 and auth.obj_id = c.table_id and db.database_id = t.database_id and u_grantor.user_id = auth.grantor_id and u_grantee.user_id = auth.grantee_id AND C.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND U_GRANTOR.TENANT_ID = EFFECTIVE_TENANT_ID() AND U_GRANTEE.TENANT_ID = EFFECTIVE_TENANT_ID() AND c.column_id != 65535 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1746,17 +1684,16 @@ int ObInnerTableSchema::all_col_privs_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::role_tab_privs_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::role_tab_privs_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1787,8 +1724,7 @@ int ObInnerTableSchema::role_tab_privs_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT U_GRANTEE.USER_NAME AS ROLE, DB.DATABASE_NAME AS OWNER, CAST (DECODE(AUTH.OBJTYPE,11, SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')), T.TABLE_NAME) AS VARCHAR(128)) AS TABLE_NAME, C.COLUMN_NAME AS COLUMN_NAME, CAST (DECODE(AUTH.PRIV_ID, 1, 'ALTER', 2, 'AUDIT', 3, 'COMMENT', 4, 'DELETE', 5, 'GRANT', 6, 'INDEX', 7, 'INSERT', 8, 'LOCK', 9, 'RENAME', 10, 'SELECT', 11, 'UPDATE', 12, 'REFERENCES', 13, 'EXECUTE', 14, 'CREATE', 15, 'FLASHBACK', 16, 'READ', 17, 'WRITE', 'OTHERS') AS VARCHAR(40)) AS PRIVILEGE, DECODE(AUTH.PRIV_OPTION, 0, 'NO', 1, 'YES', '') AS GRANTABLE FROM (SELECT * FROM SYS.ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) AUTH LEFT JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C ON AUTH.COL_ID = C.COLUMN_ID AND AUTH.OBJ_ID = C.TABLE_ID AND C.TENANT_ID = EFFECTIVE_TENANT_ID(), (SELECT TABLE_ID, TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT PACKAGE_ID AS TABLE_ID, PACKAGE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT ROUTINE_ID AS TABLE_ID, ROUTINE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT SEQUENCE_ID AS TABLE_ID, SEQUENCE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() ) T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB, SYS.ALL_VIRTUAL_USER_REAL_AGENT U_GRANTEE WHERE AUTH.OBJ_ID = T.TABLE_ID AND DB.DATABASE_ID = T.DATABASE_ID AND U_GRANTEE.USER_ID = AUTH.GRANTEE_ID AND U_GRANTEE.TYPE = 1 AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND U_GRANTEE.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT U_GRANTEE.USER_NAME AS ROLE, DB.DATABASE_NAME AS OWNER, CAST (DECODE(AUTH.OBJTYPE,11, SUBSTR(TABLE_NAME, 7 + INSTR(SUBSTR(TABLE_NAME, 7), '_')), T.TABLE_NAME) AS VARCHAR(128)) AS TABLE_NAME, C.COLUMN_NAME AS COLUMN_NAME, CAST (DECODE(AUTH.PRIV_ID, 1, 'ALTER', 2, 'AUDIT', 3, 'COMMENT', 4, 'DELETE', 5, 'GRANT', 6, 'INDEX', 7, 'INSERT', 8, 'LOCK', 9, 'RENAME', 10, 'SELECT', 11, 'UPDATE', 12, 'REFERENCES', 13, 'EXECUTE', 14, 'CREATE', 15, 'FLASHBACK', 16, 'READ', 17, 'WRITE', 'OTHERS') AS VARCHAR(40)) AS PRIVILEGE, DECODE(AUTH.PRIV_OPTION, 0, 'NO', 1, 'YES', '') AS GRANTABLE FROM (SELECT * FROM SYS.ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) AUTH LEFT JOIN SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C ON AUTH.COL_ID = C.COLUMN_ID AND AUTH.OBJ_ID = C.TABLE_ID AND C.TENANT_ID = EFFECTIVE_TENANT_ID(), (SELECT TABLE_ID, TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_TABLE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT PACKAGE_ID AS TABLE_ID, PACKAGE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_PACKAGE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT ROUTINE_ID AS TABLE_ID, ROUTINE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_ROUTINE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() UNION ALL SELECT SEQUENCE_ID AS TABLE_ID, SEQUENCE_NAME AS TABLE_NAME, DATABASE_ID FROM SYS.ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID() ) T, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB, SYS.ALL_VIRTUAL_USER_REAL_AGENT U_GRANTEE WHERE AUTH.OBJ_ID = T.TABLE_ID AND DB.DATABASE_ID = T.DATABASE_ID AND U_GRANTEE.USER_ID = AUTH.GRANTEE_ID AND U_GRANTEE.TYPE = 1 AND DB.TENANT_ID = EFFECTIVE_TENANT_ID() AND U_GRANTEE.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1800,17 +1736,16 @@ int ObInnerTableSchema::role_tab_privs_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::role_sys_privs_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::role_sys_privs_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1841,8 +1776,7 @@ int ObInnerTableSchema::role_sys_privs_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema - .set_view_definition(R"__( select u.user_name as ROLE, CAST (DECODE(AUTH.PRIV_ID, 1, 'CREATE SESSION', 2, 'EXEMPT REDACT POLICY', 3, 'SYSDBA', 4, 'SYSOPER', 5, 'SYSBACKUP', 6, 'CREATE TABLE', 7, 'CREATE ANY TABLE', 8, 'ALTER ANY TABLE', 9, 'BACKUP ANY TABLE', 10, 'DROP ANY TABLE', 11, 'LOCK ANY TABLE', 12, 'COMMENT ANY TABLE', 13, 'SELECT ANY TABLE', 14, 'INSERT ANY TABLE', 15, 'UPDATE ANY TABLE', 16, 'DELETE ANY TABLE', 17, 'FLASHBACK ANY TABLE', 18, 'CREATE ROLE', 19, 'DROP ANY ROLE', 20, 'GRANT ANY ROLE', 21, 'ALTER ANY ROLE', 22, 'AUDIT ANY', 23, 'GRANT ANY PRIVILEGE', 24, 'GRANT ANY OBJECT PRIVILEGE', 25, 'CREATE ANY INDEX', 26, 'ALTER ANY INDEX', 27, 'DROP ANY INDEX', 28, 'CREATE ANY VIEW', 29, 'DROP ANY VIEW', 30, 'CREATE VIEW', 31, 'SELECT ANY DICTIONARY', 32, 'CREATE PROCEDURE', 33, 'CREATE ANY PROCEDURE', 34, 'ALTER ANY PROCEDURE', 35, 'DROP ANY PROCEDURE', 36, 'EXECUTE ANY PROCEDURE', 37, 'CREATE SYNONYM', 38, 'CREATE ANY SYNONYM', 39, 'DROP ANY SYNONYM', 40, 'CREATE PUBLIC SYNONYM', 41, 'DROP PUBLIC SYNONYM', 42, 'CREATE SEQUENCE', 43, 'CREATE ANY SEQUENCE', 44, 'ALTER ANY SEQUENCE', 45, 'DROP ANY SEQUENCE', 46, 'SELECT ANY SEQUENCE', 47, 'CREATE TRIGGER', 48, 'CREATE ANY TRIGGER', 49, 'ALTER ANY TRIGGER', 50, 'DROP ANY TRIGGER', 51, 'CREATE PROFILE', 52, 'ALTER PROFILE', 53, 'DROP PROFILE', 54, 'CREATE USER', 55, 'BECOME USER', 56, 'ALTER USER', 57, 'DROP USER', 58, 'CREATE TYPE', 59, 'CREATE ANY TYPE', 60, 'ALTER ANY TYPE', 61, 'DROP ANY TYPE', 62, 'EXECUTE ANY TYPE', 63, 'UNDER ANY TYPE', 64, 'PURGE DBA_RECYCLEBIN', 65, 'CREATE ANY OUTLINE', 66, 'ALTER ANY OUTLINE', 67, 'DROP ANY OUTLINE', 68, 'SYSKM', 69, 'CREATE TABLESPACE', 70, 'ALTER TABLESPACE', 71, 'DROP TABLESPACE', 72, 'SHOW PROCESS', 73, 'ALTER SYSTEM', 74, 'CREATE DATABASE LINK', 75, 'CREATE PUBLIC DATABASE LINK', 76, 'DROP DATABASE LINK', 77, 'ALTER SESSION', 78, 'ALTER DATABASE', 'OTHER') AS VARCHAR(40)) AS PRIVILEGE , decode(auth.priv_option, 0, 'NO', 1, 'YES', '') as ADMIN_OPTION FROM sys.ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT auth, sys.ALL_VIRTUAL_USER_REAL_AGENT u WHERE auth.grantee_id = u.user_id and u.type = 1 AND U.TENANT_ID = EFFECTIVE_TENANT_ID() AND AUTH.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( select u.user_name as ROLE, CAST (DECODE(AUTH.PRIV_ID, 1, 'CREATE SESSION', 2, 'EXEMPT REDACT POLICY', 3, 'SYSDBA', 4, 'SYSOPER', 5, 'SYSBACKUP', 6, 'CREATE TABLE', 7, 'CREATE ANY TABLE', 8, 'ALTER ANY TABLE', 9, 'BACKUP ANY TABLE', 10, 'DROP ANY TABLE', 11, 'LOCK ANY TABLE', 12, 'COMMENT ANY TABLE', 13, 'SELECT ANY TABLE', 14, 'INSERT ANY TABLE', 15, 'UPDATE ANY TABLE', 16, 'DELETE ANY TABLE', 17, 'FLASHBACK ANY TABLE', 18, 'CREATE ROLE', 19, 'DROP ANY ROLE', 20, 'GRANT ANY ROLE', 21, 'ALTER ANY ROLE', 22, 'AUDIT ANY', 23, 'GRANT ANY PRIVILEGE', 24, 'GRANT ANY OBJECT PRIVILEGE', 25, 'CREATE ANY INDEX', 26, 'ALTER ANY INDEX', 27, 'DROP ANY INDEX', 28, 'CREATE ANY VIEW', 29, 'DROP ANY VIEW', 30, 'CREATE VIEW', 31, 'SELECT ANY DICTIONARY', 32, 'CREATE PROCEDURE', 33, 'CREATE ANY PROCEDURE', 34, 'ALTER ANY PROCEDURE', 35, 'DROP ANY PROCEDURE', 36, 'EXECUTE ANY PROCEDURE', 37, 'CREATE SYNONYM', 38, 'CREATE ANY SYNONYM', 39, 'DROP ANY SYNONYM', 40, 'CREATE PUBLIC SYNONYM', 41, 'DROP PUBLIC SYNONYM', 42, 'CREATE SEQUENCE', 43, 'CREATE ANY SEQUENCE', 44, 'ALTER ANY SEQUENCE', 45, 'DROP ANY SEQUENCE', 46, 'SELECT ANY SEQUENCE', 47, 'CREATE TRIGGER', 48, 'CREATE ANY TRIGGER', 49, 'ALTER ANY TRIGGER', 50, 'DROP ANY TRIGGER', 51, 'CREATE PROFILE', 52, 'ALTER PROFILE', 53, 'DROP PROFILE', 54, 'CREATE USER', 55, 'BECOME USER', 56, 'ALTER USER', 57, 'DROP USER', 58, 'CREATE TYPE', 59, 'CREATE ANY TYPE', 60, 'ALTER ANY TYPE', 61, 'DROP ANY TYPE', 62, 'EXECUTE ANY TYPE', 63, 'UNDER ANY TYPE', 64, 'PURGE DBA_RECYCLEBIN', 65, 'CREATE ANY OUTLINE', 66, 'ALTER ANY OUTLINE', 67, 'DROP ANY OUTLINE', 68, 'SYSKM', 69, 'CREATE TABLESPACE', 70, 'ALTER TABLESPACE', 71, 'DROP TABLESPACE', 72, 'SHOW PROCESS', 73, 'ALTER SYSTEM', 74, 'CREATE DATABASE LINK', 75, 'CREATE PUBLIC DATABASE LINK', 76, 'DROP DATABASE LINK', 77, 'ALTER SESSION', 78, 'ALTER DATABASE', 'OTHER') AS VARCHAR(40)) AS PRIVILEGE , decode(auth.priv_option, 0, 'NO', 1, 'YES', '') as ADMIN_OPTION FROM sys.ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT auth, sys.ALL_VIRTUAL_USER_REAL_AGENT u WHERE auth.grantee_id = u.user_id and u.type = 1 AND U.TENANT_ID = EFFECTIVE_TENANT_ID() AND AUTH.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1854,17 +1788,16 @@ int ObInnerTableSchema::role_sys_privs_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::role_role_privs_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::role_role_privs_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1895,8 +1828,7 @@ int ObInnerTableSchema::role_role_privs_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( select u_role.user_name as ROLE, u_grantee.user_name as GRANTED_ROLE, DECODE(R.ADMIN_OPTION, 0, 'NO', 1, 'YES', '') as ADMIN_OPTION FROM sys.ALL_VIRTUAL_USER_REAL_AGENT u_grantee, sys.ALL_VIRTUAL_USER_REAL_AGENT u_role, (select * from sys.all_virtual_tenant_role_grantee_map_agent connect by prior role_id = grantee_id and bitand(role_id, power(2,40) - 1) != 9 start with grantee_id = uid and bitand(role_id, power(2,40) - 1) != 9 ) r WHERE r.grantee_id = u_role.user_id and r.role_id = u_grantee.user_id and u_role.type = 1 and u_grantee.type = 1 AND U_GRANTEE.TENANT_ID = EFFECTIVE_TENANT_ID() AND U_ROLE.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( select u_role.user_name as ROLE, u_grantee.user_name as GRANTED_ROLE, DECODE(R.ADMIN_OPTION, 0, 'NO', 1, 'YES', '') as ADMIN_OPTION FROM sys.ALL_VIRTUAL_USER_REAL_AGENT u_grantee, sys.ALL_VIRTUAL_USER_REAL_AGENT u_role, (select * from sys.all_virtual_tenant_role_grantee_map_agent connect by prior role_id = grantee_id and bitand(role_id, power(2,40) - 1) != 9 start with grantee_id = uid and bitand(role_id, power(2,40) - 1) != 9 ) r WHERE r.grantee_id = u_role.user_id and r.role_id = u_grantee.user_id and u_role.type = 1 and u_grantee.type = 1 AND U_GRANTEE.TENANT_ID = EFFECTIVE_TENANT_ID() AND U_ROLE.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1908,17 +1840,16 @@ int ObInnerTableSchema::role_role_privs_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dictionary_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dictionary_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1949,8 +1880,7 @@ int ObInnerTableSchema::dictionary_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE TABLE_NAME WHEN 'DBA_COL_PRIVS' THEN 'All grants on columns in the database' WHEN 'USER_COL_PRIVS' THEN 'Grants on columns for which the user is the owner, grantor or grantee' WHEN 'ALL_COL_PRIVS' THEN 'Grants on columns for which the user is the grantor, grantee, owner, or an enabled role or PUBLIC is the grantee' WHEN 'ROLE_TAB_PRIVS' THEN 'Table privileges granted to roles' WHEN 'ROLE_SYS_PRIVS' THEN 'System privileges granted to roles' WHEN 'ROLE_ROLE_PRIVS' THEN 'Roles which are granted to roles' WHEN 'DBA_SYNONYMS' THEN 'All synonyms in the database' WHEN 'DBA_OBJECTS' THEN 'All objects in the database' WHEN 'ALL_OBJECTS' THEN 'Objects accessible to the user' WHEN 'USER_OBJECTS' THEN 'Objects owned by the user' WHEN 'DBA_SEQUENCES' THEN 'Description of all SEQUENCEs in the database' WHEN 'ALL_SEQUENCES' THEN 'Description of SEQUENCEs accessible to the user' WHEN 'USER_SEQUENCES' THEN 'Description of the user''s own SEQUENCEs' WHEN 'DBA_USERS' THEN 'Information about all users of the database' WHEN 'ALL_USERS' THEN 'Information about all users of the database' WHEN 'ALL_SYNONYMS' THEN 'All synonyms for base objects accessible to the user and session' WHEN 'USER_SYNONYMS' THEN 'The user''s private synonyms' WHEN 'DBA_IND_COLUMNS' THEN 'COLUMNs comprising INDEXes on all TABLEs and CLUSTERs' WHEN 'ALL_IND_COLUMNS' THEN 'COLUMNs comprising INDEXes on accessible TABLES' WHEN 'USER_IND_COLUMNS' THEN 'COLUMNs comprising user''s INDEXes and INDEXes on user''s TABLES' WHEN 'DBA_CONSTRAINTS' THEN 'Constraint definitions on all tables' WHEN 'ALL_CONSTRAINTS' THEN 'Constraint definitions on accessible tables' WHEN 'USER_CONSTRAINTS' THEN 'Constraint definitions on user''s own tables' WHEN 'ALL_TAB_COLS' THEN 'Columns of user''s tables, views and clusters' WHEN 'DBA_TAB_COLS' THEN 'Columns of user''s tables, views and clusters' WHEN 'USER_TAB_COLS' THEN 'Columns of user''s tables, views and clusters' WHEN 'ALL_TAB_COLUMNS' THEN 'Columns of user''s tables, views and clusters' WHEN 'DBA_TAB_COLUMNS' THEN 'Columns of user''s tables, views and clusters' WHEN 'USER_TAB_COLUMNS' THEN 'Columns of user''s tables, views and clusters' WHEN 'ALL_TABLES' THEN 'Description of relational tables accessible to the user' WHEN 'DBA_TABLES' THEN 'Description of all relational tables in the database' WHEN 'USER_TABLES' THEN 'Description of the user''s own relational tables' WHEN 'DBA_TAB_COMMENTS' THEN 'Comments on all tables and views in the database' WHEN 'ALL_TAB_COMMENTS' THEN 'Comments on tables and views accessible to the user' WHEN 'USER_TAB_COMMENTS' THEN 'Comments on the tables and views owned by the user' WHEN 'DBA_COL_COMMENTS' THEN 'Comments on columns of all tables and views' WHEN 'ALL_COL_COMMENTS' THEN 'Comments on columns of accessible tables and views' WHEN 'USER_COL_COMMENTS' THEN 'Comments on columns of user''s tables and views' WHEN 'DBA_INDEXES' THEN 'Description for all indexes in the database' WHEN 'ALL_INDEXES' THEN 'Descriptions of indexes on tables accessible to the user' WHEN 'USER_INDEXES' THEN 'Description of the user''s own indexes' WHEN 'DBA_CONS_COLUMNS' THEN 'Information about accessible columns in constraint definitions' WHEN 'ALL_CONS_COLUMNS' THEN 'Information about accessible columns in constraint definitions' WHEN 'USER_CONS_COLUMNS' THEN 'Information about accessible columns in constraint definitions' WHEN 'USER_SEGMENTS' THEN 'Storage allocated for all database segments' WHEN 'DBA_SEGMENTS' THEN 'Storage allocated for all database segments' WHEN 'DBA_TYPES' THEN 'Description of all types in the database' WHEN 'ALL_TYPES' THEN 'Description of types accessible to the user' WHEN 'USER_TYPES' THEN 'Description of the user''s own types' WHEN 'DBA_TYPE_ATTRS' THEN 'Description of attributes of all types in the database' WHEN 'ALL_TYPE_ATTRS' THEN 'Description of attributes of types accessible to the user' WHEN 'USER_TYPE_ATTRS' THEN 'Description of attributes of the user''s own types' WHEN 'DBA_COLL_TYPES' THEN 'Description of all named collection types in the database' WHEN 'ALL_COLL_TYPES' THEN 'Description of named collection types accessible to the user' WHEN 'USER_COLL_TYPES' THEN 'Description of the user''s own named collection types' WHEN 'DBA_PROCEDURES' THEN 'Description of the dba functions/procedures/packages/types/triggers' WHEN 'DBA_ARGUMENTS' THEN 'All arguments for objects in the database' WHEN 'DBA_SOURCE' THEN 'Source of all stored objects in the database' WHEN 'ALL_PROCEDURES' THEN 'Functions/procedures/packages/types/triggers available to the user' WHEN 'ALL_ARGUMENTS' THEN 'Arguments in object accessible to the user' WHEN 'ALL_SOURCE' THEN 'Current source on stored objects that user is allowed to create' WHEN 'USER_PROCEDURES' THEN 'Description of the user functions/procedures/packages/types/triggers' WHEN 'USER_ARGUMENTS' THEN 'Arguments in object accessible to the user' WHEN 'USER_SOURCE' THEN 'Source of stored objects accessible to the user' WHEN 'ALL_ALL_TABLES' THEN 'Description of all object and relational tables accessible to the user' WHEN 'DBA_ALL_TABLES' THEN 'Description of all object and relational tables in the database' WHEN 'USER_ALL_TABLES' THEN 'Description of all object and relational tables owned by the user''s' WHEN 'DBA_PROFILES' THEN 'Display all profiles and their limits' WHEN 'ALL_MVIEW_COMMENTS' THEN 'Comments on materialized views accessible to the user' WHEN 'USER_MVIEW_COMMENTS' THEN 'Comments on materialized views owned by the user' WHEN 'DBA_MVIEW_COMMENTS' THEN 'Comments on all materialized views in the database' WHEN 'ALL_SCHEDULER_PROGRAM_ARGS' THEN 'All arguments of all scheduler programs visible to the user' WHEN 'ALL_SCHEDULER_JOB_ARGS' THEN 'All arguments with set values of all scheduler jobs in the database' WHEN 'DBA_SCHEDULER_JOB_ARGS' THEN 'All arguments with set values of all scheduler jobs in the database' WHEN 'USER_SCHEDULER_JOB_ARGS' THEN 'All arguments with set values of all scheduler jobs in the database' WHEN 'DBA_VIEWS' THEN 'Description of all views in the database' WHEN 'ALL_VIEWS' THEN 'Description of views accessible to the user' WHEN 'USER_VIEWS' THEN 'Description of the user''s own views' WHEN 'ALL_ERRORS' THEN 'Current errors on stored objects that user is allowed to create' WHEN 'USER_ERRORS' THEN 'Current errors on stored objects owned by the user' WHEN 'ALL_TYPE_METHODS' THEN 'Description of methods of types accessible to the user' WHEN 'DBA_TYPE_METHODS' THEN 'Description of methods of all types in the database' WHEN 'USER_TYPE_METHODS' THEN 'Description of methods of the user''s own types' WHEN 'ALL_METHOD_PARAMS' THEN 'Description of method parameters of types accessible to the user' WHEN 'DBA_METHOD_PARAMS' THEN 'Description of method parameters of all types in the database' WHEN 'USER_TABLESPACES' THEN 'Description of accessible tablespaces' WHEN 'DBA_IND_EXPRESSIONS' THEN 'FUNCTIONAL INDEX EXPRESSIONs on all TABLES and CLUSTERS' WHEN 'ALL_IND_EXPRESSIONS' THEN 'FUNCTIONAL INDEX EXPRESSIONs on accessible TABLES' WHEN 'DBA_ROLE_PRIVS' THEN 'Roles granted to users and roles' WHEN 'USER_ROLE_PRIVS' THEN 'Roles granted to current user' WHEN 'DBA_TAB_PRIVS' THEN 'All grants on objects in the database' WHEN 'ALL_TAB_PRIVS' THEN 'Grants on objects for which the user is the grantor, grantee, owner,' WHEN 'DBA_SYS_PRIVS' THEN 'System privileges granted to users and roles' WHEN 'USER_SYS_PRIVS' THEN 'System privileges granted to current user' WHEN 'AUDIT_ACTIONS' THEN 'Description table for audit trail action type codes. Maps action type numbers to action type names' WHEN 'ALL_DEF_AUDIT_OPTS' THEN 'Auditing options for newly created objects' WHEN 'DBA_STMT_AUDIT_OPTS' THEN 'Describes current system auditing options across the system and by user' WHEN 'DBA_OBJ_AUDIT_OPTS' THEN 'Auditing options for all tables and views with atleast one option set' WHEN 'DBA_AUDIT_TRAIL' THEN 'All audit trail entries' WHEN 'USER_AUDIT_TRAIL' THEN 'Audit trail entries relevant to the user' WHEN 'DBA_AUDIT_EXISTS' THEN 'Lists audit trail entries produced by AUDIT NOT EXISTS and AUDIT EXISTS' WHEN 'DBA_AUDIT_STATEMENT' THEN 'Audit trail records concerning grant, revoke, audit, noaudit and alter system' WHEN 'USER_AUDIT_STATEMENT' THEN 'Audit trail records concerning grant, revoke, audit, noaudit and alter system' WHEN 'DBA_AUDIT_OBJECT' THEN 'Audit trail records for statements concerning objects, specifically: table, cluster, view, index, sequence, [public] database link, [public] synonym, procedure, trigger, rollback segment, tablespace, role, user' WHEN 'USER_AUDIT_OBJECT' THEN 'Audit trail records for statements concerning objects, specifically: table, cluster, view, index, sequence, [public] database link, [public] synonym, procedure, trigger, rollback segment, tablespace, role, user' WHEN 'ALL_DEPENDENCIES' THEN 'Describes dependencies between procedures, packages,functions, package bodies, and triggers accessible to the current user,including dependencies on views created without any database links' WHEN 'DBA_DEPENDENCIES' THEN 'Describes all dependencies in the database between procedures,packages, functions, package bodies, and triggers, including dependencies on views created without any database links' WHEN 'USER_DEPENDENCIES' THEN 'Describes dependencies between procedures, packages, functions, package bodies, and triggers owned by the current user, including dependencies on views created without any database links' WHEN 'GV$INSTANCE' THEN 'Synonym for GV_$INSTANCE' WHEN 'V$INSTANCE' THEN 'Synonym for V_$INSTANCE' WHEN 'GV$SESSION_WAIT' THEN 'Synonym for GV_$SESSION_WAIT' WHEN 'V$SESSION_WAIT' THEN 'Synonym for V_$SESSION_WAIT' WHEN 'GV$SESSION_WAIT_HISTORY' THEN 'Synonym for GV_$SESSION_WAIT_HISTORY' WHEN 'V$SESSION_WAIT_HISTORY' THEN 'Synonym for V_$SESSION_WAIT_HISTORY' WHEN 'GV$SESSTAT' THEN 'Synonym for GV_$SESSTAT' WHEN 'V$SESSTAT' THEN 'Synonym for V_$SESSTAT' WHEN 'GV$SYSSTAT' THEN 'Synonym for GV_$SYSSTAT' WHEN 'V$SYSSTAT' THEN 'Synonym for V_$SYSSTAT' WHEN 'GV$SYSTEM_EVENT' THEN 'Synonym for GV_$SYSTEM_EVENT' WHEN 'V$SYSTEM_EVENT' THEN 'Synonym for V_$SYSTEM_EVENT' WHEN 'NLS_SESSION_PARAMETERS' THEN 'NLS parameters of the user session' WHEN 'NLS_DATABASE_PARAMETERS' THEN 'Permanent NLS parameters of the database' WHEN 'V$NLS_PARAMETERS' THEN 'Synonym for V_$NLS_PARAMETERS' WHEN 'V$VERSION' THEN 'Synonym for V_$VERSION' WHEN 'GV$SQL_WORKAREA' THEN 'Synonym for GV_$SQL_WORKAREA' WHEN 'V$SQL_WORKAREA' THEN 'Synonym for V_$SQL_WORKAREA' WHEN 'GV$SQL_WORKAREA_ACTIVE' THEN 'Synonym for GV_$SQL_WORKAREA_ACTIVE' WHEN 'V$SQL_WORKAREA_ACTIVE' THEN 'Synonym for V_$SQL_WORKAREA_ACTIVE' WHEN 'GV$SQL_WORKAREA_HISTOGRAM' THEN 'Synonym for GV_$SQL_WORKAREA_HISTOGRAM' WHEN 'V$SQL_WORKAREA_HISTOGRAM' THEN 'Synonym for V_$SQL_WORKAREA_HISTOGRAM' WHEN 'DICT' THEN 'Synonym for DICTIONARY' WHEN 'DICTIONARY' THEN 'Description of data dictionary tables and views' WHEN 'DBA_RECYCLEBIN' THEN 'Description of the Recyclebin view accessible to the user' WHEN 'USER_RECYCLEBIN' THEN 'User view of his recyclebin' WHEN 'V$TENANT_PX_WORKER_STAT' THEN '' WHEN 'GV$PS_STAT' THEN '' WHEN 'V$PS_STAT' THEN '' WHEN 'GV$PS_ITEM_INFO' THEN '' WHEN 'V$PS_ITEM_INFO' THEN '' WHEN 'GV$OB_SQL_WORKAREA_MEMORY_INFO' THEN '' WHEN 'V$OB_SQL_WORKAREA_MEMORY_INFO' THEN '' WHEN 'DBA_PART_KEY_COLUMNS' THEN '' WHEN 'ALL_PART_KEY_COLUMNS' THEN '' WHEN 'USER_PART_KEY_COLUMNS' THEN '' WHEN 'DBA_SUBPART_KEY_COLUMNS' THEN '' WHEN 'ALL_SUBPART_KEY_COLUMNS' THEN '' WHEN 'USER_SUBPART_KEY_COLUMNS' THEN '' WHEN 'ALL_TAB_PARTITIONS' THEN '' WHEN 'ALL_TAB_SUBPARTITIONS' THEN '' WHEN 'ALL_PART_TABLES' THEN '' WHEN 'DBA_PART_TABLES' THEN '' WHEN 'USER_PART_TABLES' THEN '' WHEN 'DBA_TAB_PARTITIONS' THEN '' WHEN 'USER_TAB_PARTITIONS' THEN '' WHEN 'DBA_TAB_SUBPARTITIONS' THEN '' WHEN 'USER_TAB_SUBPARTITIONS' THEN '' WHEN 'DBA_SUBPARTITION_TEMPLATES' THEN '' WHEN 'ALL_SUBPARTITION_TEMPLATES' THEN '' WHEN 'USER_SUBPARTITION_TEMPLATES' THEN '' WHEN 'DBA_PART_INDEXES' THEN '' WHEN 'ALL_PART_INDEXES' THEN '' WHEN 'USER_PART_INDEXES' THEN '' WHEN 'ALL_TAB_COLS_V$' THEN '' WHEN 'DBA_TAB_COLS_V$' THEN '' WHEN 'USER_TAB_COLS_V$' THEN '' WHEN 'USER_PROFILES' THEN '' WHEN 'ALL_PROFILES' THEN '' WHEN 'DBA_SCHEDULER_PROGRAM_ARGS' THEN '' WHEN 'USER_SCHEDULER_PROGRAM_ARGS' THEN '' WHEN 'USER_IND_EXPRESSIONS' THEN '' WHEN 'DBA_ERRORS' THEN '' WHEN 'USER_METHOD_PARAMS' THEN '' WHEN 'DBA_TABLESPACES' THEN '' WHEN 'ALL_IND_PARTITIONS' THEN '' WHEN 'USER_IND_PARTITIONS' THEN '' WHEN 'DBA_IND_PARTITIONS' THEN '' WHEN 'DBA_IND_SUBPARTITIONS' THEN '' WHEN 'ALL_IND_SUBPARTITIONS' THEN '' WHEN 'USER_IND_SUBPARTITIONS' THEN '' WHEN 'DBA_ROLES' THEN '' WHEN 'USER_TAB_PRIVS' THEN '' WHEN 'STMT_AUDIT_OPTION_MAP' THEN '' WHEN 'GV$OUTLINE' THEN '' WHEN 'GV$SQL_AUDIT' THEN '' WHEN 'V$SQL_AUDIT' THEN '' WHEN 'DBA_AUDIT_SESSION' THEN '' WHEN 'USER_AUDIT_SESSION' THEN '' WHEN 'GV$PLAN_CACHE_PLAN_STAT' THEN '' WHEN 'V$PLAN_CACHE_PLAN_STAT' THEN '' WHEN 'GV$PLAN_CACHE_PLAN_EXPLAIN' THEN '' WHEN 'V$PLAN_CACHE_PLAN_EXPLAIN' THEN '' WHEN 'GV$MEMSTORE' THEN '' WHEN 'V$MEMSTORE' THEN '' WHEN 'GV$MEMSTORE_INFO' THEN '' WHEN 'V$MEMSTORE_INFO' THEN '' WHEN 'GV$MEMORY' THEN '' WHEN 'V$MEMORY' THEN '' WHEN 'GV$SERVER_MEMSTORE' THEN '' WHEN 'GV$TENANT_MEMSTORE_ALLOCATOR_INFO' THEN '' WHEN 'V$TENANT_MEMSTORE_ALLOCATOR_INFO' THEN '' WHEN 'GV$PLAN_CACHE_STAT' THEN '' WHEN 'V$PLAN_CACHE_STAT' THEN '' WHEN 'GV$CONCURRENT_LIMIT_SQL' THEN '' WHEN 'NLS_INSTANCE_PARAMETERS' THEN '' WHEN 'GV$TENANT_PX_WORKER_STAT' THEN '' ELSE NULL END AS VARCHAR2(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_TABLE_SYS_AGENT WHERE BITAND(TABLE_ID, 1099511627775) > 25000 AND BITAND(TABLE_ID, 1099511627775) <= 30000 AND TABLE_TYPE = 1 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME, CAST(CASE TABLE_NAME WHEN 'DBA_COL_PRIVS' THEN 'All grants on columns in the database' WHEN 'USER_COL_PRIVS' THEN 'Grants on columns for which the user is the owner, grantor or grantee' WHEN 'ALL_COL_PRIVS' THEN 'Grants on columns for which the user is the grantor, grantee, owner, or an enabled role or PUBLIC is the grantee' WHEN 'ROLE_TAB_PRIVS' THEN 'Table privileges granted to roles' WHEN 'ROLE_SYS_PRIVS' THEN 'System privileges granted to roles' WHEN 'ROLE_ROLE_PRIVS' THEN 'Roles which are granted to roles' WHEN 'DBA_SYNONYMS' THEN 'All synonyms in the database' WHEN 'DBA_OBJECTS' THEN 'All objects in the database' WHEN 'ALL_OBJECTS' THEN 'Objects accessible to the user' WHEN 'USER_OBJECTS' THEN 'Objects owned by the user' WHEN 'DBA_SEQUENCES' THEN 'Description of all SEQUENCEs in the database' WHEN 'ALL_SEQUENCES' THEN 'Description of SEQUENCEs accessible to the user' WHEN 'USER_SEQUENCES' THEN 'Description of the user''s own SEQUENCEs' WHEN 'DBA_USERS' THEN 'Information about all users of the database' WHEN 'ALL_USERS' THEN 'Information about all users of the database' WHEN 'ALL_SYNONYMS' THEN 'All synonyms for base objects accessible to the user and session' WHEN 'USER_SYNONYMS' THEN 'The user''s private synonyms' WHEN 'DBA_IND_COLUMNS' THEN 'COLUMNs comprising INDEXes on all TABLEs and CLUSTERs' WHEN 'ALL_IND_COLUMNS' THEN 'COLUMNs comprising INDEXes on accessible TABLES' WHEN 'USER_IND_COLUMNS' THEN 'COLUMNs comprising user''s INDEXes and INDEXes on user''s TABLES' WHEN 'DBA_CONSTRAINTS' THEN 'Constraint definitions on all tables' WHEN 'ALL_CONSTRAINTS' THEN 'Constraint definitions on accessible tables' WHEN 'USER_CONSTRAINTS' THEN 'Constraint definitions on user''s own tables' WHEN 'ALL_TAB_COLS' THEN 'Columns of user''s tables, views and clusters' WHEN 'DBA_TAB_COLS' THEN 'Columns of user''s tables, views and clusters' WHEN 'USER_TAB_COLS' THEN 'Columns of user''s tables, views and clusters' WHEN 'ALL_TAB_COLUMNS' THEN 'Columns of user''s tables, views and clusters' WHEN 'DBA_TAB_COLUMNS' THEN 'Columns of user''s tables, views and clusters' WHEN 'USER_TAB_COLUMNS' THEN 'Columns of user''s tables, views and clusters' WHEN 'ALL_TABLES' THEN 'Description of relational tables accessible to the user' WHEN 'DBA_TABLES' THEN 'Description of all relational tables in the database' WHEN 'USER_TABLES' THEN 'Description of the user''s own relational tables' WHEN 'DBA_TAB_COMMENTS' THEN 'Comments on all tables and views in the database' WHEN 'ALL_TAB_COMMENTS' THEN 'Comments on tables and views accessible to the user' WHEN 'USER_TAB_COMMENTS' THEN 'Comments on the tables and views owned by the user' WHEN 'DBA_COL_COMMENTS' THEN 'Comments on columns of all tables and views' WHEN 'ALL_COL_COMMENTS' THEN 'Comments on columns of accessible tables and views' WHEN 'USER_COL_COMMENTS' THEN 'Comments on columns of user''s tables and views' WHEN 'DBA_INDEXES' THEN 'Description for all indexes in the database' WHEN 'ALL_INDEXES' THEN 'Descriptions of indexes on tables accessible to the user' WHEN 'USER_INDEXES' THEN 'Description of the user''s own indexes' WHEN 'DBA_CONS_COLUMNS' THEN 'Information about accessible columns in constraint definitions' WHEN 'ALL_CONS_COLUMNS' THEN 'Information about accessible columns in constraint definitions' WHEN 'USER_CONS_COLUMNS' THEN 'Information about accessible columns in constraint definitions' WHEN 'USER_SEGMENTS' THEN 'Storage allocated for all database segments' WHEN 'DBA_SEGMENTS' THEN 'Storage allocated for all database segments' WHEN 'DBA_TYPES' THEN 'Description of all types in the database' WHEN 'ALL_TYPES' THEN 'Description of types accessible to the user' WHEN 'USER_TYPES' THEN 'Description of the user''s own types' WHEN 'DBA_TYPE_ATTRS' THEN 'Description of attributes of all types in the database' WHEN 'ALL_TYPE_ATTRS' THEN 'Description of attributes of types accessible to the user' WHEN 'USER_TYPE_ATTRS' THEN 'Description of attributes of the user''s own types' WHEN 'DBA_COLL_TYPES' THEN 'Description of all named collection types in the database' WHEN 'ALL_COLL_TYPES' THEN 'Description of named collection types accessible to the user' WHEN 'USER_COLL_TYPES' THEN 'Description of the user''s own named collection types' WHEN 'DBA_PROCEDURES' THEN 'Description of the dba functions/procedures/packages/types/triggers' WHEN 'DBA_ARGUMENTS' THEN 'All arguments for objects in the database' WHEN 'DBA_SOURCE' THEN 'Source of all stored objects in the database' WHEN 'ALL_PROCEDURES' THEN 'Functions/procedures/packages/types/triggers available to the user' WHEN 'ALL_ARGUMENTS' THEN 'Arguments in object accessible to the user' WHEN 'ALL_SOURCE' THEN 'Current source on stored objects that user is allowed to create' WHEN 'USER_PROCEDURES' THEN 'Description of the user functions/procedures/packages/types/triggers' WHEN 'USER_ARGUMENTS' THEN 'Arguments in object accessible to the user' WHEN 'USER_SOURCE' THEN 'Source of stored objects accessible to the user' WHEN 'ALL_ALL_TABLES' THEN 'Description of all object and relational tables accessible to the user' WHEN 'DBA_ALL_TABLES' THEN 'Description of all object and relational tables in the database' WHEN 'USER_ALL_TABLES' THEN 'Description of all object and relational tables owned by the user''s' WHEN 'DBA_PROFILES' THEN 'Display all profiles and their limits' WHEN 'ALL_MVIEW_COMMENTS' THEN 'Comments on materialized views accessible to the user' WHEN 'USER_MVIEW_COMMENTS' THEN 'Comments on materialized views owned by the user' WHEN 'DBA_MVIEW_COMMENTS' THEN 'Comments on all materialized views in the database' WHEN 'ALL_SCHEDULER_PROGRAM_ARGS' THEN 'All arguments of all scheduler programs visible to the user' WHEN 'ALL_SCHEDULER_JOB_ARGS' THEN 'All arguments with set values of all scheduler jobs in the database' WHEN 'DBA_SCHEDULER_JOB_ARGS' THEN 'All arguments with set values of all scheduler jobs in the database' WHEN 'USER_SCHEDULER_JOB_ARGS' THEN 'All arguments with set values of all scheduler jobs in the database' WHEN 'DBA_VIEWS' THEN 'Description of all views in the database' WHEN 'ALL_VIEWS' THEN 'Description of views accessible to the user' WHEN 'USER_VIEWS' THEN 'Description of the user''s own views' WHEN 'ALL_ERRORS' THEN 'Current errors on stored objects that user is allowed to create' WHEN 'USER_ERRORS' THEN 'Current errors on stored objects owned by the user' WHEN 'ALL_TYPE_METHODS' THEN 'Description of methods of types accessible to the user' WHEN 'DBA_TYPE_METHODS' THEN 'Description of methods of all types in the database' WHEN 'USER_TYPE_METHODS' THEN 'Description of methods of the user''s own types' WHEN 'ALL_METHOD_PARAMS' THEN 'Description of method parameters of types accessible to the user' WHEN 'DBA_METHOD_PARAMS' THEN 'Description of method parameters of all types in the database' WHEN 'USER_TABLESPACES' THEN 'Description of accessible tablespaces' WHEN 'DBA_IND_EXPRESSIONS' THEN 'FUNCTIONAL INDEX EXPRESSIONs on all TABLES and CLUSTERS' WHEN 'ALL_IND_EXPRESSIONS' THEN 'FUNCTIONAL INDEX EXPRESSIONs on accessible TABLES' WHEN 'DBA_ROLE_PRIVS' THEN 'Roles granted to users and roles' WHEN 'USER_ROLE_PRIVS' THEN 'Roles granted to current user' WHEN 'DBA_TAB_PRIVS' THEN 'All grants on objects in the database' WHEN 'ALL_TAB_PRIVS' THEN 'Grants on objects for which the user is the grantor, grantee, owner,' WHEN 'DBA_SYS_PRIVS' THEN 'System privileges granted to users and roles' WHEN 'USER_SYS_PRIVS' THEN 'System privileges granted to current user' WHEN 'AUDIT_ACTIONS' THEN 'Description table for audit trail action type codes. Maps action type numbers to action type names' WHEN 'ALL_DEF_AUDIT_OPTS' THEN 'Auditing options for newly created objects' WHEN 'DBA_STMT_AUDIT_OPTS' THEN 'Describes current system auditing options across the system and by user' WHEN 'DBA_OBJ_AUDIT_OPTS' THEN 'Auditing options for all tables and views with atleast one option set' WHEN 'DBA_AUDIT_TRAIL' THEN 'All audit trail entries' WHEN 'USER_AUDIT_TRAIL' THEN 'Audit trail entries relevant to the user' WHEN 'DBA_AUDIT_EXISTS' THEN 'Lists audit trail entries produced by AUDIT NOT EXISTS and AUDIT EXISTS' WHEN 'DBA_AUDIT_STATEMENT' THEN 'Audit trail records concerning grant, revoke, audit, noaudit and alter system' WHEN 'USER_AUDIT_STATEMENT' THEN 'Audit trail records concerning grant, revoke, audit, noaudit and alter system' WHEN 'DBA_AUDIT_OBJECT' THEN 'Audit trail records for statements concerning objects, specifically: table, cluster, view, index, sequence, [public] database link, [public] synonym, procedure, trigger, rollback segment, tablespace, role, user' WHEN 'USER_AUDIT_OBJECT' THEN 'Audit trail records for statements concerning objects, specifically: table, cluster, view, index, sequence, [public] database link, [public] synonym, procedure, trigger, rollback segment, tablespace, role, user' WHEN 'ALL_DEPENDENCIES' THEN 'Describes dependencies between procedures, packages,functions, package bodies, and triggers accessible to the current user,including dependencies on views created without any database links' WHEN 'DBA_DEPENDENCIES' THEN 'Describes all dependencies in the database between procedures,packages, functions, package bodies, and triggers, including dependencies on views created without any database links' WHEN 'USER_DEPENDENCIES' THEN 'Describes dependencies between procedures, packages, functions, package bodies, and triggers owned by the current user, including dependencies on views created without any database links' WHEN 'GV$INSTANCE' THEN 'Synonym for GV_$INSTANCE' WHEN 'V$INSTANCE' THEN 'Synonym for V_$INSTANCE' WHEN 'GV$SESSION_WAIT' THEN 'Synonym for GV_$SESSION_WAIT' WHEN 'V$SESSION_WAIT' THEN 'Synonym for V_$SESSION_WAIT' WHEN 'GV$SESSION_WAIT_HISTORY' THEN 'Synonym for GV_$SESSION_WAIT_HISTORY' WHEN 'V$SESSION_WAIT_HISTORY' THEN 'Synonym for V_$SESSION_WAIT_HISTORY' WHEN 'GV$SESSTAT' THEN 'Synonym for GV_$SESSTAT' WHEN 'V$SESSTAT' THEN 'Synonym for V_$SESSTAT' WHEN 'GV$SYSSTAT' THEN 'Synonym for GV_$SYSSTAT' WHEN 'V$SYSSTAT' THEN 'Synonym for V_$SYSSTAT' WHEN 'GV$SYSTEM_EVENT' THEN 'Synonym for GV_$SYSTEM_EVENT' WHEN 'V$SYSTEM_EVENT' THEN 'Synonym for V_$SYSTEM_EVENT' WHEN 'NLS_SESSION_PARAMETERS' THEN 'NLS parameters of the user session' WHEN 'NLS_DATABASE_PARAMETERS' THEN 'Permanent NLS parameters of the database' WHEN 'V$NLS_PARAMETERS' THEN 'Synonym for V_$NLS_PARAMETERS' WHEN 'V$VERSION' THEN 'Synonym for V_$VERSION' WHEN 'GV$SQL_WORKAREA' THEN 'Synonym for GV_$SQL_WORKAREA' WHEN 'V$SQL_WORKAREA' THEN 'Synonym for V_$SQL_WORKAREA' WHEN 'GV$SQL_WORKAREA_ACTIVE' THEN 'Synonym for GV_$SQL_WORKAREA_ACTIVE' WHEN 'V$SQL_WORKAREA_ACTIVE' THEN 'Synonym for V_$SQL_WORKAREA_ACTIVE' WHEN 'GV$SQL_WORKAREA_HISTOGRAM' THEN 'Synonym for GV_$SQL_WORKAREA_HISTOGRAM' WHEN 'V$SQL_WORKAREA_HISTOGRAM' THEN 'Synonym for V_$SQL_WORKAREA_HISTOGRAM' WHEN 'DICT' THEN 'Synonym for DICTIONARY' WHEN 'DICTIONARY' THEN 'Description of data dictionary tables and views' WHEN 'DBA_RECYCLEBIN' THEN 'Description of the Recyclebin view accessible to the user' WHEN 'USER_RECYCLEBIN' THEN 'User view of his recyclebin' WHEN 'V$TENANT_PX_WORKER_STAT' THEN '' WHEN 'GV$PS_STAT' THEN '' WHEN 'V$PS_STAT' THEN '' WHEN 'GV$PS_ITEM_INFO' THEN '' WHEN 'V$PS_ITEM_INFO' THEN '' WHEN 'GV$OB_SQL_WORKAREA_MEMORY_INFO' THEN '' WHEN 'V$OB_SQL_WORKAREA_MEMORY_INFO' THEN '' WHEN 'DBA_PART_KEY_COLUMNS' THEN '' WHEN 'ALL_PART_KEY_COLUMNS' THEN '' WHEN 'USER_PART_KEY_COLUMNS' THEN '' WHEN 'DBA_SUBPART_KEY_COLUMNS' THEN '' WHEN 'ALL_SUBPART_KEY_COLUMNS' THEN '' WHEN 'USER_SUBPART_KEY_COLUMNS' THEN '' WHEN 'ALL_TAB_PARTITIONS' THEN '' WHEN 'ALL_TAB_SUBPARTITIONS' THEN '' WHEN 'ALL_PART_TABLES' THEN '' WHEN 'DBA_PART_TABLES' THEN '' WHEN 'USER_PART_TABLES' THEN '' WHEN 'DBA_TAB_PARTITIONS' THEN '' WHEN 'USER_TAB_PARTITIONS' THEN '' WHEN 'DBA_TAB_SUBPARTITIONS' THEN '' WHEN 'USER_TAB_SUBPARTITIONS' THEN '' WHEN 'DBA_SUBPARTITION_TEMPLATES' THEN '' WHEN 'ALL_SUBPARTITION_TEMPLATES' THEN '' WHEN 'USER_SUBPARTITION_TEMPLATES' THEN '' WHEN 'DBA_PART_INDEXES' THEN '' WHEN 'ALL_PART_INDEXES' THEN '' WHEN 'USER_PART_INDEXES' THEN '' WHEN 'ALL_TAB_COLS_V$' THEN '' WHEN 'DBA_TAB_COLS_V$' THEN '' WHEN 'USER_TAB_COLS_V$' THEN '' WHEN 'USER_PROFILES' THEN '' WHEN 'ALL_PROFILES' THEN '' WHEN 'DBA_SCHEDULER_PROGRAM_ARGS' THEN '' WHEN 'USER_SCHEDULER_PROGRAM_ARGS' THEN '' WHEN 'USER_IND_EXPRESSIONS' THEN '' WHEN 'DBA_ERRORS' THEN '' WHEN 'USER_METHOD_PARAMS' THEN '' WHEN 'DBA_TABLESPACES' THEN '' WHEN 'ALL_IND_PARTITIONS' THEN '' WHEN 'USER_IND_PARTITIONS' THEN '' WHEN 'DBA_IND_PARTITIONS' THEN '' WHEN 'DBA_IND_SUBPARTITIONS' THEN '' WHEN 'ALL_IND_SUBPARTITIONS' THEN '' WHEN 'USER_IND_SUBPARTITIONS' THEN '' WHEN 'DBA_ROLES' THEN '' WHEN 'USER_TAB_PRIVS' THEN '' WHEN 'STMT_AUDIT_OPTION_MAP' THEN '' WHEN 'GV$OUTLINE' THEN '' WHEN 'GV$SQL_AUDIT' THEN '' WHEN 'V$SQL_AUDIT' THEN '' WHEN 'DBA_AUDIT_SESSION' THEN '' WHEN 'USER_AUDIT_SESSION' THEN '' WHEN 'GV$PLAN_CACHE_PLAN_STAT' THEN '' WHEN 'V$PLAN_CACHE_PLAN_STAT' THEN '' WHEN 'GV$PLAN_CACHE_PLAN_EXPLAIN' THEN '' WHEN 'V$PLAN_CACHE_PLAN_EXPLAIN' THEN '' WHEN 'GV$MEMSTORE' THEN '' WHEN 'V$MEMSTORE' THEN '' WHEN 'GV$MEMSTORE_INFO' THEN '' WHEN 'V$MEMSTORE_INFO' THEN '' WHEN 'GV$MEMORY' THEN '' WHEN 'V$MEMORY' THEN '' WHEN 'GV$SERVER_MEMSTORE' THEN '' WHEN 'GV$TENANT_MEMSTORE_ALLOCATOR_INFO' THEN '' WHEN 'V$TENANT_MEMSTORE_ALLOCATOR_INFO' THEN '' WHEN 'GV$PLAN_CACHE_STAT' THEN '' WHEN 'V$PLAN_CACHE_STAT' THEN '' WHEN 'GV$CONCURRENT_LIMIT_SQL' THEN '' WHEN 'NLS_INSTANCE_PARAMETERS' THEN '' WHEN 'GV$TENANT_PX_WORKER_STAT' THEN '' ELSE NULL END AS VARCHAR2(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_TABLE_SYS_AGENT WHERE BITAND(TABLE_ID, 1099511627775) > 25000 AND BITAND(TABLE_ID, 1099511627775) <= 30000 AND TABLE_TYPE = 1 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1962,10 +1892,10 @@ int ObInnerTableSchema::dictionary_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.25151_25200.cpp b/src/share/inner_table/ob_inner_table_schema.25151_25200.cpp index 3ee2bf36d..9100fd937 100644 --- a/src/share/inner_table/ob_inner_table_schema.25151_25200.cpp +++ b/src/share/inner_table/ob_inner_table_schema.25151_25200.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::dict_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dict_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -70,17 +72,16 @@ int ObInnerTableSchema::dict_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_triggers_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_triggers_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -111,8 +112,7 @@ int ObInnerTableSchema::all_triggers_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT DB1.DATABASE_NAME AS OWNER, TRG.TRIGGER_NAME AS TRIGGER_NAME, CAST(DECODE(BITAND(TRG.TIMING_POINTS, 30), 4, 'BEFORE EACH ROW', 8, 'AFTER EACH ROW') AS VARCHAR2(16)) AS TRIGGER_TYPE, CAST(DECODE(TRG.TRIGGER_EVENTS, 2, 'INSERT', 4, 'UPDATE', 8, 'DELETE', 2 + 4, 'INSERT OR UPDATE', 2 + 8, 'INSERT OR DELETE', 4 + 8, 'UPDATE OR DELETE', 2 + 4 + 8, 'INSERT OR UPDATE OR DELETE') AS VARCHAR2(246)) AS TRIGGERING_EVENT, DB2.DATABASE_NAME AS TABLE_OWNER, CAST(DECODE(TRG.BASE_OBJECT_TYPE, 5, 'TABLE') AS VARCHAR2(18)) AS BASE_OBJECT_TYPE, TBL.TABLE_NAME AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(CONCAT('REFERENCING', CONCAT(CONCAT(' NEW AS ', REF_NEW_NAME), CONCAT(' OLD AS ', REF_OLD_NAME))) AS VARCHAR2(422)) AS REFERENCING_NAMES, WHEN_CONDITION AS WHEN_CLAUSE, CAST(decode(BITAND(TRG.trigger_flags, 1), 1, 'ENABLED', 'DISABLED') AS VARCHAR2(8)) AS STATUS, TRIGGER_BODY AS DESCRIPTION, CAST('PL/SQL' AS VARCHAR2(11)) AS ACTION_TYPE, TRIGGER_BODY AS TRIGGER_BODY, CAST('NO' AS VARCHAR2(7)) AS CROSSEDITION, CAST('NO' AS VARCHAR2(3)) AS BEFORE_STATEMENT, CAST('NO' AS VARCHAR2(3)) AS BEFORE_ROW, CAST('NO' AS VARCHAR2(3)) AS AFTER_ROW, CAST('NO' AS VARCHAR2(3)) AS AFTER_STATEMENT, CAST('NO' AS VARCHAR2(3)) AS INSTEAD_OF_ROW, CAST('YES' AS VARCHAR2(3)) AS FIRE_ONCE, CAST('NO' AS VARCHAR2(3)) AS APPLY_SERVER_ONLY FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT TRG INNER JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB1 ON TRG.DATABASE_ID = DB1.DATABASE_ID AND TRG.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB1.TENANT_ID = EFFECTIVE_TENANT_ID() AND (TRG.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, abs(nvl(TRG.BASE_OBJECT_ID,0)), TRG.DATABASE_ID) = 1) LEFT JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TBL ON TRG.BASE_OBJECT_ID = TBL.TABLE_ID AND TBL.TENANT_ID = EFFECTIVE_TENANT_ID() INNER JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB2 ON TBL.DATABASE_ID = DB2.DATABASE_ID AND DB2.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT DB1.DATABASE_NAME AS OWNER, TRG.TRIGGER_NAME AS TRIGGER_NAME, CAST(DECODE(BITAND(TRG.TIMING_POINTS, 30), 4, 'BEFORE EACH ROW', 8, 'AFTER EACH ROW') AS VARCHAR2(16)) AS TRIGGER_TYPE, CAST(DECODE(TRG.TRIGGER_EVENTS, 2, 'INSERT', 4, 'UPDATE', 8, 'DELETE', 2 + 4, 'INSERT OR UPDATE', 2 + 8, 'INSERT OR DELETE', 4 + 8, 'UPDATE OR DELETE', 2 + 4 + 8, 'INSERT OR UPDATE OR DELETE') AS VARCHAR2(246)) AS TRIGGERING_EVENT, DB2.DATABASE_NAME AS TABLE_OWNER, CAST(DECODE(TRG.BASE_OBJECT_TYPE, 5, 'TABLE') AS VARCHAR2(18)) AS BASE_OBJECT_TYPE, TBL.TABLE_NAME AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(CONCAT('REFERENCING', CONCAT(CONCAT(' NEW AS ', REF_NEW_NAME), CONCAT(' OLD AS ', REF_OLD_NAME))) AS VARCHAR2(422)) AS REFERENCING_NAMES, WHEN_CONDITION AS WHEN_CLAUSE, CAST(decode(BITAND(TRG.trigger_flags, 1), 1, 'ENABLED', 'DISABLED') AS VARCHAR2(8)) AS STATUS, TRIGGER_BODY AS DESCRIPTION, CAST('PL/SQL' AS VARCHAR2(11)) AS ACTION_TYPE, TRIGGER_BODY AS TRIGGER_BODY, CAST('NO' AS VARCHAR2(7)) AS CROSSEDITION, CAST('NO' AS VARCHAR2(3)) AS BEFORE_STATEMENT, CAST('NO' AS VARCHAR2(3)) AS BEFORE_ROW, CAST('NO' AS VARCHAR2(3)) AS AFTER_ROW, CAST('NO' AS VARCHAR2(3)) AS AFTER_STATEMENT, CAST('NO' AS VARCHAR2(3)) AS INSTEAD_OF_ROW, CAST('YES' AS VARCHAR2(3)) AS FIRE_ONCE, CAST('NO' AS VARCHAR2(3)) AS APPLY_SERVER_ONLY FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT TRG INNER JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB1 ON TRG.DATABASE_ID = DB1.DATABASE_ID AND TRG.TENANT_ID = EFFECTIVE_TENANT_ID() AND DB1.TENANT_ID = EFFECTIVE_TENANT_ID() AND (TRG.DATABASE_ID = USERENV('SCHEMAID') OR USER_CAN_ACCESS_OBJ(1, abs(nvl(TRG.BASE_OBJECT_ID,0)), TRG.DATABASE_ID) = 1) LEFT JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TBL ON TRG.BASE_OBJECT_ID = TBL.TABLE_ID AND TBL.TENANT_ID = EFFECTIVE_TENANT_ID() INNER JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB2 ON TBL.DATABASE_ID = DB2.DATABASE_ID AND DB2.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -124,17 +124,16 @@ int ObInnerTableSchema::all_triggers_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_triggers_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_triggers_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -177,17 +176,16 @@ int ObInnerTableSchema::dba_triggers_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_triggers_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_triggers_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -218,8 +216,7 @@ int ObInnerTableSchema::user_triggers_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TRG.TRIGGER_NAME AS TRIGGER_NAME, CAST(DECODE(BITAND(TRG.TIMING_POINTS, 30), 4, 'BEFORE EACH ROW', 8, 'AFTER EACH ROW') AS VARCHAR2(16)) AS TRIGGER_TYPE, CAST(DECODE(TRG.TRIGGER_EVENTS, 2, 'INSERT', 4, 'UPDATE', 8, 'DELETE', 2 + 4, 'INSERT OR UPDATE', 2 + 8, 'INSERT OR DELETE', 4 + 8, 'UPDATE OR DELETE', 2 + 4 + 8, 'INSERT OR UPDATE OR DELETE') AS VARCHAR2(246)) AS TRIGGERING_EVENT, DB2.DATABASE_NAME AS TABLE_OWNER, CAST(DECODE(TRG.BASE_OBJECT_TYPE, 5, 'TABLE') AS VARCHAR2(18)) AS BASE_OBJECT_TYPE, TBL.TABLE_NAME AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(CONCAT('REFERENCING', CONCAT(CONCAT(' NEW AS ', REF_NEW_NAME), CONCAT(' OLD AS ', REF_OLD_NAME))) AS VARCHAR2(422)) AS REFERENCING_NAMES, WHEN_CONDITION AS WHEN_CLAUSE, CAST(decode(BITAND(TRG.trigger_flags, 1), 1, 'ENABLED', 'DISABLED') AS VARCHAR2(8)) AS STATUS, TRIGGER_BODY AS DESCRIPTION, CAST('PL/SQL' AS VARCHAR2(11)) AS ACTION_TYPE, TRIGGER_BODY AS TRIGGER_BODY, CAST('NO' AS VARCHAR2(7)) AS CROSSEDITION, CAST('NO' AS VARCHAR2(3)) AS BEFORE_STATEMENT, CAST('NO' AS VARCHAR2(3)) AS BEFORE_ROW, CAST('NO' AS VARCHAR2(3)) AS AFTER_ROW, CAST('NO' AS VARCHAR2(3)) AS AFTER_STATEMENT, CAST('NO' AS VARCHAR2(3)) AS INSTEAD_OF_ROW, CAST('YES' AS VARCHAR2(3)) AS FIRE_ONCE, CAST('NO' AS VARCHAR2(3)) AS APPLY_SERVER_ONLY FROM (SELECT * FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID())TRG LEFT JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TBL ON TRG.BASE_OBJECT_ID = TBL.TABLE_ID AND TBL.TENANT_ID = EFFECTIVE_TENANT_ID() INNER JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB2 ON TBL.DATABASE_ID = DB2.DATABASE_ID AND DB2.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE TRG.DATABASE_ID = USERENV('SCHEMAID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TRG.TRIGGER_NAME AS TRIGGER_NAME, CAST(DECODE(BITAND(TRG.TIMING_POINTS, 30), 4, 'BEFORE EACH ROW', 8, 'AFTER EACH ROW') AS VARCHAR2(16)) AS TRIGGER_TYPE, CAST(DECODE(TRG.TRIGGER_EVENTS, 2, 'INSERT', 4, 'UPDATE', 8, 'DELETE', 2 + 4, 'INSERT OR UPDATE', 2 + 8, 'INSERT OR DELETE', 4 + 8, 'UPDATE OR DELETE', 2 + 4 + 8, 'INSERT OR UPDATE OR DELETE') AS VARCHAR2(246)) AS TRIGGERING_EVENT, DB2.DATABASE_NAME AS TABLE_OWNER, CAST(DECODE(TRG.BASE_OBJECT_TYPE, 5, 'TABLE') AS VARCHAR2(18)) AS BASE_OBJECT_TYPE, TBL.TABLE_NAME AS TABLE_NAME, CAST(NULL AS VARCHAR2(4000)) AS COLUMN_NAME, CAST(CONCAT('REFERENCING', CONCAT(CONCAT(' NEW AS ', REF_NEW_NAME), CONCAT(' OLD AS ', REF_OLD_NAME))) AS VARCHAR2(422)) AS REFERENCING_NAMES, WHEN_CONDITION AS WHEN_CLAUSE, CAST(decode(BITAND(TRG.trigger_flags, 1), 1, 'ENABLED', 'DISABLED') AS VARCHAR2(8)) AS STATUS, TRIGGER_BODY AS DESCRIPTION, CAST('PL/SQL' AS VARCHAR2(11)) AS ACTION_TYPE, TRIGGER_BODY AS TRIGGER_BODY, CAST('NO' AS VARCHAR2(7)) AS CROSSEDITION, CAST('NO' AS VARCHAR2(3)) AS BEFORE_STATEMENT, CAST('NO' AS VARCHAR2(3)) AS BEFORE_ROW, CAST('NO' AS VARCHAR2(3)) AS AFTER_ROW, CAST('NO' AS VARCHAR2(3)) AS AFTER_STATEMENT, CAST('NO' AS VARCHAR2(3)) AS INSTEAD_OF_ROW, CAST('YES' AS VARCHAR2(3)) AS FIRE_ONCE, CAST('NO' AS VARCHAR2(3)) AS APPLY_SERVER_ONLY FROM (SELECT * FROM SYS.ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID())TRG LEFT JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT TBL ON TRG.BASE_OBJECT_ID = TBL.TABLE_ID AND TBL.TENANT_ID = EFFECTIVE_TENANT_ID() INNER JOIN SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT DB2 ON TBL.DATABASE_ID = DB2.DATABASE_ID AND DB2.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE TRG.DATABASE_ID = USERENV('SCHEMAID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -231,17 +228,16 @@ int ObInnerTableSchema::user_triggers_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_dependencies_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_dependencies_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -272,8 +268,7 @@ int ObInnerTableSchema::all_dependencies_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT o.OWNER AS OWNER, o.OBJECT_NAME AS NAME, o.OBJECT_TYPE AS TYPE, ro.REFERENCED_OWNER AS REFERENCED_OWNER, ro.REFERENCED_NAME AS REFERENCED_NAME, DECODE(ro.REFERENCED_TYPE, NULL, ' NON-EXISTENT', ro.REFERENCED_TYPE) AS REFERENCED_TYPE, CAST(NULL AS VARCHAR2(128)) AS REFERENCED_LINK_NAME, CAST(DECODE(BITAND(o.PROPERTY, 3), 2, 'REF', 'HARD') AS VARCHAR2(4)) AS DEPENDENCY_TYPE FROM (select OWNER, OBJECT_NAME, OBJECT_TYPE, REF_OBJ_NAME, ref_obj_type, dep_obj_id, dep_obj_type, dep_order, property from SYS.ALL_OBJECTS o, SYS.ALL_VIRTUAL_DEPENDENCY_AGENT d WHERE CAST(UPPER(decode(d.dep_obj_type, 1, 'TABLE', 2, 'SEQUENCE', 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 10, 'DIRECTORY', 11, 'INDEX', 12, 'PROCEDURE', 13, 'SYNONYM', 'MAXTYPE')) AS VARCHAR2(23)) = o.OBJECT_TYPE AND d.DEP_OBJ_ID = o.OBJECT_ID) o LEFT OUTER JOIN (SELECT DISTINCT CAST(OWNER AS VARCHAR2(128)) AS REFERENCED_OWNER, CAST(OBJECT_NAME AS VARCHAR2(128)) AS REFERENCED_NAME, CAST(OBJECT_TYPE AS VARCHAR2(18)) AS REFERENCED_TYPE, dep_obj_id, dep_obj_type, dep_order FROM SYS.ALL_OBJECTS o, SYS.ALL_VIRTUAL_DEPENDENCY_AGENT d WHERE CAST(UPPER(decode(d.ref_obj_type, 1, 'TABLE', 2, 'SEQUENCE', 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 10, 'DIRECTORY', 11, 'INDEX', 12, 'PROCEDURE', 13, 'SYNONYM', 'MAXTYPE')) AS VARCHAR2(23)) = o.OBJECT_TYPE AND d.REF_OBJ_ID = o.OBJECT_ID) ro on ro.dep_obj_id = o.dep_obj_id AND ro.dep_obj_type = o.dep_obj_type AND ro.dep_order = o.dep_order )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT o.OWNER AS OWNER, o.OBJECT_NAME AS NAME, o.OBJECT_TYPE AS TYPE, ro.REFERENCED_OWNER AS REFERENCED_OWNER, ro.REFERENCED_NAME AS REFERENCED_NAME, DECODE(ro.REFERENCED_TYPE, NULL, ' NON-EXISTENT', ro.REFERENCED_TYPE) AS REFERENCED_TYPE, CAST(NULL AS VARCHAR2(128)) AS REFERENCED_LINK_NAME, CAST(DECODE(BITAND(o.PROPERTY, 3), 2, 'REF', 'HARD') AS VARCHAR2(4)) AS DEPENDENCY_TYPE FROM (select OWNER, OBJECT_NAME, OBJECT_TYPE, REF_OBJ_NAME, ref_obj_type, dep_obj_id, dep_obj_type, dep_order, property from SYS.ALL_OBJECTS o, SYS.ALL_VIRTUAL_DEPENDENCY_AGENT d WHERE CAST(UPPER(decode(d.dep_obj_type, 1, 'TABLE', 2, 'SEQUENCE', 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 10, 'DIRECTORY', 11, 'INDEX', 12, 'PROCEDURE', 13, 'SYNONYM', 'MAXTYPE')) AS VARCHAR2(23)) = o.OBJECT_TYPE AND d.DEP_OBJ_ID = o.OBJECT_ID) o LEFT OUTER JOIN (SELECT DISTINCT CAST(OWNER AS VARCHAR2(128)) AS REFERENCED_OWNER, CAST(OBJECT_NAME AS VARCHAR2(128)) AS REFERENCED_NAME, CAST(OBJECT_TYPE AS VARCHAR2(18)) AS REFERENCED_TYPE, dep_obj_id, dep_obj_type, dep_order FROM SYS.ALL_OBJECTS o, SYS.ALL_VIRTUAL_DEPENDENCY_AGENT d WHERE CAST(UPPER(decode(d.ref_obj_type, 1, 'TABLE', 2, 'SEQUENCE', 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 10, 'DIRECTORY', 11, 'INDEX', 12, 'PROCEDURE', 13, 'SYNONYM', 'MAXTYPE')) AS VARCHAR2(23)) = o.OBJECT_TYPE AND d.REF_OBJ_ID = o.OBJECT_ID) ro on ro.dep_obj_id = o.dep_obj_id AND ro.dep_obj_type = o.dep_obj_type AND ro.dep_order = o.dep_order )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -285,17 +280,16 @@ int ObInnerTableSchema::all_dependencies_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_dependencies_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_dependencies_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -326,8 +320,7 @@ int ObInnerTableSchema::dba_dependencies_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT o.OWNER AS OWNER, o.OBJECT_NAME AS NAME, o.OBJECT_TYPE AS TYPE, ro.REFERENCED_OWNER AS REFERENCED_OWNER, ro.REFERENCED_NAME AS REFERENCED_NAME, DECODE(ro.REFERENCED_TYPE, NULL, ' NON-EXISTENT', ro.REFERENCED_TYPE) AS REFERENCED_TYPE, CAST(NULL AS VARCHAR2(128)) AS REFERENCED_LINK_NAME, CAST(DECODE(BITAND(o.PROPERTY, 3), 2, 'REF', 'HARD') AS VARCHAR2(4)) AS DEPENDENCY_TYPE FROM (select OWNER, OBJECT_NAME, OBJECT_TYPE, REF_OBJ_NAME, ref_obj_type, dep_obj_id, dep_obj_type, dep_order, property from SYS.ALL_OBJECTS o, SYS.ALL_VIRTUAL_DEPENDENCY_AGENT d WHERE CAST(UPPER(decode(d.dep_obj_type, 1, 'TABLE', 2, 'SEQUENCE', 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 10, 'DIRECTORY', 11, 'INDEX', 12, 'PROCEDURE', 13, 'SYNONYM', 'MAXTYPE')) AS VARCHAR2(23)) = o.OBJECT_TYPE AND d.DEP_OBJ_ID = o.OBJECT_ID) o LEFT OUTER JOIN (SELECT DISTINCT CAST(OWNER AS VARCHAR2(128)) AS REFERENCED_OWNER, CAST(OBJECT_NAME AS VARCHAR2(128)) AS REFERENCED_NAME, CAST(OBJECT_TYPE AS VARCHAR2(18)) AS REFERENCED_TYPE, dep_obj_id, dep_obj_type, dep_order FROM SYS.ALL_OBJECTS o, SYS.ALL_VIRTUAL_DEPENDENCY_AGENT d WHERE CAST(UPPER(decode(d.ref_obj_type, 1, 'TABLE', 2, 'SEQUENCE', 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 10, 'DIRECTORY', 11, 'INDEX', 12, 'PROCEDURE', 13, 'SYNONYM', 'MAXTYPE')) AS VARCHAR2(23)) = o.OBJECT_TYPE AND d.REF_OBJ_ID = o.OBJECT_ID) ro on ro.dep_obj_id = o.dep_obj_id AND ro.dep_obj_type = o.dep_obj_type AND ro.dep_order = o.dep_order )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT o.OWNER AS OWNER, o.OBJECT_NAME AS NAME, o.OBJECT_TYPE AS TYPE, ro.REFERENCED_OWNER AS REFERENCED_OWNER, ro.REFERENCED_NAME AS REFERENCED_NAME, DECODE(ro.REFERENCED_TYPE, NULL, ' NON-EXISTENT', ro.REFERENCED_TYPE) AS REFERENCED_TYPE, CAST(NULL AS VARCHAR2(128)) AS REFERENCED_LINK_NAME, CAST(DECODE(BITAND(o.PROPERTY, 3), 2, 'REF', 'HARD') AS VARCHAR2(4)) AS DEPENDENCY_TYPE FROM (select OWNER, OBJECT_NAME, OBJECT_TYPE, REF_OBJ_NAME, ref_obj_type, dep_obj_id, dep_obj_type, dep_order, property from SYS.ALL_OBJECTS o, SYS.ALL_VIRTUAL_DEPENDENCY_AGENT d WHERE CAST(UPPER(decode(d.dep_obj_type, 1, 'TABLE', 2, 'SEQUENCE', 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 10, 'DIRECTORY', 11, 'INDEX', 12, 'PROCEDURE', 13, 'SYNONYM', 'MAXTYPE')) AS VARCHAR2(23)) = o.OBJECT_TYPE AND d.DEP_OBJ_ID = o.OBJECT_ID) o LEFT OUTER JOIN (SELECT DISTINCT CAST(OWNER AS VARCHAR2(128)) AS REFERENCED_OWNER, CAST(OBJECT_NAME AS VARCHAR2(128)) AS REFERENCED_NAME, CAST(OBJECT_TYPE AS VARCHAR2(18)) AS REFERENCED_TYPE, dep_obj_id, dep_obj_type, dep_order FROM SYS.ALL_OBJECTS o, SYS.ALL_VIRTUAL_DEPENDENCY_AGENT d WHERE CAST(UPPER(decode(d.ref_obj_type, 1, 'TABLE', 2, 'SEQUENCE', 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 10, 'DIRECTORY', 11, 'INDEX', 12, 'PROCEDURE', 13, 'SYNONYM', 'MAXTYPE')) AS VARCHAR2(23)) = o.OBJECT_TYPE AND d.REF_OBJ_ID = o.OBJECT_ID) ro on ro.dep_obj_id = o.dep_obj_id AND ro.dep_obj_type = o.dep_obj_type AND ro.dep_order = o.dep_order )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -339,17 +332,16 @@ int ObInnerTableSchema::dba_dependencies_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_dependencies_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_dependencies_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -380,8 +372,7 @@ int ObInnerTableSchema::user_dependencies_ora_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT o.OBJECT_NAME AS NAME, o.OBJECT_TYPE AS TYPE, ro.REFERENCED_OWNER AS REFERENCED_OWNER, ro.REFERENCED_NAME AS REFERENCED_NAME, DECODE(ro.REFERENCED_TYPE, NULL, ' NON-EXISTENT', ro.REFERENCED_TYPE) AS REFERENCED_TYPE, CAST(NULL AS VARCHAR2(128)) AS REFERENCED_LINK_NAME, CAST(USERENV('SCHEMAID') AS NUMBER) AS SCHEMAID, CAST(DECODE(BITAND(o.PROPERTY, 3), 2, 'REF', 'HARD') AS VARCHAR2(4)) AS DEPENDENCY_TYPE FROM (select OWNER, OBJECT_NAME, OBJECT_TYPE, REF_OBJ_NAME, ref_obj_type, dep_obj_id, dep_obj_type, dep_order, property from SYS.ALL_OBJECTS o, SYS.ALL_VIRTUAL_DEPENDENCY_AGENT d WHERE CAST(UPPER(decode(d.dep_obj_type, 1, 'TABLE', 2, 'SEQUENCE', 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 10, 'DIRECTORY', 11, 'INDEX', 12, 'PROCEDURE', 13, 'SYNONYM', 'MAXTYPE')) AS VARCHAR2(23)) = o.OBJECT_TYPE AND d.DEP_OBJ_ID = o.OBJECT_ID) o LEFT OUTER JOIN (SELECT DISTINCT CAST(OWNER AS VARCHAR2(128)) AS REFERENCED_OWNER, CAST(OBJECT_NAME AS VARCHAR2(128)) AS REFERENCED_NAME, CAST(OBJECT_TYPE AS VARCHAR2(18)) AS REFERENCED_TYPE, dep_obj_id, dep_obj_type, dep_order FROM SYS.ALL_OBJECTS o, SYS.ALL_VIRTUAL_DEPENDENCY_AGENT d WHERE CAST(UPPER(decode(d.ref_obj_type, 1, 'TABLE', 2, 'SEQUENCE', 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 10, 'DIRECTORY', 11, 'INDEX', 12, 'PROCEDURE', 13, 'SYNONYM', 'MAXTYPE')) AS VARCHAR2(23)) = o.OBJECT_TYPE AND d.REF_OBJ_ID = o.OBJECT_ID) ro on ro.dep_obj_id = o.dep_obj_id AND ro.dep_obj_type = o.dep_obj_type AND ro.dep_order = o.dep_order )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT o.OBJECT_NAME AS NAME, o.OBJECT_TYPE AS TYPE, ro.REFERENCED_OWNER AS REFERENCED_OWNER, ro.REFERENCED_NAME AS REFERENCED_NAME, DECODE(ro.REFERENCED_TYPE, NULL, ' NON-EXISTENT', ro.REFERENCED_TYPE) AS REFERENCED_TYPE, CAST(NULL AS VARCHAR2(128)) AS REFERENCED_LINK_NAME, CAST(USERENV('SCHEMAID') AS NUMBER) AS SCHEMAID, CAST(DECODE(BITAND(o.PROPERTY, 3), 2, 'REF', 'HARD') AS VARCHAR2(4)) AS DEPENDENCY_TYPE FROM (select OWNER, OBJECT_NAME, OBJECT_TYPE, REF_OBJ_NAME, ref_obj_type, dep_obj_id, dep_obj_type, dep_order, property from SYS.ALL_OBJECTS o, SYS.ALL_VIRTUAL_DEPENDENCY_AGENT d WHERE CAST(UPPER(decode(d.dep_obj_type, 1, 'TABLE', 2, 'SEQUENCE', 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 10, 'DIRECTORY', 11, 'INDEX', 12, 'PROCEDURE', 13, 'SYNONYM', 'MAXTYPE')) AS VARCHAR2(23)) = o.OBJECT_TYPE AND d.DEP_OBJ_ID = o.OBJECT_ID) o LEFT OUTER JOIN (SELECT DISTINCT CAST(OWNER AS VARCHAR2(128)) AS REFERENCED_OWNER, CAST(OBJECT_NAME AS VARCHAR2(128)) AS REFERENCED_NAME, CAST(OBJECT_TYPE AS VARCHAR2(18)) AS REFERENCED_TYPE, dep_obj_id, dep_obj_type, dep_order FROM SYS.ALL_OBJECTS o, SYS.ALL_VIRTUAL_DEPENDENCY_AGENT d WHERE CAST(UPPER(decode(d.ref_obj_type, 1, 'TABLE', 2, 'SEQUENCE', 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 10, 'DIRECTORY', 11, 'INDEX', 12, 'PROCEDURE', 13, 'SYNONYM', 'MAXTYPE')) AS VARCHAR2(23)) = o.OBJECT_TYPE AND d.REF_OBJ_ID = o.OBJECT_ID) ro on ro.dep_obj_id = o.dep_obj_id AND ro.dep_obj_type = o.dep_obj_type AND ro.dep_order = o.dep_order )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -393,17 +384,16 @@ int ObInnerTableSchema::user_dependencies_ora_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_rsrc_plans_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_rsrc_plans_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -434,8 +424,7 @@ int ObInnerTableSchema::dba_rsrc_plans_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT /*+ READ_CONSISTENCY(WEAK) */ CAST(NULL AS NUMBER) AS PLAN_ID, PLAN, CAST(NULL AS NUMBER) AS NUM_PLAN_DIRECTIVES, CAST(NULL AS VARCHAR2(128)) AS CPU_METHOD, CAST(NULL AS VARCHAR2(128)) AS MGMT_METHOD, CAST(NULL AS VARCHAR2(128)) AS ACTIVE_SESS_POOL_MTH, CAST(NULL AS VARCHAR2(128)) AS PARALLEL_DEGREE_LIMIT_MTH, CAST(NULL AS VARCHAR2(128)) AS QUEUING_MTH, CAST(NULL AS VARCHAR2(3)) AS SUB_PLAN, COMMENTS, CAST(NULL AS VARCHAR2(128)) AS STATUS, CAST(NULL AS VARCHAR2(3)) AS MANDATORY FROM SYS.ALL_VIRTUAL_RES_MGR_PLAN_REAL_AGENT )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT /*+ READ_CONSISTENCY(WEAK) */ CAST(NULL AS NUMBER) AS PLAN_ID, PLAN, CAST(NULL AS NUMBER) AS NUM_PLAN_DIRECTIVES, CAST(NULL AS VARCHAR2(128)) AS CPU_METHOD, CAST(NULL AS VARCHAR2(128)) AS MGMT_METHOD, CAST(NULL AS VARCHAR2(128)) AS ACTIVE_SESS_POOL_MTH, CAST(NULL AS VARCHAR2(128)) AS PARALLEL_DEGREE_LIMIT_MTH, CAST(NULL AS VARCHAR2(128)) AS QUEUING_MTH, CAST(NULL AS VARCHAR2(3)) AS SUB_PLAN, COMMENTS, CAST(NULL AS VARCHAR2(128)) AS STATUS, CAST(NULL AS VARCHAR2(3)) AS MANDATORY FROM SYS.ALL_VIRTUAL_RES_MGR_PLAN_REAL_AGENT )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -447,17 +436,16 @@ int ObInnerTableSchema::dba_rsrc_plans_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_rsrc_plan_directives_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_rsrc_plan_directives_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -488,8 +476,7 @@ int ObInnerTableSchema::dba_rsrc_plan_directives_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT /*+ READ_CONSISTENCY(WEAK) */ PLAN, GROUP_OR_SUBPLAN, CAST(NULL AS VARCHAR2(14)) AS TYPE, CAST(NULL AS NUMBER) AS CPU_P1, CAST(NULL AS NUMBER) AS CPU_P2, CAST(NULL AS NUMBER) AS CPU_P3, CAST(NULL AS NUMBER) AS CPU_P4, CAST(NULL AS NUMBER) AS CPU_P5, CAST(NULL AS NUMBER) AS CPU_P6, CAST(NULL AS NUMBER) AS CPU_P7, CAST(NULL AS NUMBER) AS CPU_P8, MGMT_P1, CAST(NULL AS NUMBER) AS MGMT_P2, CAST(NULL AS NUMBER) AS MGMT_P3, CAST(NULL AS NUMBER) AS MGMT_P4, CAST(NULL AS NUMBER) AS MGMT_P5, CAST(NULL AS NUMBER) AS MGMT_P6, CAST(NULL AS NUMBER) AS MGMT_P7, CAST(NULL AS NUMBER) AS MGMT_P8, CAST(NULL AS NUMBER) AS ACTIVE_SESS_POOL_P1, CAST(NULL AS NUMBER) AS QUEUEING_P1, CAST(NULL AS NUMBER) AS PARALLEL_TARGET_PERCENTAGE, CAST(NULL AS NUMBER) AS PARALLEL_DEGREE_LIMIT_P1, CAST(NULL AS VARCHAR2(128)) AS SWITCH_GROUP, CAST(NULL AS VARCHAR2(5)) AS SWITCH_FOR_CALL, CAST(NULL AS NUMBER) AS SWITCH_TIME, CAST(NULL AS NUMBER) AS SWITCH_IO_MEGABYTES, CAST(NULL AS NUMBER) AS SWITCH_IO_REQS, CAST(NULL AS VARCHAR2(5)) AS SWITCH_ESTIMATE, CAST(NULL AS NUMBER) AS MAX_EST_EXEC_TIME, CAST(NULL AS NUMBER) AS UNDO_POOL, CAST(NULL AS NUMBER) AS MAX_IDLE_TIME, CAST(NULL AS NUMBER) AS MAX_IDLE_BLOCKER_TIME, CAST(NULL AS NUMBER) AS MAX_UTILIZATION_LIMIT, CAST(NULL AS NUMBER) AS PARALLEL_QUEUE_TIMEOUT, CAST(NULL AS NUMBER) AS SWITCH_TIME_IN_CALL, CAST(NULL AS NUMBER) AS SWITCH_IO_LOGICAL, CAST(NULL AS NUMBER) AS SWITCH_ELAPSED_TIME, CAST(NULL AS NUMBER) AS PARALLEL_SERVER_LIMIT, UTILIZATION_LIMIT, CAST(NULL AS VARCHAR2(12)) AS PARALLEL_STMT_CRITICAL, CAST(NULL AS NUMBER) AS SESSION_PGA_LIMIT, CAST(NULL AS VARCHAR2(6)) AS PQ_TIMEOUT_ACTION, COMMENTS, CAST(NULL AS VARCHAR2(128)) AS STATUS, CAST('YES' AS VARCHAR2(3)) AS MANDATORY FROM SYS.ALL_VIRTUAL_RES_MGR_DIRECTIVE_REAL_AGENT )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT /*+ READ_CONSISTENCY(WEAK) */ PLAN, GROUP_OR_SUBPLAN, CAST(NULL AS VARCHAR2(14)) AS TYPE, CAST(NULL AS NUMBER) AS CPU_P1, CAST(NULL AS NUMBER) AS CPU_P2, CAST(NULL AS NUMBER) AS CPU_P3, CAST(NULL AS NUMBER) AS CPU_P4, CAST(NULL AS NUMBER) AS CPU_P5, CAST(NULL AS NUMBER) AS CPU_P6, CAST(NULL AS NUMBER) AS CPU_P7, CAST(NULL AS NUMBER) AS CPU_P8, MGMT_P1, CAST(NULL AS NUMBER) AS MGMT_P2, CAST(NULL AS NUMBER) AS MGMT_P3, CAST(NULL AS NUMBER) AS MGMT_P4, CAST(NULL AS NUMBER) AS MGMT_P5, CAST(NULL AS NUMBER) AS MGMT_P6, CAST(NULL AS NUMBER) AS MGMT_P7, CAST(NULL AS NUMBER) AS MGMT_P8, CAST(NULL AS NUMBER) AS ACTIVE_SESS_POOL_P1, CAST(NULL AS NUMBER) AS QUEUEING_P1, CAST(NULL AS NUMBER) AS PARALLEL_TARGET_PERCENTAGE, CAST(NULL AS NUMBER) AS PARALLEL_DEGREE_LIMIT_P1, CAST(NULL AS VARCHAR2(128)) AS SWITCH_GROUP, CAST(NULL AS VARCHAR2(5)) AS SWITCH_FOR_CALL, CAST(NULL AS NUMBER) AS SWITCH_TIME, CAST(NULL AS NUMBER) AS SWITCH_IO_MEGABYTES, CAST(NULL AS NUMBER) AS SWITCH_IO_REQS, CAST(NULL AS VARCHAR2(5)) AS SWITCH_ESTIMATE, CAST(NULL AS NUMBER) AS MAX_EST_EXEC_TIME, CAST(NULL AS NUMBER) AS UNDO_POOL, CAST(NULL AS NUMBER) AS MAX_IDLE_TIME, CAST(NULL AS NUMBER) AS MAX_IDLE_BLOCKER_TIME, CAST(NULL AS NUMBER) AS MAX_UTILIZATION_LIMIT, CAST(NULL AS NUMBER) AS PARALLEL_QUEUE_TIMEOUT, CAST(NULL AS NUMBER) AS SWITCH_TIME_IN_CALL, CAST(NULL AS NUMBER) AS SWITCH_IO_LOGICAL, CAST(NULL AS NUMBER) AS SWITCH_ELAPSED_TIME, CAST(NULL AS NUMBER) AS PARALLEL_SERVER_LIMIT, UTILIZATION_LIMIT, CAST(NULL AS VARCHAR2(12)) AS PARALLEL_STMT_CRITICAL, CAST(NULL AS NUMBER) AS SESSION_PGA_LIMIT, CAST(NULL AS VARCHAR2(6)) AS PQ_TIMEOUT_ACTION, COMMENTS, CAST(NULL AS VARCHAR2(128)) AS STATUS, CAST('YES' AS VARCHAR2(3)) AS MANDATORY FROM SYS.ALL_VIRTUAL_RES_MGR_DIRECTIVE_REAL_AGENT )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -501,17 +488,16 @@ int ObInnerTableSchema::dba_rsrc_plan_directives_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_rsrc_group_mappings_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_rsrc_group_mappings_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -542,8 +528,7 @@ int ObInnerTableSchema::dba_rsrc_group_mappings_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT /*+ READ_CONSISTENCY(WEAK) */ ATTRIBUTE, VALUE, CONSUMER_GROUP, CAST(NULL AS VARCHAR2(128)) AS STATUS FROM SYS.ALL_VIRTUAL_RES_MGR_MAPPING_RULE_REAL_AGENT )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT /*+ READ_CONSISTENCY(WEAK) */ ATTRIBUTE, VALUE, CONSUMER_GROUP, CAST(NULL AS VARCHAR2(128)) AS STATUS FROM SYS.ALL_VIRTUAL_RES_MGR_MAPPING_RULE_REAL_AGENT )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -555,17 +540,16 @@ int ObInnerTableSchema::dba_rsrc_group_mappings_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_recyclebin_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_recyclebin_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -596,8 +580,7 @@ int ObInnerTableSchema::dba_recyclebin_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT OWNER, OBJECT_NAME, ORIGINAL_NAME, OPERATION, TYPE, CAST(TABLESPACE_NAME AS VARCHAR2(30)) AS TS_NAME, CREATETIME, DROPTIME, DROPSCN, PARTITION_NAME, CAN_UNDROP, CAN_PURGE, RELATED, BASE_OBJECT, PURGE_OBJECT, SPACE FROM (SELECT CAST(B.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.OBJECT_NAME AS VARCHAR2(128)) AS OBJECT_NAME, CAST(A.ORIGINAL_NAME AS VARCHAR2(128)) AS ORIGINAL_NAME, CAST(NULL AS VARCHAR2(9)) AS OPERATION, CAST(CASE A.TYPE WHEN 1 THEN 'TABLE' WHEN 2 THEN 'NORMAL INDEX' WHEN 3 THEN 'VIEW' WHEN 4 THEN 'DATABASE' WHEN 5 THEN 'AUX_VP' WHEN 6 THEN 'TRIGGER' ELSE NULL END AS VARCHAR2(25)) AS TYPE, CAST(NULL AS VARCHAR2(30)) AS TS_NAME, CAST(C.GMT_CREATE AS VARCHAR(30)) AS CREATETIME, CAST(C.GMT_MODIFIED AS VARCHAR(30)) AS DROPTIME, CAST(NULL AS NUMBER) AS DROPSCN, CAST(NULL AS VARCHAR2(128)) AS PARTITION_NAME, CAST('YES' AS VARCHAR2(3)) AS CAN_UNDROP, CAST('YES' AS VARCHAR2(3)) AS CAN_PURGE, CAST(NULL AS NUMBER) AS RELATED, CAST(NULL AS NUMBER) AS BASE_OBJECT, CAST(NULL AS NUMBER) AS PURGE_OBJECT, CAST(NULL AS NUMBER) AS SPACE, C.TABLE_ID AS TABLE_ID, C.TABLESPACE_ID AS TABLESPACE_ID FROM SYS.ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT A, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT C WHERE A.DATABASE_ID = B.DATABASE_ID AND A.TABLE_ID = C.TABLE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID()) LEFT_TABLE LEFT JOIN (SELECT TABLESPACE_NAME, TABLESPACE_ID FROM SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT) RIGHT_TABLE ON LEFT_TABLE.TABLESPACE_ID = RIGHT_TABLE.TABLESPACE_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT OWNER, OBJECT_NAME, ORIGINAL_NAME, OPERATION, TYPE, CAST(TABLESPACE_NAME AS VARCHAR2(30)) AS TS_NAME, CREATETIME, DROPTIME, DROPSCN, PARTITION_NAME, CAN_UNDROP, CAN_PURGE, RELATED, BASE_OBJECT, PURGE_OBJECT, SPACE FROM (SELECT CAST(B.DATABASE_NAME AS VARCHAR2(128)) AS OWNER, CAST(A.OBJECT_NAME AS VARCHAR2(128)) AS OBJECT_NAME, CAST(A.ORIGINAL_NAME AS VARCHAR2(128)) AS ORIGINAL_NAME, CAST(NULL AS VARCHAR2(9)) AS OPERATION, CAST(CASE A.TYPE WHEN 1 THEN 'TABLE' WHEN 2 THEN 'NORMAL INDEX' WHEN 3 THEN 'VIEW' WHEN 4 THEN 'DATABASE' WHEN 5 THEN 'AUX_VP' WHEN 6 THEN 'TRIGGER' ELSE NULL END AS VARCHAR2(25)) AS TYPE, CAST(NULL AS VARCHAR2(30)) AS TS_NAME, CAST(C.GMT_CREATE AS VARCHAR(30)) AS CREATETIME, CAST(C.GMT_MODIFIED AS VARCHAR(30)) AS DROPTIME, CAST(NULL AS NUMBER) AS DROPSCN, CAST(NULL AS VARCHAR2(128)) AS PARTITION_NAME, CAST('YES' AS VARCHAR2(3)) AS CAN_UNDROP, CAST('YES' AS VARCHAR2(3)) AS CAN_PURGE, CAST(NULL AS NUMBER) AS RELATED, CAST(NULL AS NUMBER) AS BASE_OBJECT, CAST(NULL AS NUMBER) AS PURGE_OBJECT, CAST(NULL AS NUMBER) AS SPACE, C.TABLE_ID AS TABLE_ID, C.TABLESPACE_ID AS TABLESPACE_ID FROM SYS.ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT A, SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT B, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT C WHERE A.DATABASE_ID = B.DATABASE_ID AND A.TABLE_ID = C.TABLE_ID AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND B.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID()) LEFT_TABLE LEFT JOIN (SELECT TABLESPACE_NAME, TABLESPACE_ID FROM SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT) RIGHT_TABLE ON LEFT_TABLE.TABLESPACE_ID = RIGHT_TABLE.TABLESPACE_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -609,17 +592,16 @@ int ObInnerTableSchema::dba_recyclebin_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::user_recyclebin_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::user_recyclebin_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -650,8 +632,7 @@ int ObInnerTableSchema::user_recyclebin_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL( - table_schema.set_view_definition(R"__( SELECT OBJECT_NAME, ORIGINAL_NAME, OPERATION, TYPE, CAST(TABLESPACE_NAME AS VARCHAR2(30)) AS TS_NAME, CREATETIME, DROPTIME, DROPSCN, PARTITION_NAME, CAN_UNDROP, CAN_PURGE, RELATED, BASE_OBJECT, PURGE_OBJECT, SPACE FROM (SELECT CAST(A.OBJECT_NAME AS VARCHAR2(128)) AS OBJECT_NAME, CAST(A.ORIGINAL_NAME AS VARCHAR2(128)) AS ORIGINAL_NAME, CAST(NULL AS VARCHAR2(9)) AS OPERATION, CAST(CASE A.TYPE WHEN 1 THEN 'TABLE' WHEN 2 THEN 'NORMAL INDEX' WHEN 3 THEN 'VIEW' WHEN 4 THEN 'DATABASE' WHEN 5 THEN 'AUX_VP' WHEN 6 THEN 'TRIGGER' ELSE NULL END AS VARCHAR2(25)) AS TYPE, CAST(NULL AS VARCHAR2(30)) AS TS_NAME, CAST(C.GMT_CREATE AS VARCHAR(30)) AS CREATETIME, CAST(C.GMT_MODIFIED AS VARCHAR(30)) AS DROPTIME, CAST(NULL AS NUMBER) AS DROPSCN, CAST(NULL AS VARCHAR2(128)) AS PARTITION_NAME, CAST('YES' AS VARCHAR2(3)) AS CAN_UNDROP, CAST('YES' AS VARCHAR2(3)) AS CAN_PURGE, CAST(NULL AS NUMBER) AS RELATED, CAST(NULL AS NUMBER) AS BASE_OBJECT, CAST(NULL AS NUMBER) AS PURGE_OBJECT, CAST(NULL AS NUMBER) AS SPACE, C.TABLE_ID AS TABLE_ID, C.TABLESPACE_ID AS TABLESPACE_ID FROM SYS.ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT C WHERE A.TABLE_ID = C.TABLE_ID AND A.DATABASE_ID = USERENV('SCHEMAID') AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID()) LEFT_TABLE LEFT JOIN (SELECT TABLESPACE_NAME, TABLESPACE_ID FROM SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) RIGHT_TABLE ON LEFT_TABLE.TABLESPACE_ID = RIGHT_TABLE.TABLESPACE_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT OBJECT_NAME, ORIGINAL_NAME, OPERATION, TYPE, CAST(TABLESPACE_NAME AS VARCHAR2(30)) AS TS_NAME, CREATETIME, DROPTIME, DROPSCN, PARTITION_NAME, CAN_UNDROP, CAN_PURGE, RELATED, BASE_OBJECT, PURGE_OBJECT, SPACE FROM (SELECT CAST(A.OBJECT_NAME AS VARCHAR2(128)) AS OBJECT_NAME, CAST(A.ORIGINAL_NAME AS VARCHAR2(128)) AS ORIGINAL_NAME, CAST(NULL AS VARCHAR2(9)) AS OPERATION, CAST(CASE A.TYPE WHEN 1 THEN 'TABLE' WHEN 2 THEN 'NORMAL INDEX' WHEN 3 THEN 'VIEW' WHEN 4 THEN 'DATABASE' WHEN 5 THEN 'AUX_VP' WHEN 6 THEN 'TRIGGER' ELSE NULL END AS VARCHAR2(25)) AS TYPE, CAST(NULL AS VARCHAR2(30)) AS TS_NAME, CAST(C.GMT_CREATE AS VARCHAR(30)) AS CREATETIME, CAST(C.GMT_MODIFIED AS VARCHAR(30)) AS DROPTIME, CAST(NULL AS NUMBER) AS DROPSCN, CAST(NULL AS VARCHAR2(128)) AS PARTITION_NAME, CAST('YES' AS VARCHAR2(3)) AS CAN_UNDROP, CAST('YES' AS VARCHAR2(3)) AS CAN_PURGE, CAST(NULL AS NUMBER) AS RELATED, CAST(NULL AS NUMBER) AS BASE_OBJECT, CAST(NULL AS NUMBER) AS PURGE_OBJECT, CAST(NULL AS NUMBER) AS SPACE, C.TABLE_ID AS TABLE_ID, C.TABLESPACE_ID AS TABLESPACE_ID FROM SYS.ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT A, SYS.ALL_VIRTUAL_TABLE_REAL_AGENT C WHERE A.TABLE_ID = C.TABLE_ID AND A.DATABASE_ID = USERENV('SCHEMAID') AND A.TENANT_ID = EFFECTIVE_TENANT_ID() AND C.TENANT_ID = EFFECTIVE_TENANT_ID()) LEFT_TABLE LEFT JOIN (SELECT TABLESPACE_NAME, TABLESPACE_ID FROM SYS.ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) RIGHT_TABLE ON LEFT_TABLE.TABLESPACE_ID = RIGHT_TABLE.TABLESPACE_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -663,17 +644,16 @@ int ObInnerTableSchema::user_recyclebin_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::dba_rsrc_consumer_groups_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::dba_rsrc_consumer_groups_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -704,8 +684,7 @@ int ObInnerTableSchema::dba_rsrc_consumer_groups_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT /*+ READ_CONSISTENCY(WEAK) */ CONSUMER_GROUP_ID, CONSUMER_GROUP, CAST(NULL AS VARCHAR2(128)) AS CPU_METHOD, CAST(NULL AS VARCHAR2(128)) AS MGMT_METHOD, CAST(NULL AS VARCHAR2(3)) AS INTERNAL_USE, COMMENTS, CAST(NULL AS VARCHAR2(128)) AS CATEGORY, CAST(NULL AS VARCHAR2(128)) AS STATUS, CAST(NULL AS VARCHAR2(3)) AS MANDATORY FROM SYS.ALL_VIRTUAL_RES_MGR_CONSUMER_GROUP_REAL_AGENT )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT /*+ READ_CONSISTENCY(WEAK) */ CONSUMER_GROUP_ID, CONSUMER_GROUP, CAST(NULL AS VARCHAR2(128)) AS CPU_METHOD, CAST(NULL AS VARCHAR2(128)) AS MGMT_METHOD, CAST(NULL AS VARCHAR2(3)) AS INTERNAL_USE, COMMENTS, CAST(NULL AS VARCHAR2(128)) AS CATEGORY, CAST(NULL AS VARCHAR2(128)) AS STATUS, CAST(NULL AS VARCHAR2(3)) AS MANDATORY FROM SYS.ALL_VIRTUAL_RES_MGR_CONSUMER_GROUP_REAL_AGENT )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -717,10 +696,10 @@ int ObInnerTableSchema::dba_rsrc_consumer_groups_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.251_300.cpp b/src/share/inner_table/ob_inner_table_schema.251_300.cpp index c7f105628..76ee29823 100644 --- a/src/share/inner_table/ob_inner_table_schema.251_300.cpp +++ b/src/share/inner_table/ob_inner_table_schema.251_300.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::all_tenant_profile_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_profile_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -63,21 +65,21 @@ int ObInnerTableSchema::all_tenant_profile_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -86,206 +88,206 @@ int ObInnerTableSchema::all_tenant_profile_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("profile_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("profile_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("profile_name", // 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 - OB_MAX_SQL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("profile_name", //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 + OB_MAX_SQL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("failed_login_attempts", // 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 + ADD_COLUMN_SCHEMA("failed_login_attempts", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password_lock_time", // 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 + ADD_COLUMN_SCHEMA("password_lock_time", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password_verify_function", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("password_verify_function", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj password_life_time_default; password_life_time_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("password_life_time", // 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 - password_life_time_default, - password_life_time_default); // default_value + ADD_COLUMN_SCHEMA_T("password_life_time", //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 + password_life_time_default, + password_life_time_default); //default_value } if (OB_SUCC(ret)) { ObObj password_grace_time_default; password_grace_time_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("password_grace_time", // 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 - password_grace_time_default, - password_grace_time_default); // default_value + ADD_COLUMN_SCHEMA_T("password_grace_time", //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 + password_grace_time_default, + password_grace_time_default); //default_value } if (OB_SUCC(ret)) { ObObj password_reuse_time_default; password_reuse_time_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("password_reuse_time", // 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 - password_reuse_time_default, - password_reuse_time_default); // default_value + ADD_COLUMN_SCHEMA_T("password_reuse_time", //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 + password_reuse_time_default, + password_reuse_time_default); //default_value } if (OB_SUCC(ret)) { ObObj password_reuse_max_default; password_reuse_max_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("password_reuse_max", // 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 - password_reuse_max_default, - password_reuse_max_default); // default_value + ADD_COLUMN_SCHEMA_T("password_reuse_max", //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 + password_reuse_max_default, + password_reuse_max_default); //default_value } if (OB_SUCC(ret)) { ObObj inactive_account_time_default; inactive_account_time_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("inactive_account_time", // 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 - inactive_account_time_default, - inactive_account_time_default); // default_value + ADD_COLUMN_SCHEMA_T("inactive_account_time", //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 + inactive_account_time_default, + inactive_account_time_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -295,17 +297,16 @@ int ObInnerTableSchema::all_tenant_profile_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_profile_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_profile_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -341,21 +342,21 @@ int ObInnerTableSchema::all_tenant_profile_history_schema(ObTableSchema& table_s gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -364,236 +365,236 @@ int ObInnerTableSchema::all_tenant_profile_history_schema(ObTableSchema& table_s gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("profile_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("profile_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("profile_name", // 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 - OB_MAX_SQL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("profile_name", //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 + OB_MAX_SQL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("failed_login_attempts", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("failed_login_attempts", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password_lock_time", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("password_lock_time", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("password_verify_function", // 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 - MAX_ORACLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("password_verify_function", //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 + MAX_ORACLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj password_life_time_default; password_life_time_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("password_life_time", // 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 - true, // is_nullable - false, // is_autoincrement - password_life_time_default, - password_life_time_default); // default_value + ADD_COLUMN_SCHEMA_T("password_life_time", //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 + true, //is_nullable + false, //is_autoincrement + password_life_time_default, + password_life_time_default); //default_value } if (OB_SUCC(ret)) { ObObj password_grace_time_default; password_grace_time_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("password_grace_time", // 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 - true, // is_nullable - false, // is_autoincrement - password_grace_time_default, - password_grace_time_default); // default_value + ADD_COLUMN_SCHEMA_T("password_grace_time", //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 + true, //is_nullable + false, //is_autoincrement + password_grace_time_default, + password_grace_time_default); //default_value } if (OB_SUCC(ret)) { ObObj password_reuse_time_default; password_reuse_time_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("password_reuse_time", // 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 - true, // is_nullable - false, // is_autoincrement - password_reuse_time_default, - password_reuse_time_default); // default_value + ADD_COLUMN_SCHEMA_T("password_reuse_time", //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 + true, //is_nullable + false, //is_autoincrement + password_reuse_time_default, + password_reuse_time_default); //default_value } if (OB_SUCC(ret)) { ObObj password_reuse_max_default; password_reuse_max_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("password_reuse_max", // 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 - true, // is_nullable - false, // is_autoincrement - password_reuse_max_default, - password_reuse_max_default); // default_value + ADD_COLUMN_SCHEMA_T("password_reuse_max", //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 + true, //is_nullable + false, //is_autoincrement + password_reuse_max_default, + password_reuse_max_default); //default_value } if (OB_SUCC(ret)) { ObObj inactive_account_time_default; inactive_account_time_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("inactive_account_time", // 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 - true, // is_nullable - false, // is_autoincrement - inactive_account_time_default, - inactive_account_time_default); // default_value + ADD_COLUMN_SCHEMA_T("inactive_account_time", //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 + true, //is_nullable + false, //is_autoincrement + inactive_account_time_default, + inactive_account_time_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -603,17 +604,16 @@ int ObInnerTableSchema::all_tenant_profile_history_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_security_audit_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_security_audit_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -649,21 +649,21 @@ int ObInnerTableSchema::all_tenant_security_audit_schema(ObTableSchema& table_sc gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -672,126 +672,126 @@ int ObInnerTableSchema::all_tenant_security_audit_schema(ObTableSchema& table_sc gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("audit_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("audit_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("audit_type", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("audit_type", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("operation_type", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("operation_type", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("in_success", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("in_success", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("in_failure", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("in_failure", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -801,17 +801,16 @@ int ObInnerTableSchema::all_tenant_security_audit_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_security_audit_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_security_audit_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -847,21 +846,21 @@ int ObInnerTableSchema::all_tenant_security_audit_history_schema(ObTableSchema& gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -870,156 +869,156 @@ int ObInnerTableSchema::all_tenant_security_audit_history_schema(ObTableSchema& gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("audit_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("audit_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("audit_type", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("audit_type", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("operation_type", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("operation_type", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("in_success", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("in_success", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("in_failure", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("in_failure", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //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(FLAT_ROW_STORE); @@ -1029,17 +1028,16 @@ int ObInnerTableSchema::all_tenant_security_audit_history_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_trigger_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_trigger_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1075,21 +1073,21 @@ int ObInnerTableSchema::all_tenant_trigger_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -1098,381 +1096,381 @@ int ObInnerTableSchema::all_tenant_trigger_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("trigger_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_name", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trigger_name", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 + ADD_COLUMN_SCHEMA("owner_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_type", // 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 + ADD_COLUMN_SCHEMA("trigger_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_events", // 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 + ADD_COLUMN_SCHEMA("trigger_events", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("timing_points", // 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 + ADD_COLUMN_SCHEMA("timing_points", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("base_object_type", // 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 + ADD_COLUMN_SCHEMA("base_object_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("base_object_id", // 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 + ADD_COLUMN_SCHEMA("base_object_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_flags", // 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 + ADD_COLUMN_SCHEMA("trigger_flags", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("update_columns", // 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 - OB_MAX_UPDATE_COLUMNS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("update_columns", //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 + OB_MAX_UPDATE_COLUMNS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_old_name", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ref_old_name", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_new_name", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ref_new_name", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_parent_name", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ref_parent_name", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("when_condition", // 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 - OB_MAX_WHEN_CONDITION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("when_condition", //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 + OB_MAX_WHEN_CONDITION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_body", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trigger_body", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_spec_source", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_spec_source", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_body_source", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_body_source", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_flag", // 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 + ADD_COLUMN_SCHEMA("package_flag", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_comp_flag", // 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 + ADD_COLUMN_SCHEMA("package_comp_flag", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_exec_env", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_exec_env", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_mode", // 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 + ADD_COLUMN_SCHEMA("sql_mode", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1482,17 +1480,16 @@ int ObInnerTableSchema::all_tenant_trigger_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_trigger_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_trigger_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1528,21 +1525,21 @@ int ObInnerTableSchema::all_tenant_trigger_history_schema(ObTableSchema& table_s gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -1551,396 +1548,396 @@ int ObInnerTableSchema::all_tenant_trigger_history_schema(ObTableSchema& table_s gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("trigger_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_name", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trigger_name", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trigger_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_events", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trigger_events", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("timing_points", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("timing_points", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("base_object_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("base_object_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("base_object_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("base_object_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_flags", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trigger_flags", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("update_columns", // 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 - OB_MAX_UPDATE_COLUMNS_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("update_columns", //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 + OB_MAX_UPDATE_COLUMNS_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_old_name", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ref_old_name", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_new_name", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ref_new_name", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_parent_name", // 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 - OB_MAX_TRIGGER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ref_parent_name", //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 + OB_MAX_TRIGGER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("when_condition", // 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 - OB_MAX_WHEN_CONDITION_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("when_condition", //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 + OB_MAX_WHEN_CONDITION_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trigger_body", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trigger_body", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_spec_source", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_spec_source", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_body_source", // 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 - OB_MAX_TRIGGER_BODY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_body_source", //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 + OB_MAX_TRIGGER_BODY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_comp_flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_comp_flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("package_exec_env", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("package_exec_env", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_mode", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_mode", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1950,17 +1947,16 @@ int ObInnerTableSchema::all_tenant_trigger_history_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_seed_parameter_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_seed_parameter_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1996,21 +1992,21 @@ int ObInnerTableSchema::all_seed_parameter_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2019,216 +2015,216 @@ int ObInnerTableSchema::all_seed_parameter_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_type", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - SERVER_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_type", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + SERVER_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // column_name - ++column_id, // column_id - 5, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_CONFIG_NAME_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //column_name + ++column_id, //column_id + 5, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_CONFIG_NAME_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_type", // 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 - OB_MAX_CONFIG_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_type", //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 + OB_MAX_CONFIG_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_MAX_CONFIG_VALUE_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_MAX_CONFIG_VALUE_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("info", // 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 - OB_MAX_CONFIG_INFO_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("info", //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 + OB_MAX_CONFIG_INFO_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("section", // 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 - OB_MAX_CONFIG_SECTION_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("section", //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 + OB_MAX_CONFIG_SECTION_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scope", // 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 - OB_MAX_CONFIG_SCOPE_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("scope", //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 + OB_MAX_CONFIG_SCOPE_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("source", // 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 - OB_MAX_CONFIG_SOURCE_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("source", //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 + OB_MAX_CONFIG_SOURCE_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("edit_level", // 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 - OB_MAX_CONFIG_EDIT_LEVEL_LEN, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("edit_level", //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 + OB_MAX_CONFIG_EDIT_LEVEL_LEN, //column_length + -1, //column_precision + -1, //column_scale + true, //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 - 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 + ADD_COLUMN_SCHEMA("config_version", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2238,17 +2234,16 @@ int ObInnerTableSchema::all_seed_parameter_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_sstable_column_checksum_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_sstable_column_checksum_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2284,21 +2279,21 @@ int ObInnerTableSchema::all_tenant_sstable_column_checksum_schema(ObTableSchema& gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2307,216 +2302,216 @@ int ObInnerTableSchema::all_tenant_sstable_column_checksum_schema(ObTableSchema& gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("data_table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("index_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sstable_type", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("sstable_type", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 7, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 7, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 8, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 8, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_checksum", // 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 + ADD_COLUMN_SCHEMA("column_checksum", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("checksum_method", // 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 + ADD_COLUMN_SCHEMA("checksum_method", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_type", // 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 + ADD_COLUMN_SCHEMA("replica_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("major_version", // 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 + ADD_COLUMN_SCHEMA("major_version", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2526,17 +2521,16 @@ int ObInnerTableSchema::all_tenant_sstable_column_checksum_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_security_audit_record_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_security_audit_record_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2572,21 +2566,21 @@ int ObInnerTableSchema::all_tenant_security_audit_record_schema(ObTableSchema& t gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2595,653 +2589,653 @@ int ObInnerTableSchema::all_tenant_security_audit_record_schema(ObTableSchema& t gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("record_timestamp_us", // column_name - ++column_id, // column_id - 4, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("record_timestamp_us", //column_name + ++column_id, //column_id + 4, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_name", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_name", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("effective_user_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("effective_user_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("effective_user_name", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("effective_user_name", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("client_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("client_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("user_client_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("user_client_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("proxy_session_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("proxy_session_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("session_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("session_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("entry_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("entry_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("statement_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("statement_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_id", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trans_id", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("commit_version", // 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 + ADD_COLUMN_SCHEMA("commit_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trace_id", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trace_id", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("db_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("db_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cur_db_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cur_db_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("sql_timestamp_us", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("sql_timestamp_us", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("audit_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("audit_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("audit_type", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("audit_type", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("operation_type", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("operation_type", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("action_id", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("action_id", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("return_code", // 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 + ADD_COLUMN_SCHEMA("return_code", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("obj_owner_name", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("obj_owner_name", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("obj_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("obj_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_obj_owner_name", // 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 - OB_MAX_USER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_obj_owner_name", //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 + OB_MAX_USER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("new_obj_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("new_obj_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("auth_privileges", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("auth_privileges", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("auth_grantee", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("auth_grantee", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logoff_logical_read", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("logoff_logical_read", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logoff_physical_read", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("logoff_physical_read", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logoff_logical_write", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("logoff_logical_write", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logoff_lock_count", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("logoff_lock_count", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logoff_dead_lock", // 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 - 40, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("logoff_dead_lock", //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 + 40, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logoff_cpu_time_us", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("logoff_cpu_time_us", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logoff_exec_time_us", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("logoff_exec_time_us", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("logoff_alive_time_us", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("logoff_alive_time_us", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment_text", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment_text", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_bind", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_bind", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sql_text", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sql_text", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //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(FLAT_ROW_STORE); @@ -3251,17 +3245,16 @@ int ObInnerTableSchema::all_tenant_security_audit_record_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_sysauth_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_sysauth_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3297,21 +3290,21 @@ int ObInnerTableSchema::all_tenant_sysauth_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -3320,81 +3313,81 @@ int ObInnerTableSchema::all_tenant_sysauth_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grantee_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("grantee_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("priv_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_option", // 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 + ADD_COLUMN_SCHEMA("priv_option", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3404,17 +3397,16 @@ int ObInnerTableSchema::all_tenant_sysauth_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_sysauth_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_sysauth_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3450,21 +3442,21 @@ int ObInnerTableSchema::all_tenant_sysauth_history_schema(ObTableSchema& table_s gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -3473,111 +3465,111 @@ int ObInnerTableSchema::all_tenant_sysauth_history_schema(ObTableSchema& table_s gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grantee_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("grantee_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("priv_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_option", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("priv_option", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3587,17 +3579,16 @@ int ObInnerTableSchema::all_tenant_sysauth_history_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_objauth_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_objauth_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3633,21 +3624,21 @@ int ObInnerTableSchema::all_tenant_objauth_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -3656,141 +3647,141 @@ int ObInnerTableSchema::all_tenant_objauth_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("obj_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("obj_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("objtype", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("objtype", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("col_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("col_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grantor_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("grantor_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grantee_id", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("grantee_id", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_id", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("priv_id", //column_name + ++column_id, //column_id + 7, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_option", // 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 + ADD_COLUMN_SCHEMA("priv_option", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3800,17 +3791,16 @@ int ObInnerTableSchema::all_tenant_objauth_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_objauth_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_objauth_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3846,21 +3836,21 @@ int ObInnerTableSchema::all_tenant_objauth_history_schema(ObTableSchema& table_s gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -3869,171 +3859,171 @@ int ObInnerTableSchema::all_tenant_objauth_history_schema(ObTableSchema& table_s gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("obj_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("obj_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("objtype", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("objtype", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("col_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("col_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grantor_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("grantor_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("grantee_id", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("grantee_id", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_id", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("priv_id", //column_name + ++column_id, //column_id + 7, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 8, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 8, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("priv_option", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("priv_option", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4043,17 +4033,16 @@ int ObInnerTableSchema::all_tenant_objauth_history_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_backup_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_backup_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4089,21 +4078,21 @@ int ObInnerTableSchema::all_tenant_backup_info_schema(ObTableSchema& table_schem gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -4112,66 +4101,66 @@ int ObInnerTableSchema::all_tenant_backup_info_schema(ObTableSchema& table_schem gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_INNER_TABLE_DEFAULT_KEY_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_INNER_TABLE_DEFAULT_KEY_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_INNER_TABLE_DEFAULT_VALUE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_INNER_TABLE_DEFAULT_VALUE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4181,17 +4170,16 @@ int ObInnerTableSchema::all_tenant_backup_info_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_restore_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_restore_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4227,21 +4215,21 @@ int ObInnerTableSchema::all_restore_info_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -4250,66 +4238,66 @@ int ObInnerTableSchema::all_restore_info_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_INNER_TABLE_DEFAULT_KEY_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_INNER_TABLE_DEFAULT_KEY_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // 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 - OB_INNER_TABLE_DEFAULT_VALUE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //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 + OB_INNER_TABLE_DEFAULT_VALUE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4319,17 +4307,16 @@ int ObInnerTableSchema::all_restore_info_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_backup_log_archive_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_backup_log_archive_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4365,21 +4352,21 @@ int ObInnerTableSchema::all_tenant_backup_log_archive_status_schema(ObTableSchem gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -4388,250 +4375,250 @@ int ObInnerTableSchema::all_tenant_backup_log_archive_status_schema(ObTableSchem gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_archive_round", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("log_archive_round", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("min_first_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("min_first_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("max_next_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("max_next_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj input_bytes_default; input_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("input_bytes", // 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 - input_bytes_default, - input_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("input_bytes", //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 + input_bytes_default, + input_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj output_bytes_default; output_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("output_bytes", // 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 - output_bytes_default, - output_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("output_bytes", //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 + output_bytes_default, + output_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj deleted_input_bytes_default; deleted_input_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("deleted_input_bytes", // 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 - deleted_input_bytes_default, - deleted_input_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("deleted_input_bytes", //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 + deleted_input_bytes_default, + deleted_input_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj deleted_output_bytes_default; deleted_output_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("deleted_output_bytes", // 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 - deleted_output_bytes_default, - deleted_output_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("deleted_output_bytes", //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 + deleted_output_bytes_default, + deleted_output_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj pg_count_default; pg_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("pg_count", // 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 - pg_count_default, - pg_count_default); // default_value + ADD_COLUMN_SCHEMA_T("pg_count", //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 + pg_count_default, + pg_count_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } if (OB_SUCC(ret)) { ObObj is_mount_file_created_default; is_mount_file_created_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_mount_file_created", // 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 - is_mount_file_created_default, - is_mount_file_created_default); // default_value + ADD_COLUMN_SCHEMA_T("is_mount_file_created", //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 + is_mount_file_created_default, + is_mount_file_created_default); //default_value } if (OB_SUCC(ret)) { ObObj compatible_default; compatible_default.set_int(0); - ADD_COLUMN_SCHEMA_T("compatible", // 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 - compatible_default, - compatible_default); // default_value + ADD_COLUMN_SCHEMA_T("compatible", //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 + compatible_default, + compatible_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4641,17 +4628,16 @@ int ObInnerTableSchema::all_tenant_backup_log_archive_status_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_backup_log_archive_status_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_backup_log_archive_status_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -4687,21 +4673,21 @@ int ObInnerTableSchema::all_backup_log_archive_status_history_schema(ObTableSche gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -4710,242 +4696,242 @@ int ObInnerTableSchema::all_backup_log_archive_status_history_schema(ObTableSche gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_archive_round", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("log_archive_round", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("min_first_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("min_first_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("max_next_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("max_next_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj input_bytes_default; input_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("input_bytes", // 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 - input_bytes_default, - input_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("input_bytes", //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 + input_bytes_default, + input_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj output_bytes_default; output_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("output_bytes", // 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 - output_bytes_default, - output_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("output_bytes", //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 + output_bytes_default, + output_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj deleted_input_bytes_default; deleted_input_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("deleted_input_bytes", // 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 - deleted_input_bytes_default, - deleted_input_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("deleted_input_bytes", //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 + deleted_input_bytes_default, + deleted_input_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj deleted_output_bytes_default; deleted_output_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("deleted_output_bytes", // 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 - deleted_output_bytes_default, - deleted_output_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("deleted_output_bytes", //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 + deleted_output_bytes_default, + deleted_output_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj pg_count_default; pg_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("pg_count", // 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 - pg_count_default, - pg_count_default); // default_value + ADD_COLUMN_SCHEMA_T("pg_count", //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 + pg_count_default, + pg_count_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_mark_deleted", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_mark_deleted", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj compatible_default; compatible_default.set_int(0); - ADD_COLUMN_SCHEMA_T("compatible", // 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 - compatible_default, - compatible_default); // default_value + ADD_COLUMN_SCHEMA_T("compatible", //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 + compatible_default, + compatible_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -4955,17 +4941,16 @@ int ObInnerTableSchema::all_backup_log_archive_status_history_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_backup_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_backup_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5001,21 +4986,21 @@ int ObInnerTableSchema::all_tenant_backup_task_schema(ObTableSchema& table_schem gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -5024,481 +5009,481 @@ int ObInnerTableSchema::all_tenant_backup_task_schema(ObTableSchema& table_schem gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_type", // 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 - OB_INNER_TABLE_BACKUP_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_type", //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 + OB_INNER_TABLE_BACKUP_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("device_type", // 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 - OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("device_type", //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 + OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_full_backup_set_id", // 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 + ADD_COLUMN_SCHEMA("prev_full_backup_set_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_inc_backup_set_id", // 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 + ADD_COLUMN_SCHEMA("prev_inc_backup_set_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_backup_data_version", // 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 + ADD_COLUMN_SCHEMA("prev_backup_data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pg_count", // 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 + ADD_COLUMN_SCHEMA("pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_block_count", // 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 + ADD_COLUMN_SCHEMA("macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_pg_count", // 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 + ADD_COLUMN_SCHEMA("finish_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("input_bytes", // 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 + ADD_COLUMN_SCHEMA("input_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("output_bytes", // 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 + ADD_COLUMN_SCHEMA("output_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("end_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("end_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compatible", // 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 + ADD_COLUMN_SCHEMA("compatible", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version", // 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 + ADD_COLUMN_SCHEMA("cluster_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_data_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_data_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_schema_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_schema_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version_display", // 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 - OB_INNER_TABLE_BACKUP_TASK_CLUSTER_FORMAT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_version_display", //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 + OB_INNER_TABLE_BACKUP_TASK_CLUSTER_FORMAT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_count", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition_count", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("finish_partition_count", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj encryption_mode_default; encryption_mode_default.set_varchar(ObString::make_string("None")); - ADD_COLUMN_SCHEMA_T("encryption_mode", // 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 - OB_MAX_ENCRYPTION_MODE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - encryption_mode_default, - encryption_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("encryption_mode", //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 + OB_MAX_ENCRYPTION_MODE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + encryption_mode_default, + encryption_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj passwd_default; passwd_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("passwd", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - passwd_default, - passwd_default); // default_value + ADD_COLUMN_SCHEMA_T("passwd", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + passwd_default, + passwd_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -5508,17 +5493,16 @@ int ObInnerTableSchema::all_tenant_backup_task_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_backup_task_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_backup_task_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -5554,21 +5538,21 @@ int ObInnerTableSchema::all_backup_task_history_schema(ObTableSchema& table_sche gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -5577,496 +5561,496 @@ int ObInnerTableSchema::all_backup_task_history_schema(ObTableSchema& table_sche gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_type", // 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 - OB_INNER_TABLE_BACKUP_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_type", //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 + OB_INNER_TABLE_BACKUP_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("device_type", // 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 - OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("device_type", //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 + OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_full_backup_set_id", // 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 + ADD_COLUMN_SCHEMA("prev_full_backup_set_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_inc_backup_set_id", // 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 + ADD_COLUMN_SCHEMA("prev_inc_backup_set_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_backup_data_version", // 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 + ADD_COLUMN_SCHEMA("prev_backup_data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pg_count", // 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 + ADD_COLUMN_SCHEMA("pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_block_count", // 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 + ADD_COLUMN_SCHEMA("macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_pg_count", // 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 + ADD_COLUMN_SCHEMA("finish_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("input_bytes", // 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 + ADD_COLUMN_SCHEMA("input_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("output_bytes", // 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 + ADD_COLUMN_SCHEMA("output_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("end_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("end_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compatible", // 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 + ADD_COLUMN_SCHEMA("compatible", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version", // 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 + ADD_COLUMN_SCHEMA("cluster_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_data_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_data_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_schema_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_schema_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version_display", // 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 - OB_INNER_TABLE_BACKUP_TASK_CLUSTER_FORMAT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_version_display", //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 + OB_INNER_TABLE_BACKUP_TASK_CLUSTER_FORMAT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_count", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("partition_count", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("finish_partition_count", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_mark_deleted", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_mark_deleted", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj encryption_mode_default; encryption_mode_default.set_varchar(ObString::make_string("None")); - ADD_COLUMN_SCHEMA_T("encryption_mode", // 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 - OB_MAX_ENCRYPTION_MODE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - encryption_mode_default, - encryption_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("encryption_mode", //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 + OB_MAX_ENCRYPTION_MODE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + encryption_mode_default, + encryption_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj passwd_default; passwd_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("passwd", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - passwd_default, - passwd_default); // default_value + ADD_COLUMN_SCHEMA_T("passwd", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + passwd_default, + passwd_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6076,17 +6060,16 @@ int ObInnerTableSchema::all_backup_task_history_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_pg_backup_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_pg_backup_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6122,21 +6105,21 @@ int ObInnerTableSchema::all_tenant_pg_backup_task_schema(ObTableSchema& table_sc gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -6145,383 +6128,383 @@ int ObInnerTableSchema::all_tenant_pg_backup_task_schema(ObTableSchema& table_sc gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_type", // 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 - OB_INNER_TABLE_BACKUP_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_type", //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 + OB_INNER_TABLE_BACKUP_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_count", // 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 + ADD_COLUMN_SCHEMA("partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_block_count", // 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 + ADD_COLUMN_SCHEMA("macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 + ADD_COLUMN_SCHEMA("finish_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("input_bytes", // 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 + ADD_COLUMN_SCHEMA("input_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("output_bytes", // 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 + ADD_COLUMN_SCHEMA("output_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("end_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("end_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("retry_count", // 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 + ADD_COLUMN_SCHEMA("retry_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_role", // 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 + ADD_COLUMN_SCHEMA("replica_role", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_type", // 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 + ADD_COLUMN_SCHEMA("replica_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - OB_MAX_SERVER_ADDR_SIZE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + OB_MAX_SERVER_ADDR_SIZE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_id", // 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 + ADD_COLUMN_SCHEMA("task_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trace_id", // 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 - OB_MAX_TRACE_ID_BUFFER_SIZE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trace_id", //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 + OB_MAX_TRACE_ID_BUFFER_SIZE, //column_length + -1, //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(FLAT_ROW_STORE); @@ -6531,17 +6514,16 @@ int ObInnerTableSchema::all_tenant_pg_backup_task_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_error_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_error_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6577,21 +6559,21 @@ int ObInnerTableSchema::all_tenant_error_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -6600,186 +6582,186 @@ int ObInnerTableSchema::all_tenant_error_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("obj_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("obj_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("obj_seq", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("obj_seq", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("obj_type", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("obj_type", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("line", // 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 + ADD_COLUMN_SCHEMA("line", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("position", // 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 + ADD_COLUMN_SCHEMA("position", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("text_length", // 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 + ADD_COLUMN_SCHEMA("text_length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("text", // 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 - MAX_ORACLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("text", //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 + MAX_ORACLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("property", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("property", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("error_number", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("error_number", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6789,17 +6771,16 @@ int ObInnerTableSchema::all_tenant_error_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_server_recovery_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_server_recovery_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -6835,21 +6816,21 @@ int ObInnerTableSchema::all_server_recovery_status_schema(ObTableSchema& table_s gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -6858,96 +6839,96 @@ int ObInnerTableSchema::all_server_recovery_status_schema(ObTableSchema& table_s gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rescue_svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("rescue_svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rescue_svr_port", // 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 + ADD_COLUMN_SCHEMA("rescue_svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rescue_progress", // 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 + ADD_COLUMN_SCHEMA("rescue_progress", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -6957,17 +6938,16 @@ int ObInnerTableSchema::all_server_recovery_status_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_datafile_recovery_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_datafile_recovery_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7003,21 +6983,21 @@ int ObInnerTableSchema::all_datafile_recovery_status_schema(ObTableSchema& table gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -7026,145 +7006,145 @@ int ObInnerTableSchema::all_datafile_recovery_status_schema(ObTableSchema& table gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("svr_port", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("file_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("file_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dest_svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dest_svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dest_svr_port", // 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 + ADD_COLUMN_SCHEMA("dest_svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dest_unit_id", // 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 + ADD_COLUMN_SCHEMA("dest_unit_id", //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 } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("status", // 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 - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + status_default, + status_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -7174,17 +7154,16 @@ int ObInnerTableSchema::all_datafile_recovery_status_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_backup_clean_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_backup_clean_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7220,21 +7199,21 @@ int ObInnerTableSchema::all_tenant_backup_clean_info_schema(ObTableSchema& table gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -7243,218 +7222,218 @@ int ObInnerTableSchema::all_tenant_backup_clean_info_schema(ObTableSchema& table gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // 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 + ADD_COLUMN_SCHEMA("job_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("end_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("end_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // 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 + ADD_COLUMN_SCHEMA("incarnation", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 - OB_INNER_TABLE_BACKUP_CLEAN_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type", //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 + OB_INNER_TABLE_BACKUP_CLEAN_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parameter", // 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 - OB_INNER_TABLE_BACKUP_CLEAN_PARAMETER_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parameter", //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 + OB_INNER_TABLE_BACKUP_CLEAN_PARAMETER_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("error_msg", // 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 - OB_MAX_ERROR_MSG_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("error_msg", //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 + OB_MAX_ERROR_MSG_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("clog_gc_snapshot", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("clog_gc_snapshot", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("result", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("copy_id", // 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 + ADD_COLUMN_SCHEMA("copy_id", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -7464,17 +7443,16 @@ int ObInnerTableSchema::all_tenant_backup_clean_info_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_backup_clean_info_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_backup_clean_info_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7510,21 +7488,21 @@ int ObInnerTableSchema::all_backup_clean_info_history_schema(ObTableSchema& tabl gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -7533,218 +7511,218 @@ int ObInnerTableSchema::all_backup_clean_info_history_schema(ObTableSchema& tabl gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("end_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("end_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // 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 + ADD_COLUMN_SCHEMA("incarnation", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // 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 - OB_INNER_TABLE_BACKUP_CLEAN_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("type", //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 + OB_INNER_TABLE_BACKUP_CLEAN_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parameter", // 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 - OB_INNER_TABLE_BACKUP_CLEAN_PARAMETER_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parameter", //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 + OB_INNER_TABLE_BACKUP_CLEAN_PARAMETER_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("error_msg", // 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 - OB_MAX_ERROR_MSG_LEN, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("error_msg", //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 + OB_MAX_ERROR_MSG_LEN, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("clog_gc_snapshot", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("clog_gc_snapshot", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("result", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("copy_id", // 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 + ADD_COLUMN_SCHEMA("copy_id", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -7754,17 +7732,16 @@ int ObInnerTableSchema::all_backup_clean_info_history_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_backup_task_clean_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_backup_task_clean_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -7800,21 +7777,21 @@ int ObInnerTableSchema::all_backup_task_clean_history_schema(ObTableSchema& tabl gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -7823,473 +7800,473 @@ int ObInnerTableSchema::all_backup_task_clean_history_schema(ObTableSchema& tabl gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_type", // 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 - OB_INNER_TABLE_BACKUP_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_type", //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 + OB_INNER_TABLE_BACKUP_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("device_type", // 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 - OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("device_type", //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 + OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_full_backup_set_id", // 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 + ADD_COLUMN_SCHEMA("prev_full_backup_set_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_inc_backup_set_id", // 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 + ADD_COLUMN_SCHEMA("prev_inc_backup_set_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_backup_data_version", // 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 + ADD_COLUMN_SCHEMA("prev_backup_data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("pg_count", // 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 + ADD_COLUMN_SCHEMA("pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("macro_block_count", // 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 + ADD_COLUMN_SCHEMA("macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_pg_count", // 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 + ADD_COLUMN_SCHEMA("finish_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("input_bytes", // 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 + ADD_COLUMN_SCHEMA("input_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("output_bytes", // 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 + ADD_COLUMN_SCHEMA("output_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("end_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("end_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compatible", // 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 + ADD_COLUMN_SCHEMA("compatible", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version", // 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 + ADD_COLUMN_SCHEMA("cluster_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_id", // 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 + ADD_COLUMN_SCHEMA("cluster_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_data_version", // 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 + ADD_COLUMN_SCHEMA("backup_data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_schema_version", // 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 + ADD_COLUMN_SCHEMA("backup_schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version_display", // 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 - OB_INNER_TABLE_BACKUP_TASK_CLUSTER_FORMAT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_version_display", //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 + OB_INNER_TABLE_BACKUP_TASK_CLUSTER_FORMAT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_count", // 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 + ADD_COLUMN_SCHEMA("partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 + ADD_COLUMN_SCHEMA("finish_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("copy_id", // 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 + ADD_COLUMN_SCHEMA("copy_id", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8299,17 +8276,16 @@ int ObInnerTableSchema::all_backup_task_clean_history_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_restore_progress_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_restore_progress_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8345,21 +8321,21 @@ int ObInnerTableSchema::all_restore_progress_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -8368,397 +8344,397 @@ int ObInnerTableSchema::all_restore_progress_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { ObObj external_job_id_default; external_job_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("external_job_id", // 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 - external_job_id_default, - external_job_id_default); // default_value + ADD_COLUMN_SCHEMA_T("external_job_id", //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 + external_job_id_default, + external_job_id_default); //default_value } if (OB_SUCC(ret)) { ObObj tenant_id_default; tenant_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tenant_id", // 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 - tenant_id_default, - tenant_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tenant_id", //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 + tenant_id_default, + tenant_id_default); //default_value } if (OB_SUCC(ret)) { ObObj tenant_name_default; tenant_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - tenant_name_default, - tenant_name_default); // default_value + ADD_COLUMN_SCHEMA_T("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + tenant_name_default, + tenant_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("completion_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("completion_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj pg_count_default; pg_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("pg_count", // 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 - pg_count_default, - pg_count_default); // default_value + ADD_COLUMN_SCHEMA_T("pg_count", //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 + pg_count_default, + pg_count_default); //default_value } if (OB_SUCC(ret)) { ObObj finish_pg_count_default; finish_pg_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("finish_pg_count", // 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 - finish_pg_count_default, - finish_pg_count_default); // default_value + ADD_COLUMN_SCHEMA_T("finish_pg_count", //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 + finish_pg_count_default, + finish_pg_count_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_count_default; partition_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_count", // 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 - partition_count_default, - partition_count_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_count", //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 + partition_count_default, + partition_count_default); //default_value } if (OB_SUCC(ret)) { ObObj finish_partition_count_default; finish_partition_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("finish_partition_count", // 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 - finish_partition_count_default, - finish_partition_count_default); // default_value + ADD_COLUMN_SCHEMA_T("finish_partition_count", //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 + finish_partition_count_default, + finish_partition_count_default); //default_value } if (OB_SUCC(ret)) { ObObj macro_block_count_default; macro_block_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("macro_block_count", // 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 - macro_block_count_default, - macro_block_count_default); // default_value + ADD_COLUMN_SCHEMA_T("macro_block_count", //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 + macro_block_count_default, + macro_block_count_default); //default_value } if (OB_SUCC(ret)) { ObObj finish_macro_block_count_default; finish_macro_block_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("finish_macro_block_count", // 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 - finish_macro_block_count_default, - finish_macro_block_count_default); // default_value + ADD_COLUMN_SCHEMA_T("finish_macro_block_count", //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 + finish_macro_block_count_default, + finish_macro_block_count_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("restore_start_timestamp", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("restore_start_timestamp", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("restore_finish_timestamp", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("restore_finish_timestamp", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("restore_current_timestamp", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("restore_current_timestamp", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj info_default; info_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("info", // 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 - OB_INNER_TABLE_DEFAULT_VALUE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - info_default, - info_default); // default_value + ADD_COLUMN_SCHEMA_T("info", //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 + OB_INNER_TABLE_DEFAULT_VALUE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + info_default, + info_default); //default_value } if (OB_SUCC(ret)) { ObObj backup_cluster_id_default; backup_cluster_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("backup_cluster_id", // 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 - backup_cluster_id_default, - backup_cluster_id_default); // default_value + ADD_COLUMN_SCHEMA_T("backup_cluster_id", //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 + backup_cluster_id_default, + backup_cluster_id_default); //default_value } if (OB_SUCC(ret)) { ObObj backup_cluster_name_default; backup_cluster_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("backup_cluster_name", // 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 - OB_MAX_CLUSTER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - backup_cluster_name_default, - backup_cluster_name_default); // default_value + ADD_COLUMN_SCHEMA_T("backup_cluster_name", //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 + OB_MAX_CLUSTER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + backup_cluster_name_default, + backup_cluster_name_default); //default_value } if (OB_SUCC(ret)) { ObObj backup_tenant_id_default; backup_tenant_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("backup_tenant_id", // 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 - backup_tenant_id_default, - backup_tenant_id_default); // default_value + ADD_COLUMN_SCHEMA_T("backup_tenant_id", //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 + backup_tenant_id_default, + backup_tenant_id_default); //default_value } if (OB_SUCC(ret)) { ObObj backup_tenant_name_default; backup_tenant_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("backup_tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - backup_tenant_name_default, - backup_tenant_name_default); // default_value + ADD_COLUMN_SCHEMA_T("backup_tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + backup_tenant_name_default, + backup_tenant_name_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -8768,17 +8744,16 @@ int ObInnerTableSchema::all_restore_progress_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_restore_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_restore_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -8814,21 +8789,21 @@ int ObInnerTableSchema::all_restore_history_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -8837,446 +8812,446 @@ int ObInnerTableSchema::all_restore_history_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { ObObj external_job_id_default; external_job_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("external_job_id", // 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 - external_job_id_default, - external_job_id_default); // default_value + ADD_COLUMN_SCHEMA_T("external_job_id", //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 + external_job_id_default, + external_job_id_default); //default_value } if (OB_SUCC(ret)) { ObObj tenant_id_default; tenant_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tenant_id", // 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 - tenant_id_default, - tenant_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tenant_id", //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 + tenant_id_default, + tenant_id_default); //default_value } if (OB_SUCC(ret)) { ObObj tenant_name_default; tenant_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - tenant_name_default, - tenant_name_default); // default_value + ADD_COLUMN_SCHEMA_T("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + tenant_name_default, + tenant_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("completion_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("completion_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj pg_count_default; pg_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("pg_count", // 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 - pg_count_default, - pg_count_default); // default_value + ADD_COLUMN_SCHEMA_T("pg_count", //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 + pg_count_default, + pg_count_default); //default_value } if (OB_SUCC(ret)) { ObObj finish_pg_count_default; finish_pg_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("finish_pg_count", // 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 - finish_pg_count_default, - finish_pg_count_default); // default_value + ADD_COLUMN_SCHEMA_T("finish_pg_count", //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 + finish_pg_count_default, + finish_pg_count_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_count_default; partition_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_count", // 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 - partition_count_default, - partition_count_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_count", //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 + partition_count_default, + partition_count_default); //default_value } if (OB_SUCC(ret)) { ObObj finish_partition_count_default; finish_partition_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("finish_partition_count", // 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 - finish_partition_count_default, - finish_partition_count_default); // default_value + ADD_COLUMN_SCHEMA_T("finish_partition_count", //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 + finish_partition_count_default, + finish_partition_count_default); //default_value } if (OB_SUCC(ret)) { ObObj macro_block_count_default; macro_block_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("macro_block_count", // 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 - macro_block_count_default, - macro_block_count_default); // default_value + ADD_COLUMN_SCHEMA_T("macro_block_count", //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 + macro_block_count_default, + macro_block_count_default); //default_value } if (OB_SUCC(ret)) { ObObj finish_macro_block_count_default; finish_macro_block_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("finish_macro_block_count", // 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 - finish_macro_block_count_default, - finish_macro_block_count_default); // default_value + ADD_COLUMN_SCHEMA_T("finish_macro_block_count", //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 + finish_macro_block_count_default, + finish_macro_block_count_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("restore_start_timestamp", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("restore_start_timestamp", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("restore_finish_timestamp", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("restore_finish_timestamp", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("restore_current_timestamp", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("restore_current_timestamp", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj restore_data_version_default; restore_data_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("restore_data_version", // 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 - restore_data_version_default, - restore_data_version_default); // default_value + ADD_COLUMN_SCHEMA_T("restore_data_version", //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 + restore_data_version_default, + restore_data_version_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("restore_option", // 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 - OB_INNER_TABLE_DEFAULT_VALUE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("restore_option", //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 + OB_INNER_TABLE_DEFAULT_VALUE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj info_default; info_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("info", // 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 - OB_INNER_TABLE_DEFAULT_VALUE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - info_default, - info_default); // default_value + ADD_COLUMN_SCHEMA_T("info", //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 + OB_INNER_TABLE_DEFAULT_VALUE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + info_default, + info_default); //default_value } if (OB_SUCC(ret)) { ObObj backup_cluster_id_default; backup_cluster_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("backup_cluster_id", // 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 - backup_cluster_id_default, - backup_cluster_id_default); // default_value + ADD_COLUMN_SCHEMA_T("backup_cluster_id", //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 + backup_cluster_id_default, + backup_cluster_id_default); //default_value } if (OB_SUCC(ret)) { ObObj backup_cluster_name_default; backup_cluster_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("backup_cluster_name", // 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 - OB_MAX_CLUSTER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - backup_cluster_name_default, - backup_cluster_name_default); // default_value + ADD_COLUMN_SCHEMA_T("backup_cluster_name", //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 + OB_MAX_CLUSTER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + backup_cluster_name_default, + backup_cluster_name_default); //default_value } if (OB_SUCC(ret)) { ObObj backup_tenant_id_default; backup_tenant_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("backup_tenant_id", // 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 - backup_tenant_id_default, - backup_tenant_id_default); // default_value + ADD_COLUMN_SCHEMA_T("backup_tenant_id", //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 + backup_tenant_id_default, + backup_tenant_id_default); //default_value } if (OB_SUCC(ret)) { ObObj backup_tenant_name_default; backup_tenant_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("backup_tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - backup_tenant_name_default, - backup_tenant_name_default); // default_value + ADD_COLUMN_SCHEMA_T("backup_tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + backup_tenant_name_default, + backup_tenant_name_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9286,17 +9261,16 @@ int ObInnerTableSchema::all_restore_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_restore_pg_info_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_restore_pg_info_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9332,21 +9306,21 @@ int ObInnerTableSchema::all_tenant_restore_pg_info_schema(ObTableSchema& table_s gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -9355,142 +9329,142 @@ int ObInnerTableSchema::all_tenant_restore_pg_info_schema(ObTableSchema& table_s gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { ObObj macro_block_count_default; macro_block_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("macro_block_count", // 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 - macro_block_count_default, - macro_block_count_default); // default_value + ADD_COLUMN_SCHEMA_T("macro_block_count", //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 + macro_block_count_default, + macro_block_count_default); //default_value } if (OB_SUCC(ret)) { ObObj finish_macro_block_count_default; finish_macro_block_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("finish_macro_block_count", // 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 - finish_macro_block_count_default, - finish_macro_block_count_default); // default_value + ADD_COLUMN_SCHEMA_T("finish_macro_block_count", //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 + finish_macro_block_count_default, + finish_macro_block_count_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_count_default; partition_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_count", // 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 - partition_count_default, - partition_count_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_count", //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 + partition_count_default, + partition_count_default); //default_value } if (OB_SUCC(ret)) { ObObj finish_partition_count_default; finish_partition_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("finish_partition_count", // 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 - finish_partition_count_default, - finish_partition_count_default); // default_value + ADD_COLUMN_SCHEMA_T("finish_partition_count", //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 + finish_partition_count_default, + finish_partition_count_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("restore_info", // 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 - OB_INNER_TABLE_DEFAULT_VALUE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("restore_info", //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 + OB_INNER_TABLE_DEFAULT_VALUE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -9500,17 +9474,16 @@ int ObInnerTableSchema::all_tenant_restore_pg_info_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_table_v2_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_table_v2_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -9546,21 +9519,21 @@ int ObInnerTableSchema::all_table_v2_history_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -9569,1229 +9542,1229 @@ int ObInnerTableSchema::all_table_v2_history_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { ObObj table_name_default; table_name_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("table_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - table_name_default, - table_name_default); // default_value + ADD_COLUMN_SCHEMA_T("table_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + table_name_default, + table_name_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("table_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("load_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("load_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("def_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("def_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey_column_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("rowkey_column_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_column_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("index_column_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_used_column_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_used_column_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("replica_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("replica_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("autoinc_column_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("autoinc_column_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj auto_increment_default; auto_increment_default.set_uint64(1); - ADD_COLUMN_SCHEMA_T("auto_increment", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObUInt64Type, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(uint64_t), // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - auto_increment_default, - auto_increment_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_increment", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObUInt64Type, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(uint64_t), //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + auto_increment_default, + auto_increment_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("read_only", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("read_only", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("rowkey_split_pos", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("rowkey_split_pos", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compress_func_name", // 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 - OB_MAX_COMPRESSOR_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("compress_func_name", //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 + OB_MAX_COMPRESSOR_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("expire_condition", // 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 - OB_MAX_EXPIRE_INFO_STRING_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("expire_condition", //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 + OB_MAX_EXPIRE_INFO_STRING_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_use_bloomfilter", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_use_bloomfilter", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj comment_default; comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - comment_default, - comment_default); // default_value + ADD_COLUMN_SCHEMA_T("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + comment_default, + comment_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("block_size", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("block_size", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("collation_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("collation_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_table_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_table_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_status", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("index_status", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tablegroup_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tablegroup_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("progressive_merge_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("progressive_merge_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("index_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("index_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_level", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_level", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_func_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_func_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_func_expr", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_func_expr", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_func_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_func_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_func_expr", // 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 - OB_MAX_PART_FUNC_EXPR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_func_expr", //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 + OB_MAX_PART_FUNC_EXPR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("sub_part_num", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("sub_part_num", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("create_mem_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("create_mem_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_definition", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("view_definition", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_check_option", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("view_check_option", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("view_is_updatable", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("view_is_updatable", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zone_list", // 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 - MAX_ZONE_LIST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zone_list", //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 + MAX_ZONE_LIST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("primary_zone", // 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 - MAX_ZONE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("primary_zone", //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 + MAX_ZONE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj index_using_type_default; index_using_type_default.set_int(USING_BTREE); - ADD_COLUMN_SCHEMA_T("index_using_type", // 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 - true, // is_nullable - false, // is_autoincrement - index_using_type_default, - index_using_type_default); // default_value + ADD_COLUMN_SCHEMA_T("index_using_type", //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 + true, //is_nullable + false, //is_autoincrement + index_using_type_default, + index_using_type_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("parser_name", // 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 - OB_MAX_PARSER_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("parser_name", //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 + OB_MAX_PARSER_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj index_attributes_set_default; index_attributes_set_default.set_int(0); - ADD_COLUMN_SCHEMA_T("index_attributes_set", // 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 - true, // is_nullable - false, // is_autoincrement - index_attributes_set_default, - index_attributes_set_default); // default_value + ADD_COLUMN_SCHEMA_T("index_attributes_set", //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 + true, //is_nullable + false, //is_autoincrement + index_attributes_set_default, + index_attributes_set_default); //default_value } if (OB_SUCC(ret)) { ObObj locality_default; locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - locality_default, - locality_default); // default_value + ADD_COLUMN_SCHEMA_T("locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + locality_default, + locality_default); //default_value } if (OB_SUCC(ret)) { ObObj tablet_size_default; tablet_size_default.set_int(OB_DEFAULT_TABLET_SIZE); - ADD_COLUMN_SCHEMA_T("tablet_size", // 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 - true, // is_nullable - false, // is_autoincrement - tablet_size_default, - tablet_size_default); // default_value + ADD_COLUMN_SCHEMA_T("tablet_size", //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 + true, //is_nullable + false, //is_autoincrement + tablet_size_default, + tablet_size_default); //default_value } if (OB_SUCC(ret)) { ObObj pctfree_default; pctfree_default.set_int(OB_DEFAULT_PCTFREE); - ADD_COLUMN_SCHEMA_T("pctfree", // 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 - true, // is_nullable - false, // is_autoincrement - pctfree_default, - pctfree_default); // default_value + ADD_COLUMN_SCHEMA_T("pctfree", //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 + true, //is_nullable + false, //is_autoincrement + pctfree_default, + pctfree_default); //default_value } if (OB_SUCC(ret)) { ObObj previous_locality_default; previous_locality_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("previous_locality", // 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 - MAX_LOCALITY_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - previous_locality_default, - previous_locality_default); // default_value + ADD_COLUMN_SCHEMA_T("previous_locality", //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 + MAX_LOCALITY_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + previous_locality_default, + previous_locality_default); //default_value } if (OB_SUCC(ret)) { ObObj max_used_part_id_default; max_used_part_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("max_used_part_id", // 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 - true, // is_nullable - false, // is_autoincrement - max_used_part_id_default, - max_used_part_id_default); // default_value + ADD_COLUMN_SCHEMA_T("max_used_part_id", //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 + true, //is_nullable + false, //is_autoincrement + max_used_part_id_default, + max_used_part_id_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_cnt_within_partition_table_default; partition_cnt_within_partition_table_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("partition_cnt_within_partition_table", // 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 - true, // is_nullable - false, // is_autoincrement - partition_cnt_within_partition_table_default, - partition_cnt_within_partition_table_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_cnt_within_partition_table", //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 + true, //is_nullable + false, //is_autoincrement + partition_cnt_within_partition_table_default, + partition_cnt_within_partition_table_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_status_default; partition_status_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_status", // 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 - true, // is_nullable - false, // is_autoincrement - partition_status_default, - partition_status_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_status", //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 + true, //is_nullable + false, //is_autoincrement + partition_status_default, + partition_status_default); //default_value } if (OB_SUCC(ret)) { ObObj partition_schema_version_default; partition_schema_version_default.set_int(0); - ADD_COLUMN_SCHEMA_T("partition_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - partition_schema_version_default, - partition_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("partition_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + partition_schema_version_default, + partition_schema_version_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("max_used_constraint_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("max_used_constraint_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj session_id_default; session_id_default.set_int(0); - ADD_COLUMN_SCHEMA_T("session_id", // 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 - true, // is_nullable - false, // is_autoincrement - session_id_default, - session_id_default); // default_value + ADD_COLUMN_SCHEMA_T("session_id", //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 + true, //is_nullable + false, //is_autoincrement + session_id_default, + session_id_default); //default_value } if (OB_SUCC(ret)) { ObObj pk_comment_default; pk_comment_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("pk_comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - pk_comment_default, - pk_comment_default); // default_value + ADD_COLUMN_SCHEMA_T("pk_comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + pk_comment_default, + pk_comment_default); //default_value } if (OB_SUCC(ret)) { ObObj sess_active_time_default; sess_active_time_default.set_int(0); - ADD_COLUMN_SCHEMA_T("sess_active_time", // 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 - true, // is_nullable - false, // is_autoincrement - sess_active_time_default, - sess_active_time_default); // default_value + ADD_COLUMN_SCHEMA_T("sess_active_time", //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 + true, //is_nullable + false, //is_autoincrement + sess_active_time_default, + sess_active_time_default); //default_value } if (OB_SUCC(ret)) { ObObj row_store_type_default; row_store_type_default.set_varchar(ObString::make_string("FLAT_ROW_STORE")); - ADD_COLUMN_SCHEMA_T("row_store_type", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - row_store_type_default, - row_store_type_default); // default_value + ADD_COLUMN_SCHEMA_T("row_store_type", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + row_store_type_default, + row_store_type_default); //default_value } if (OB_SUCC(ret)) { ObObj store_format_default; store_format_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("store_format", // 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 - OB_MAX_STORE_FORMAT_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - store_format_default, - store_format_default); // default_value + ADD_COLUMN_SCHEMA_T("store_format", //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 + OB_MAX_STORE_FORMAT_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + store_format_default, + store_format_default); //default_value } if (OB_SUCC(ret)) { ObObj duplicate_scope_default; duplicate_scope_default.set_int(0); - ADD_COLUMN_SCHEMA_T("duplicate_scope", // 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 - true, // is_nullable - false, // is_autoincrement - duplicate_scope_default, - duplicate_scope_default); // default_value + ADD_COLUMN_SCHEMA_T("duplicate_scope", //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 + true, //is_nullable + false, //is_autoincrement + duplicate_scope_default, + duplicate_scope_default); //default_value } if (OB_SUCC(ret)) { ObObj binding_default; binding_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("binding", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - binding_default, - binding_default); // default_value + ADD_COLUMN_SCHEMA_T("binding", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + binding_default, + binding_default); //default_value } if (OB_SUCC(ret)) { ObObj progressive_merge_round_default; progressive_merge_round_default.set_int(0); - ADD_COLUMN_SCHEMA_T("progressive_merge_round", // 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 - true, // is_nullable - false, // is_autoincrement - progressive_merge_round_default, - progressive_merge_round_default); // default_value + ADD_COLUMN_SCHEMA_T("progressive_merge_round", //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 + true, //is_nullable + false, //is_autoincrement + progressive_merge_round_default, + progressive_merge_round_default); //default_value } if (OB_SUCC(ret)) { ObObj storage_format_version_default; storage_format_version_default.set_int(2); - ADD_COLUMN_SCHEMA_T("storage_format_version", // 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 - true, // is_nullable - false, // is_autoincrement - storage_format_version_default, - storage_format_version_default); // default_value + ADD_COLUMN_SCHEMA_T("storage_format_version", //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 + true, //is_nullable + false, //is_autoincrement + storage_format_version_default, + storage_format_version_default); //default_value } if (OB_SUCC(ret)) { ObObj table_mode_default; table_mode_default.set_int(0); - ADD_COLUMN_SCHEMA_T("table_mode", // 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 - true, // is_nullable - false, // is_autoincrement - table_mode_default, - table_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("table_mode", //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 + true, //is_nullable + false, //is_autoincrement + table_mode_default, + table_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj encryption_default; encryption_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("encryption", // 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 - OB_MAX_ENCRYPTION_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - encryption_default, - encryption_default); // default_value + ADD_COLUMN_SCHEMA_T("encryption", //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 + OB_MAX_ENCRYPTION_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + encryption_default, + encryption_default); //default_value } if (OB_SUCC(ret)) { ObObj tablespace_id_default; tablespace_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tablespace_id", // 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 - true, // is_nullable - false, // is_autoincrement - tablespace_id_default, - tablespace_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tablespace_id", //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 + true, //is_nullable + false, //is_autoincrement + tablespace_id_default, + tablespace_id_default); //default_value } if (OB_SUCC(ret)) { ObObj drop_schema_version_default; drop_schema_version_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("drop_schema_version", // 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 - true, // is_nullable - false, // is_autoincrement - drop_schema_version_default, - drop_schema_version_default); // default_value + ADD_COLUMN_SCHEMA_T("drop_schema_version", //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 + true, //is_nullable + false, //is_autoincrement + drop_schema_version_default, + drop_schema_version_default); //default_value } if (OB_SUCC(ret)) { ObObj is_sub_part_template_default; is_sub_part_template_default.set_tinyint(true); - ADD_COLUMN_SCHEMA_T("is_sub_part_template", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - is_sub_part_template_default, - is_sub_part_template_default); // default_value + ADD_COLUMN_SCHEMA_T("is_sub_part_template", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + is_sub_part_template_default, + is_sub_part_template_default); //default_value } if (OB_SUCC(ret)) { ObObj dop_default; dop_default.set_int(1); - ADD_COLUMN_SCHEMA_T("dop", // 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 - true, // is_nullable - false, // is_autoincrement - dop_default, - dop_default); // default_value + ADD_COLUMN_SCHEMA_T("dop", //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 + true, //is_nullable + false, //is_autoincrement + dop_default, + dop_default); //default_value } if (OB_SUCC(ret)) { ObObj character_set_client_default; character_set_client_default.set_int(0); - ADD_COLUMN_SCHEMA_T("character_set_client", // 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 - true, // is_nullable - false, // is_autoincrement - character_set_client_default, - character_set_client_default); // default_value + ADD_COLUMN_SCHEMA_T("character_set_client", //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 + true, //is_nullable + false, //is_autoincrement + character_set_client_default, + character_set_client_default); //default_value } if (OB_SUCC(ret)) { ObObj collation_connection_default; collation_connection_default.set_int(0); - ADD_COLUMN_SCHEMA_T("collation_connection", // 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 - true, // is_nullable - false, // is_autoincrement - collation_connection_default, - collation_connection_default); // default_value + ADD_COLUMN_SCHEMA_T("collation_connection", //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 + true, //is_nullable + false, //is_autoincrement + collation_connection_default, + collation_connection_default); //default_value } if (OB_SUCC(ret)) { ObObj auto_part_size_default; auto_part_size_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("auto_part_size", // 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 - true, // is_nullable - false, // is_autoincrement - auto_part_size_default, - auto_part_size_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_part_size", //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 + true, //is_nullable + false, //is_autoincrement + auto_part_size_default, + auto_part_size_default); //default_value } if (OB_SUCC(ret)) { ObObj auto_part_default; auto_part_default.set_tinyint(false); - ADD_COLUMN_SCHEMA_T("auto_part", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false, // is_autoincrement - auto_part_default, - auto_part_default); // default_value + ADD_COLUMN_SCHEMA_T("auto_part", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false, //is_autoincrement + auto_part_default, + auto_part_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -10801,17 +10774,16 @@ int ObInnerTableSchema::all_table_v2_history_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_object_type_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_object_type_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -10847,21 +10819,21 @@ int ObInnerTableSchema::all_tenant_object_type_schema(ObTableSchema& table_schem gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -10870,336 +10842,336 @@ int ObInnerTableSchema::all_tenant_object_type_schema(ObTableSchema& table_schem gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_type_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("object_type_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("type", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("properties", // 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 + ADD_COLUMN_SCHEMA("properties", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_id", // 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 + ADD_COLUMN_SCHEMA("charset_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_form", // 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 + ADD_COLUMN_SCHEMA("charset_form", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("length", // 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 + ADD_COLUMN_SCHEMA("length", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("number_precision", // 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 + ADD_COLUMN_SCHEMA("number_precision", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scale", // 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 + ADD_COLUMN_SCHEMA("scale", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zero_fill", // 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 + ADD_COLUMN_SCHEMA("zero_fill", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_type", // 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 + ADD_COLUMN_SCHEMA("coll_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 + ADD_COLUMN_SCHEMA("database_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flag", // 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 + ADD_COLUMN_SCHEMA("flag", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 + ADD_COLUMN_SCHEMA("owner_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comp_flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comp_flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_name", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("object_name", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("exec_env", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("exec_env", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("source", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("source", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("route_sql", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("route_sql", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //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(FLAT_ROW_STORE); @@ -11209,17 +11181,16 @@ int ObInnerTableSchema::all_tenant_object_type_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_object_type_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_object_type_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11255,21 +11226,21 @@ int ObInnerTableSchema::all_tenant_object_type_history_schema(ObTableSchema& tab gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -11278,351 +11249,351 @@ int ObInnerTableSchema::all_tenant_object_type_history_schema(ObTableSchema& tab gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_type_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("object_type_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("type", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("type", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("properties", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("properties", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("charset_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("charset_form", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("charset_form", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("length", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("length", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("number_precision", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("number_precision", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scale", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("scale", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("zero_fill", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("zero_fill", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coll_type", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("coll_type", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("database_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("database_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("owner_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("owner_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comp_flag", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comp_flag", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("object_name", // 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 - OB_MAX_TABLE_TYPE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("object_name", //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 + OB_MAX_TABLE_TYPE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("exec_env", // 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 - OB_MAX_PROC_ENV_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("exec_env", //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 + OB_MAX_PROC_ENV_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("source", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("source", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TENANT_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TENANT_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("route_sql", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObLongTextType, // column_type - CS_TYPE_INVALID, // column_collation_type - 0, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("route_sql", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObLongTextType, //column_type + CS_TYPE_INVALID, //column_collation_type + 0, //column_length + -1, //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(FLAT_ROW_STORE); @@ -11632,17 +11603,16 @@ int ObInnerTableSchema::all_tenant_object_type_history_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_backup_validation_job_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_backup_validation_job_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11678,21 +11648,21 @@ int ObInnerTableSchema::all_backup_validation_job_schema(ObTableSchema& table_sc gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -11701,126 +11671,126 @@ int ObInnerTableSchema::all_backup_validation_job_schema(ObTableSchema& table_sc gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("progress_percent", // 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 + ADD_COLUMN_SCHEMA("progress_percent", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -11830,17 +11800,16 @@ int ObInnerTableSchema::all_backup_validation_job_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_backup_validation_job_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_backup_validation_job_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -11876,21 +11845,21 @@ int ObInnerTableSchema::all_backup_validation_job_history_schema(ObTableSchema& gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -11899,126 +11868,126 @@ int ObInnerTableSchema::all_backup_validation_job_history_schema(ObTableSchema& gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("progress_percent", // 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 + ADD_COLUMN_SCHEMA("progress_percent", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -12028,17 +11997,16 @@ int ObInnerTableSchema::all_backup_validation_job_history_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_backup_validation_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_backup_validation_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -12074,21 +12042,21 @@ int ObInnerTableSchema::all_tenant_backup_validation_task_schema(ObTableSchema& gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -12097,293 +12065,293 @@ int ObInnerTableSchema::all_tenant_backup_validation_task_schema(ObTableSchema& gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("task_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("end_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("end_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_pg_count", // 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 + ADD_COLUMN_SCHEMA("total_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_pg_count", // 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 + ADD_COLUMN_SCHEMA("finish_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_partition_count", // 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 + ADD_COLUMN_SCHEMA("total_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 + ADD_COLUMN_SCHEMA("finish_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("total_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_size", // 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 + ADD_COLUMN_SCHEMA("log_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -12393,17 +12361,16 @@ int ObInnerTableSchema::all_tenant_backup_validation_task_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_backup_validation_task_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_backup_validation_task_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -12439,21 +12406,21 @@ int ObInnerTableSchema::all_backup_validation_task_history_schema(ObTableSchema& gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -12462,293 +12429,293 @@ int ObInnerTableSchema::all_backup_validation_task_history_schema(ObTableSchema& gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("task_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("end_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("end_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_pg_count", // 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 + ADD_COLUMN_SCHEMA("total_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_pg_count", // 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 + ADD_COLUMN_SCHEMA("finish_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_partition_count", // 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 + ADD_COLUMN_SCHEMA("total_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 + ADD_COLUMN_SCHEMA("finish_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("total_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_size", // 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 + ADD_COLUMN_SCHEMA("log_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -12758,17 +12725,16 @@ int ObInnerTableSchema::all_backup_validation_task_history_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_pg_backup_validation_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_pg_backup_validation_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -12804,21 +12770,21 @@ int ObInnerTableSchema::all_tenant_pg_backup_validation_task_schema(ObTableSchem gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -12827,321 +12793,321 @@ int ObInnerTableSchema::all_tenant_pg_backup_validation_task_schema(ObTableSchem gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("task_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("task_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 7, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("archive_round", // 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 + ADD_COLUMN_SCHEMA("archive_round", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trace_id", // 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 - OB_MAX_TRACE_ID_BUFFER_SIZE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trace_id", //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 + OB_MAX_TRACE_ID_BUFFER_SIZE, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - MAX_IP_ADDR_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + MAX_IP_ADDR_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_partition_count", // 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 + ADD_COLUMN_SCHEMA("total_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 + ADD_COLUMN_SCHEMA("finish_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("total_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_info", // 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 - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("log_info", //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 + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_size", // 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 + ADD_COLUMN_SCHEMA("log_size", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -13151,17 +13117,16 @@ int ObInnerTableSchema::all_tenant_pg_backup_validation_task_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_time_zone_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_time_zone_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -13194,73 +13159,73 @@ int ObInnerTableSchema::all_tenant_time_zone_schema(ObTableSchema& table_schema) if (OB_SUCC(ret)) { ObObj tenant_id_default; tenant_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 - tenant_id_default, - tenant_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tenant_id", //column_name + ++column_id, //column_id + 1, //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 + tenant_id_default, + tenant_id_default); //default_value } if (OB_SUCC(ret)) { ObObj time_zone_id_default; time_zone_id_default.set_null(); - ADD_COLUMN_SCHEMA_T("time_zone_id", // column_name - ++column_id, // column_id - 2, // 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 - time_zone_id_default, - time_zone_id_default); // default_value + ADD_COLUMN_SCHEMA_T("time_zone_id", //column_name + ++column_id, //column_id + 2, //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 + time_zone_id_default, + time_zone_id_default); //default_value } if (OB_SUCC(ret)) { ObObj use_leap_seconds_default; use_leap_seconds_default.set_varchar(ObString::make_string("N")); - ADD_COLUMN_SCHEMA_T("use_leap_seconds", // 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 - 8, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - use_leap_seconds_default, - use_leap_seconds_default); // default_value + ADD_COLUMN_SCHEMA_T("use_leap_seconds", //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 + 8, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + use_leap_seconds_default, + use_leap_seconds_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("version", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -13270,17 +13235,16 @@ int ObInnerTableSchema::all_tenant_time_zone_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_time_zone_name_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_time_zone_name_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -13313,73 +13277,73 @@ int ObInnerTableSchema::all_tenant_time_zone_name_schema(ObTableSchema& table_sc if (OB_SUCC(ret)) { ObObj tenant_id_default; tenant_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 - tenant_id_default, - tenant_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tenant_id", //column_name + ++column_id, //column_id + 1, //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 + tenant_id_default, + tenant_id_default); //default_value } if (OB_SUCC(ret)) { ObObj name_default; name_default.set_null(); - ADD_COLUMN_SCHEMA_T("name", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - 64, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - name_default, - name_default); // default_value + ADD_COLUMN_SCHEMA_T("name", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + 64, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + name_default, + name_default); //default_value } if (OB_SUCC(ret)) { ObObj time_zone_id_default; time_zone_id_default.set_null(); - ADD_COLUMN_SCHEMA_T("time_zone_id", // 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 - time_zone_id_default, - time_zone_id_default); // default_value + ADD_COLUMN_SCHEMA_T("time_zone_id", //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 + time_zone_id_default, + time_zone_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("version", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -13389,17 +13353,16 @@ int ObInnerTableSchema::all_tenant_time_zone_name_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_time_zone_transition_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_time_zone_transition_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -13432,92 +13395,92 @@ int ObInnerTableSchema::all_tenant_time_zone_transition_schema(ObTableSchema& ta if (OB_SUCC(ret)) { ObObj tenant_id_default; tenant_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 - tenant_id_default, - tenant_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tenant_id", //column_name + ++column_id, //column_id + 1, //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 + tenant_id_default, + tenant_id_default); //default_value } if (OB_SUCC(ret)) { ObObj time_zone_id_default; time_zone_id_default.set_null(); - ADD_COLUMN_SCHEMA_T("time_zone_id", // column_name - ++column_id, // column_id - 2, // 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 - time_zone_id_default, - time_zone_id_default); // default_value + ADD_COLUMN_SCHEMA_T("time_zone_id", //column_name + ++column_id, //column_id + 2, //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 + time_zone_id_default, + time_zone_id_default); //default_value } if (OB_SUCC(ret)) { ObObj transition_time_default; transition_time_default.set_null(); - ADD_COLUMN_SCHEMA_T("transition_time", // column_name - ++column_id, // column_id - 3, // 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 - transition_time_default, - transition_time_default); // default_value + ADD_COLUMN_SCHEMA_T("transition_time", //column_name + ++column_id, //column_id + 3, //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 + transition_time_default, + transition_time_default); //default_value } if (OB_SUCC(ret)) { ObObj transition_type_id_default; transition_type_id_default.set_null(); - ADD_COLUMN_SCHEMA_T("transition_type_id", // 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 - transition_type_id_default, - transition_type_id_default); // default_value + ADD_COLUMN_SCHEMA_T("transition_type_id", //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 + transition_type_id_default, + transition_type_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("version", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -13527,17 +13490,16 @@ int ObInnerTableSchema::all_tenant_time_zone_transition_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_time_zone_transition_type_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_time_zone_transition_type_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -13570,130 +13532,130 @@ int ObInnerTableSchema::all_tenant_time_zone_transition_type_schema(ObTableSchem if (OB_SUCC(ret)) { ObObj tenant_id_default; tenant_id_default.set_int(-1); - ADD_COLUMN_SCHEMA_T("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 - tenant_id_default, - tenant_id_default); // default_value + ADD_COLUMN_SCHEMA_T("tenant_id", //column_name + ++column_id, //column_id + 1, //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 + tenant_id_default, + tenant_id_default); //default_value } if (OB_SUCC(ret)) { ObObj time_zone_id_default; time_zone_id_default.set_null(); - ADD_COLUMN_SCHEMA_T("time_zone_id", // column_name - ++column_id, // column_id - 2, // 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 - time_zone_id_default, - time_zone_id_default); // default_value + ADD_COLUMN_SCHEMA_T("time_zone_id", //column_name + ++column_id, //column_id + 2, //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 + time_zone_id_default, + time_zone_id_default); //default_value } if (OB_SUCC(ret)) { ObObj transition_type_id_default; transition_type_id_default.set_null(); - ADD_COLUMN_SCHEMA_T("transition_type_id", // column_name - ++column_id, // column_id - 3, // 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 - transition_type_id_default, - transition_type_id_default); // default_value + ADD_COLUMN_SCHEMA_T("transition_type_id", //column_name + ++column_id, //column_id + 3, //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 + transition_type_id_default, + transition_type_id_default); //default_value } if (OB_SUCC(ret)) { ObObj offset_default; offset_default.set_int(0); - ADD_COLUMN_SCHEMA_T("offset", // 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 - offset_default, - offset_default); // default_value + ADD_COLUMN_SCHEMA_T("offset", //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 + offset_default, + offset_default); //default_value } if (OB_SUCC(ret)) { ObObj is_dst_default; is_dst_default.set_int(0); - ADD_COLUMN_SCHEMA_T("is_dst", // 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 - is_dst_default, - is_dst_default); // default_value + ADD_COLUMN_SCHEMA_T("is_dst", //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 + is_dst_default, + is_dst_default); //default_value } if (OB_SUCC(ret)) { ObObj abbreviation_default; abbreviation_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("abbreviation", // 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 - 8, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - abbreviation_default, - abbreviation_default); // default_value + ADD_COLUMN_SCHEMA_T("abbreviation", //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 + 8, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + abbreviation_default, + abbreviation_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("version", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -13703,17 +13665,16 @@ int ObInnerTableSchema::all_tenant_time_zone_transition_type_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_constraint_column_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_constraint_column_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -13749,21 +13710,21 @@ int ObInnerTableSchema::all_tenant_constraint_column_schema(ObTableSchema& table gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -13772,96 +13733,96 @@ int ObInnerTableSchema::all_tenant_constraint_column_schema(ObTableSchema& table gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("constraint_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("constraint_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -13871,17 +13832,16 @@ int ObInnerTableSchema::all_tenant_constraint_column_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_constraint_column_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_constraint_column_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -13917,21 +13877,21 @@ int ObInnerTableSchema::all_tenant_constraint_column_history_schema(ObTableSchem gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -13940,111 +13900,111 @@ int ObInnerTableSchema::all_tenant_constraint_column_history_schema(ObTableSchem gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("constraint_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("constraint_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("column_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("column_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_deleted", // 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 + ADD_COLUMN_SCHEMA("is_deleted", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -14054,17 +14014,16 @@ int ObInnerTableSchema::all_tenant_constraint_column_history_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_global_transaction_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_global_transaction_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -14100,21 +14059,21 @@ int ObInnerTableSchema::all_tenant_global_transaction_schema(ObTableSchema& tabl gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -14123,179 +14082,179 @@ int ObInnerTableSchema::all_tenant_global_transaction_schema(ObTableSchema& tabl gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("gtrid", // column_name - ++column_id, // column_id - 1, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_BINARY, // column_collation_type - 128, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("gtrid", //column_name + ++column_id, //column_id + 1, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_BINARY, //column_collation_type + 128, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("bqual", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_BINARY, // column_collation_type - 128, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("bqual", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_BINARY, //column_collation_type + 128, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj format_id_default; format_id_default.set_int(1); - ADD_COLUMN_SCHEMA_T("format_id", // column_name - ++column_id, // column_id - 3, // 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 - format_id_default, - format_id_default); // default_value + ADD_COLUMN_SCHEMA_T("format_id", //column_name + ++column_id, //column_id + 3, //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 + format_id_default, + format_id_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trans_id", // 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 - 512, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trans_id", //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 + 512, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("coordinator", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("coordinator", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scheduler_ip", // 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 - OB_MAX_SERVER_ADDR_SIZE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("scheduler_ip", //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 + OB_MAX_SERVER_ADDR_SIZE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("scheduler_port", // 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 + ADD_COLUMN_SCHEMA("scheduler_port", //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 } if (OB_SUCC(ret)) { ObObj is_readonly_default; is_readonly_default.set_tinyint(0); - ADD_COLUMN_SCHEMA_T("is_readonly", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - is_readonly_default, - is_readonly_default); // default_value + ADD_COLUMN_SCHEMA_T("is_readonly", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + is_readonly_default, + is_readonly_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("state", // 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 + ADD_COLUMN_SCHEMA("state", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("end_flag", // 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 + ADD_COLUMN_SCHEMA("end_flag", //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 } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -14305,17 +14264,16 @@ int ObInnerTableSchema::all_tenant_global_transaction_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_dependency_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_dependency_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -14351,21 +14309,21 @@ int ObInnerTableSchema::all_tenant_dependency_schema(ObTableSchema& table_schema gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -14374,231 +14332,231 @@ int ObInnerTableSchema::all_tenant_dependency_schema(ObTableSchema& table_schema gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dep_obj_type", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("dep_obj_type", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dep_obj_id", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("dep_obj_id", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dep_order", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("dep_order", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // 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 + ADD_COLUMN_SCHEMA("schema_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dep_timestamp", // 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 + ADD_COLUMN_SCHEMA("dep_timestamp", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_obj_type", // 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 + ADD_COLUMN_SCHEMA("ref_obj_type", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_obj_id", // 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 + ADD_COLUMN_SCHEMA("ref_obj_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_timestamp", // 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 + ADD_COLUMN_SCHEMA("ref_timestamp", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dep_obj_owner_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dep_obj_owner_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("property", // 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 + ADD_COLUMN_SCHEMA("property", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dep_attrs", // 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_ORACLE_RAW_SQL_COL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dep_attrs", //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_ORACLE_RAW_SQL_COL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dep_reason", // 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_ORACLE_RAW_SQL_COL_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dep_reason", //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_ORACLE_RAW_SQL_COL_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("ref_obj_name", // 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 - OB_MAX_TABLE_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("ref_obj_name", //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 + OB_MAX_TABLE_NAME_LENGTH, //column_length + -1, //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(FLAT_ROW_STORE); @@ -14608,17 +14566,16 @@ int ObInnerTableSchema::all_tenant_dependency_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_backup_backupset_job_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_backup_backupset_job_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -14654,21 +14611,21 @@ int ObInnerTableSchema::all_backup_backupset_job_schema(ObTableSchema& table_sch gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -14677,141 +14634,141 @@ int ObInnerTableSchema::all_backup_backupset_job_schema(ObTableSchema& table_sch gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("copy_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("copy_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_backupset_type", // 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 - OB_INNER_TABLE_BACKUP_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_backupset_type", //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 + OB_INNER_TABLE_BACKUP_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -14821,17 +14778,16 @@ int ObInnerTableSchema::all_backup_backupset_job_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_backup_backupset_job_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_backup_backupset_job_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -14867,21 +14823,21 @@ int ObInnerTableSchema::all_backup_backupset_job_history_schema(ObTableSchema& t gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -14890,141 +14846,141 @@ int ObInnerTableSchema::all_backup_backupset_job_history_schema(ObTableSchema& t gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("copy_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("copy_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_backupset_type", // 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 - OB_INNER_TABLE_BACKUP_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_backupset_type", //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 + OB_INNER_TABLE_BACKUP_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_name", // 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 - OB_MAX_TENANT_NAME_LENGTH_STORE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("tenant_name", //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 + OB_MAX_TENANT_NAME_LENGTH_STORE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -15034,10 +14990,10 @@ int ObInnerTableSchema::all_backup_backupset_job_history_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.28001_28050.cpp b/src/share/inner_table/ob_inner_table_schema.28001_28050.cpp index 1b0fe2f82..85a05a557 100644 --- a/src/share/inner_table/ob_inner_table_schema.28001_28050.cpp +++ b/src/share/inner_table/ob_inner_table_schema.28001_28050.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::gv_outline_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_outline_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -58,8 +60,7 @@ int ObInnerTableSchema::gv_outline_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT tenant_id TENANT_ID, database_id DATABASE_ID, outline_id OUTLINE_ID, database_name DATABASE_NAME, outline_name OUTLINE_NAME, visible_signature VISIBLE_SIGNATURE, sql_text SQL_TEXT, outline_target OUTLINE_TARGET, outline_sql OUTLINE_SQL from SYS.TENANT_VIRTUAL_OUTLINE_AGENT )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT tenant_id TENANT_ID, database_id DATABASE_ID, outline_id OUTLINE_ID, database_name DATABASE_NAME, outline_name OUTLINE_NAME, visible_signature VISIBLE_SIGNATURE, sql_text SQL_TEXT, outline_target OUTLINE_TARGET, outline_sql OUTLINE_SQL from SYS.TENANT_VIRTUAL_OUTLINE_AGENT )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -71,17 +72,16 @@ int ObInnerTableSchema::gv_outline_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sql_audit_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sql_audit_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -112,8 +112,7 @@ int ObInnerTableSchema::gv_sql_audit_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT svr_ip SVR_IP, svr_port SVR_PORT, request_id REQUEST_ID, execution_id SQL_EXEC_ID, trace_id TRACE_ID, session_id SID, client_ip CLIENT_IP, client_port CLIENT_PORT, tenant_id TENANT_ID, effective_tenant_id EFFECTIVE_TENANT_ID, tenant_name TENANT_NAME, user_id USER_ID, user_name USER_NAME, user_group as USER_GROUP, user_client_ip as USER_CLIENT_IP, db_id DB_ID, db_name DB_NAME, sql_id SQL_ID, query_sql QUERY_SQL, plan_id PLAN_ID, affected_rows AFFECTED_ROWS, return_rows RETURN_ROWS, partition_cnt PARTITION_CNT, ret_code RET_CODE, qc_id QC_ID, dfo_id DFO_ID, sqc_id SQC_ID, worker_id WORKER_ID, event EVENT, p1text P1TEXT, p1 P1, p2text P2TEXT, p2 P2, p3text P3TEXT, p3 P3, "LEVEL" "LEVEL", wait_class_id WAIT_CLASS_ID, "WAIT_CLASS#" "WAIT_CLASS#", wait_class WAIT_CLASS, state STATE, wait_time_micro WAIT_TIME_MICRO, total_wait_time_micro TOTAL_WAIT_TIME_MICRO, total_waits TOTAL_WAITS, rpc_count RPC_COUNT, plan_type PLAN_TYPE, is_inner_sql IS_INNER_SQL, is_executor_rpc IS_EXECUTOR_RPC, is_hit_plan IS_HIT_PLAN, request_time REQUEST_TIME, elapsed_time ELAPSED_TIME, net_time NET_TIME, net_wait_time NET_WAIT_TIME, queue_time QUEUE_TIME, decode_time DECODE_TIME, get_plan_time GET_PLAN_TIME, execute_time EXECUTE_TIME, application_wait_time APPLICATION_WAIT_TIME, concurrency_wait_time CONCURRENCY_WAIT_TIME, user_io_wait_time USER_IO_WAIT_TIME, schedule_time SCHEDULE_TIME, row_cache_hit ROW_CACHE_HIT, bloom_filter_cache_hit BLOOM_FILTER_CACHE_HIT, block_cache_hit BLOCK_CACHE_HIT, block_index_cache_hit BLOCK_INDEX_CACHE_HIT, disk_reads DISK_READS, retry_cnt RETRY_CNT, table_scan TABLE_SCAN, consistency_level CONSISTENCY_LEVEL, memstore_read_row_count MEMSTORE_READ_ROW_COUNT, ssstore_read_row_count SSSTORE_READ_ROW_COUNT, request_memory_used REQUEST_MEMORY_USED, expected_worker_count EXPECTED_WORKER_COUNT, used_worker_count USED_WORKER_COUNT, sched_info SCHED_INFO, ps_stmt_id PS_STMT_ID, transaction_hash TRANSACTION_HASH, request_type as REQUEST_TYPE, is_batched_multi_stmt as IS_BATCHED_MULTI_STMT, ob_trace_info as OB_TRACE_INFO, plan_hash as PLAN_HASH FROM SYS.ALL_VIRTUAL_SQL_AUDIT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT svr_ip SVR_IP, svr_port SVR_PORT, request_id REQUEST_ID, execution_id SQL_EXEC_ID, trace_id TRACE_ID, session_id SID, client_ip CLIENT_IP, client_port CLIENT_PORT, tenant_id TENANT_ID, effective_tenant_id EFFECTIVE_TENANT_ID, tenant_name TENANT_NAME, user_id USER_ID, user_name USER_NAME, user_group as USER_GROUP, user_client_ip as USER_CLIENT_IP, db_id DB_ID, db_name DB_NAME, sql_id SQL_ID, query_sql QUERY_SQL, plan_id PLAN_ID, affected_rows AFFECTED_ROWS, return_rows RETURN_ROWS, partition_cnt PARTITION_CNT, ret_code RET_CODE, qc_id QC_ID, dfo_id DFO_ID, sqc_id SQC_ID, worker_id WORKER_ID, event EVENT, p1text P1TEXT, p1 P1, p2text P2TEXT, p2 P2, p3text P3TEXT, p3 P3, "LEVEL" "LEVEL", wait_class_id WAIT_CLASS_ID, "WAIT_CLASS#" "WAIT_CLASS#", wait_class WAIT_CLASS, state STATE, wait_time_micro WAIT_TIME_MICRO, total_wait_time_micro TOTAL_WAIT_TIME_MICRO, total_waits TOTAL_WAITS, rpc_count RPC_COUNT, plan_type PLAN_TYPE, is_inner_sql IS_INNER_SQL, is_executor_rpc IS_EXECUTOR_RPC, is_hit_plan IS_HIT_PLAN, request_time REQUEST_TIME, elapsed_time ELAPSED_TIME, net_time NET_TIME, net_wait_time NET_WAIT_TIME, queue_time QUEUE_TIME, decode_time DECODE_TIME, get_plan_time GET_PLAN_TIME, execute_time EXECUTE_TIME, application_wait_time APPLICATION_WAIT_TIME, concurrency_wait_time CONCURRENCY_WAIT_TIME, user_io_wait_time USER_IO_WAIT_TIME, schedule_time SCHEDULE_TIME, row_cache_hit ROW_CACHE_HIT, bloom_filter_cache_hit BLOOM_FILTER_CACHE_HIT, block_cache_hit BLOCK_CACHE_HIT, block_index_cache_hit BLOCK_INDEX_CACHE_HIT, disk_reads DISK_READS, retry_cnt RETRY_CNT, table_scan TABLE_SCAN, consistency_level CONSISTENCY_LEVEL, memstore_read_row_count MEMSTORE_READ_ROW_COUNT, ssstore_read_row_count SSSTORE_READ_ROW_COUNT, request_memory_used REQUEST_MEMORY_USED, expected_worker_count EXPECTED_WORKER_COUNT, used_worker_count USED_WORKER_COUNT, sched_info SCHED_INFO, ps_stmt_id PS_STMT_ID, transaction_hash TRANSACTION_HASH, request_type as REQUEST_TYPE, is_batched_multi_stmt as IS_BATCHED_MULTI_STMT, ob_trace_info as OB_TRACE_INFO, plan_hash as PLAN_HASH FROM SYS.ALL_VIRTUAL_SQL_AUDIT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -125,17 +124,16 @@ int ObInnerTableSchema::gv_sql_audit_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sql_audit_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sql_audit_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -166,8 +164,7 @@ int ObInnerTableSchema::v_sql_audit_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT * FROM SYS.GV$SQL_AUDIT WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT * FROM SYS.GV$SQL_AUDIT WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -179,17 +176,16 @@ int ObInnerTableSchema::v_sql_audit_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_instance_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_instance_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -220,9 +216,7 @@ int ObInnerTableSchema::gv_instance_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL( - table_schema - .set_view_definition(R"__( SELECT CAST(ID AS NUMBER) INST_ID, CAST(NULL AS NUMBER) INSTANCE_NUMBER, CAST(NULL AS VARCHAR2(16)) INSTANCE_NAME, CAST(CONCAT(SVR_IP, CONCAT(':', SVR_PORT)) AS VARCHAR2(64)) HOST_NAME, CAST(SUBSTR(BUILD_VERSION, 1, 11) AS VARCHAR2(17)) VERSION, CAST(NULL AS DATE) STARTUP_TIME, CAST(NULL AS VARCHAR2(12)) STATUS, CAST(NULL AS VARCHAR2(3)) PARALLEL, CAST(NULL AS NUMBER) THREAD#, CAST(NULL AS VARCHAR2(7)) ARCHIVER, CAST(NULL AS VARCHAR2(15)) LOG_SWITCH_WAIT, CAST(NULL AS VARCHAR2(10)) LOGINS, CAST(NULL AS VARCHAR2(3)) SHUTDOWN_PENDING, CAST(STATUS AS VARCHAR2(17)) DATABASE_STATUS, CAST(NULL AS VARCHAR2(18)) INSTANCE_ROLE, CAST(NULL AS VARCHAR2(9)) ACTIVE_STATE, CAST(NULL AS VARCHAR2(2)) BLOCKED, CAST(NULL AS NUMBER) CON_ID, CAST(NULL AS VARCHAR2(11)) INSTANCE_MODE, CAST(NULL AS VARCHAR2(7)) EDITION, CAST(NULL AS VARCHAR2(80)) FAMILY, CAST(NULL AS VARCHAR2(15)) DATABASE_TYPE FROM SYS.ALL_VIRTUAL_SERVER_AGENT WHERE IS_SERVING_TENANT(SVR_IP, SVR_PORT, SYS_CONTEXT('USERENV', 'CON_ID')) = 1 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(ID AS NUMBER) INST_ID, CAST(NULL AS NUMBER) INSTANCE_NUMBER, CAST(NULL AS VARCHAR2(16)) INSTANCE_NAME, CAST(CONCAT(SVR_IP, CONCAT(':', SVR_PORT)) AS VARCHAR2(64)) HOST_NAME, CAST(SUBSTR(BUILD_VERSION, 1, 11) AS VARCHAR2(17)) VERSION, CAST(NULL AS DATE) STARTUP_TIME, CAST(NULL AS VARCHAR2(12)) STATUS, CAST(NULL AS VARCHAR2(3)) PARALLEL, CAST(NULL AS NUMBER) THREAD#, CAST(NULL AS VARCHAR2(7)) ARCHIVER, CAST(NULL AS VARCHAR2(15)) LOG_SWITCH_WAIT, CAST(NULL AS VARCHAR2(10)) LOGINS, CAST(NULL AS VARCHAR2(3)) SHUTDOWN_PENDING, CAST(STATUS AS VARCHAR2(17)) DATABASE_STATUS, CAST(NULL AS VARCHAR2(18)) INSTANCE_ROLE, CAST(NULL AS VARCHAR2(9)) ACTIVE_STATE, CAST(NULL AS VARCHAR2(2)) BLOCKED, CAST(NULL AS NUMBER) CON_ID, CAST(NULL AS VARCHAR2(11)) INSTANCE_MODE, CAST(NULL AS VARCHAR2(7)) EDITION, CAST(NULL AS VARCHAR2(80)) FAMILY, CAST(NULL AS VARCHAR2(15)) DATABASE_TYPE FROM SYS.ALL_VIRTUAL_SERVER_AGENT WHERE IS_SERVING_TENANT(SVR_IP, SVR_PORT, SYS_CONTEXT('USERENV', 'CON_ID')) = 1 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -234,17 +228,16 @@ int ObInnerTableSchema::gv_instance_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_instance_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_instance_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -275,8 +268,7 @@ int ObInnerTableSchema::v_instance_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(ID AS NUMBER) INST_ID, CAST(NULL AS NUMBER) INSTANCE_NUMBER, CAST(NULL AS VARCHAR2(16)) INSTANCE_NAME, CAST(CONCAT(SVR_IP, CONCAT(':', SVR_PORT)) AS VARCHAR2(64)) HOST_NAME, CAST(SUBSTR(BUILD_VERSION, 1, 11) AS VARCHAR2(17)) VERSION, CAST(NULL AS DATE) STARTUP_TIME, CAST(NULL AS VARCHAR2(12)) STATUS, CAST(NULL AS VARCHAR2(3)) PARALLEL, CAST(NULL AS NUMBER) THREAD#, CAST(NULL AS VARCHAR2(7)) ARCHIVER, CAST(NULL AS VARCHAR2(15)) LOG_SWITCH_WAIT, CAST(NULL AS VARCHAR2(10)) LOGINS, CAST(NULL AS VARCHAR2(3)) SHUTDOWN_PENDING, CAST(STATUS AS VARCHAR2(17)) DATABASE_STATUS, CAST(NULL AS VARCHAR2(18)) INSTANCE_ROLE, CAST(NULL AS VARCHAR2(9)) ACTIVE_STATE, CAST(NULL AS VARCHAR2(2)) BLOCKED, CAST(NULL AS NUMBER) CON_ID, CAST(NULL AS VARCHAR2(11)) INSTANCE_MODE, CAST(NULL AS VARCHAR2(7)) EDITION, CAST(NULL AS VARCHAR2(80)) FAMILY, CAST(NULL AS VARCHAR2(15)) DATABASE_TYPE FROM SYS.ALL_VIRTUAL_SERVER_AGENT WHERE IS_SERVING_TENANT(SVR_IP, SVR_PORT, SYS_CONTEXT('USERENV', 'CON_ID')) = 1 AND SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(ID AS NUMBER) INST_ID, CAST(NULL AS NUMBER) INSTANCE_NUMBER, CAST(NULL AS VARCHAR2(16)) INSTANCE_NAME, CAST(CONCAT(SVR_IP, CONCAT(':', SVR_PORT)) AS VARCHAR2(64)) HOST_NAME, CAST(SUBSTR(BUILD_VERSION, 1, 11) AS VARCHAR2(17)) VERSION, CAST(NULL AS DATE) STARTUP_TIME, CAST(NULL AS VARCHAR2(12)) STATUS, CAST(NULL AS VARCHAR2(3)) PARALLEL, CAST(NULL AS NUMBER) THREAD#, CAST(NULL AS VARCHAR2(7)) ARCHIVER, CAST(NULL AS VARCHAR2(15)) LOG_SWITCH_WAIT, CAST(NULL AS VARCHAR2(10)) LOGINS, CAST(NULL AS VARCHAR2(3)) SHUTDOWN_PENDING, CAST(STATUS AS VARCHAR2(17)) DATABASE_STATUS, CAST(NULL AS VARCHAR2(18)) INSTANCE_ROLE, CAST(NULL AS VARCHAR2(9)) ACTIVE_STATE, CAST(NULL AS VARCHAR2(2)) BLOCKED, CAST(NULL AS NUMBER) CON_ID, CAST(NULL AS VARCHAR2(11)) INSTANCE_MODE, CAST(NULL AS VARCHAR2(7)) EDITION, CAST(NULL AS VARCHAR2(80)) FAMILY, CAST(NULL AS VARCHAR2(15)) DATABASE_TYPE FROM SYS.ALL_VIRTUAL_SERVER_AGENT WHERE IS_SERVING_TENANT(SVR_IP, SVR_PORT, SYS_CONTEXT('USERENV', 'CON_ID')) = 1 AND SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -288,17 +280,16 @@ int ObInnerTableSchema::v_instance_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_plan_cache_plan_stat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_plan_cache_plan_stat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -329,8 +320,7 @@ int ObInnerTableSchema::gv_plan_cache_plan_stat_ora_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID AS TENANT_ID, SVR_IP AS SVR_IP, SVR_PORT AS SVR_PORT, PLAN_ID AS PLAN_ID, SQL_ID AS SQL_ID, TYPE AS TYPE, IS_BIND_SENSITIVE AS IS_BIND_SENSITIVE, IS_BIND_AWARE AS IS_BIND_AWARE, DB_ID AS DB_ID, STATEMENT AS STATEMENT, QUERY_SQL AS QUERY_SQL, SPECIAL_PARAMS AS SPECIAL_PARAMS, PARAM_INFOS AS PARAM_INFOS, SYS_VARS AS SYS_VARS, PLAN_HASH AS PLAN_HASH, FIRST_LOAD_TIME AS FIRST_LOAD_TIME, SCHEMA_VERSION AS SCHEMA_VERSION, MERGED_VERSION AS MERGED_VERSION, LAST_ACTIVE_TIME AS LAST_ACTIVE_TIME, AVG_EXE_USEC AS AVG_EXE_USEC, SLOWEST_EXE_TIME AS SLOWEST_EXE_TIME, SLOWEST_EXE_USEC AS SLOWEST_EXE_USEC, SLOW_COUNT AS SLOW_COUNT, HIT_COUNT AS HIT_COUNT, PLAN_SIZE AS PLAN_SIZE, EXECUTIONS AS EXECUTIONS, DISK_READS AS DISK_READS, DIRECT_WRITES AS DIRECT_WRITES, BUFFER_GETS AS BUFFERS_GETS, APPLICATION_WAIT_TIME AS APPLICATION_WATI_TIME, CONCURRENCY_WAIT_TIME AS CONCURRENCY_WAIT_TIME, USER_IO_WAIT_TIME AS USER_IO_WAIT_TIME, ROWS_PROCESSED AS ROWS_PROCESSED, ELAPSED_TIME AS ELAPSED_TIME, CPU_TIME AS CPU_TIME, LARGE_QUERYS AS LARGE_QUERYS, DELAYED_LARGE_QUERYS AS DELAYED_LARGE_QUERYS, DELAYED_PX_QUERYS AS DELAYED_PX_QUERYS, OUTLINE_VERSION AS OUTLINE_VERSION, OUTLINE_ID AS OUTLINE_ID, OUTLINE_DATA AS OUTLINE_DATA, HINTS_INFO AS HINTS_INFO, HINTS_ALL_WORKED AS HINTS_ALL_WORKED, ACS_SEL_INFO AS ACS_SEL_INFO, TABLE_SCAN AS TABLE_SCAN, EVOLUTION AS EVOLUTION, EVO_EXECUTIONS AS EVO_EXECUTIONS, EVO_CPU_TIME AS EVO_CPU_TIME, TIMEOUT_COUNT AS TIMEOUT_COUNT, PS_STMT_ID AS PS_STMT_ID, SESSID AS SESSID, TEMP_TABLES AS TEMP_TABLES, IS_USE_JIT AS IS_USE_JIT, OBJECT_TYPE AS OBJECT_TYPE, PL_SCHEMA_ID AS PL_SCHEMA_ID, IS_BATCHED_MULTI_STMT AS IS_BATCHED_MULTI_STMT FROM SYS.ALL_VIRTUAL_PLAN_STAT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID AS TENANT_ID, SVR_IP AS SVR_IP, SVR_PORT AS SVR_PORT, PLAN_ID AS PLAN_ID, SQL_ID AS SQL_ID, TYPE AS TYPE, IS_BIND_SENSITIVE AS IS_BIND_SENSITIVE, IS_BIND_AWARE AS IS_BIND_AWARE, DB_ID AS DB_ID, STATEMENT AS STATEMENT, QUERY_SQL AS QUERY_SQL, SPECIAL_PARAMS AS SPECIAL_PARAMS, PARAM_INFOS AS PARAM_INFOS, SYS_VARS AS SYS_VARS, PLAN_HASH AS PLAN_HASH, FIRST_LOAD_TIME AS FIRST_LOAD_TIME, SCHEMA_VERSION AS SCHEMA_VERSION, MERGED_VERSION AS MERGED_VERSION, LAST_ACTIVE_TIME AS LAST_ACTIVE_TIME, AVG_EXE_USEC AS AVG_EXE_USEC, SLOWEST_EXE_TIME AS SLOWEST_EXE_TIME, SLOWEST_EXE_USEC AS SLOWEST_EXE_USEC, SLOW_COUNT AS SLOW_COUNT, HIT_COUNT AS HIT_COUNT, PLAN_SIZE AS PLAN_SIZE, EXECUTIONS AS EXECUTIONS, DISK_READS AS DISK_READS, DIRECT_WRITES AS DIRECT_WRITES, BUFFER_GETS AS BUFFERS_GETS, APPLICATION_WAIT_TIME AS APPLICATION_WATI_TIME, CONCURRENCY_WAIT_TIME AS CONCURRENCY_WAIT_TIME, USER_IO_WAIT_TIME AS USER_IO_WAIT_TIME, ROWS_PROCESSED AS ROWS_PROCESSED, ELAPSED_TIME AS ELAPSED_TIME, CPU_TIME AS CPU_TIME, LARGE_QUERYS AS LARGE_QUERYS, DELAYED_LARGE_QUERYS AS DELAYED_LARGE_QUERYS, DELAYED_PX_QUERYS AS DELAYED_PX_QUERYS, OUTLINE_VERSION AS OUTLINE_VERSION, OUTLINE_ID AS OUTLINE_ID, OUTLINE_DATA AS OUTLINE_DATA, HINTS_INFO AS HINTS_INFO, HINTS_ALL_WORKED AS HINTS_ALL_WORKED, ACS_SEL_INFO AS ACS_SEL_INFO, TABLE_SCAN AS TABLE_SCAN, EVOLUTION AS EVOLUTION, EVO_EXECUTIONS AS EVO_EXECUTIONS, EVO_CPU_TIME AS EVO_CPU_TIME, TIMEOUT_COUNT AS TIMEOUT_COUNT, PS_STMT_ID AS PS_STMT_ID, SESSID AS SESSID, TEMP_TABLES AS TEMP_TABLES, IS_USE_JIT AS IS_USE_JIT, OBJECT_TYPE AS OBJECT_TYPE, PL_SCHEMA_ID AS PL_SCHEMA_ID, IS_BATCHED_MULTI_STMT AS IS_BATCHED_MULTI_STMT FROM SYS.ALL_VIRTUAL_PLAN_STAT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -342,17 +332,16 @@ int ObInnerTableSchema::gv_plan_cache_plan_stat_ora_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_plan_cache_plan_stat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_plan_cache_plan_stat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -383,8 +372,7 @@ int ObInnerTableSchema::v_plan_cache_plan_stat_ora_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * FROM SYS.GV$PLAN_CACHE_PLAN_STAT WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM SYS.GV$PLAN_CACHE_PLAN_STAT WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -396,17 +384,16 @@ int ObInnerTableSchema::v_plan_cache_plan_stat_ora_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_plan_cache_plan_explain_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_plan_cache_plan_explain_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -437,8 +424,7 @@ int ObInnerTableSchema::gv_plan_cache_plan_explain_ora_schema(ObTableSchema& tab table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID AS TENANT_ID, SVR_IP as SVR_IP, SVR_PORT as SVR_PORT, PLAN_ID AS PLAN_ID, PLAN_DEPTH as PLAN_DEPTH, PLAN_LINE_ID as PLAN_LINE_ID, OPERATOR AS OPERATOR, NAME AS NAME, "ROWS" AS "ROWS", COST AS COST, PROPERTY AS PROPERTY FROM SYS.ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID AS TENANT_ID, SVR_IP as SVR_IP, SVR_PORT as SVR_PORT, PLAN_ID AS PLAN_ID, PLAN_DEPTH as PLAN_DEPTH, PLAN_LINE_ID as PLAN_LINE_ID, OPERATOR AS OPERATOR, NAME AS NAME, "ROWS" AS "ROWS", COST AS COST, PROPERTY AS PROPERTY FROM SYS.ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -450,17 +436,16 @@ int ObInnerTableSchema::gv_plan_cache_plan_explain_ora_schema(ObTableSchema& tab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_plan_cache_plan_explain_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_plan_cache_plan_explain_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -491,8 +476,7 @@ int ObInnerTableSchema::v_plan_cache_plan_explain_ora_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * FROM SYS.GV$PLAN_CACHE_PLAN_EXPLAIN WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM SYS.GV$PLAN_CACHE_PLAN_EXPLAIN WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -504,17 +488,16 @@ int ObInnerTableSchema::v_plan_cache_plan_explain_ora_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_session_wait_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_session_wait_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -545,8 +528,7 @@ int ObInnerTableSchema::gv_session_wait_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SESSION_ID AS SID, TENANT_ID AS CON_ID, SVR_IP AS SVR_IP, SVR_PORT AS SVR_PORT, EVENT AS EVENT, P1TEXT AS P1TEXT, P1 AS P1, P2TEXT AS P2TEXT, P2 AS P2, P3TEXT AS P3TEXT, P3 AS P3, WAIT_CLASS_ID AS WAIT_CLASS_ID, "WAIT_CLASS#" AS "WAIT_CLASS#", WAIT_CLASS AS WAIT_CLASS, STATE AS STATE, WAIT_TIME_MICRO AS WAIT_TIME_MICRO, TIME_REMAINING_MICRO AS TIME_REMAINING_MICRO, TIME_SINCE_LAST_WAIT_MICRO AS TIME_SINCE_LAST_WAIT_MICRO FROM SYS.ALL_VIRTUAL_SESSION_WAIT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SESSION_ID AS SID, TENANT_ID AS CON_ID, SVR_IP AS SVR_IP, SVR_PORT AS SVR_PORT, EVENT AS EVENT, P1TEXT AS P1TEXT, P1 AS P1, P2TEXT AS P2TEXT, P2 AS P2, P3TEXT AS P3TEXT, P3 AS P3, WAIT_CLASS_ID AS WAIT_CLASS_ID, "WAIT_CLASS#" AS "WAIT_CLASS#", WAIT_CLASS AS WAIT_CLASS, STATE AS STATE, WAIT_TIME_MICRO AS WAIT_TIME_MICRO, TIME_REMAINING_MICRO AS TIME_REMAINING_MICRO, TIME_SINCE_LAST_WAIT_MICRO AS TIME_SINCE_LAST_WAIT_MICRO FROM SYS.ALL_VIRTUAL_SESSION_WAIT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -558,17 +540,16 @@ int ObInnerTableSchema::gv_session_wait_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_session_wait_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_session_wait_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -599,8 +580,7 @@ int ObInnerTableSchema::v_session_wait_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SID,CON_ID,EVENT,P1TEXT,P1, P2TEXT,P2,P3TEXT,P3,WAIT_CLASS_ID, "WAIT_CLASS#",WAIT_CLASS,STATE,WAIT_TIME_MICRO,TIME_REMAINING_MICRO, TIME_SINCE_LAST_WAIT_MICRO FROM SYS.GV$SESSION_WAIT WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SID,CON_ID,EVENT,P1TEXT,P1, P2TEXT,P2,P3TEXT,P3,WAIT_CLASS_ID, "WAIT_CLASS#",WAIT_CLASS,STATE,WAIT_TIME_MICRO,TIME_REMAINING_MICRO, TIME_SINCE_LAST_WAIT_MICRO FROM SYS.GV$SESSION_WAIT WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -612,17 +592,16 @@ int ObInnerTableSchema::v_session_wait_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_session_wait_history_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_session_wait_history_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -653,8 +632,7 @@ int ObInnerTableSchema::gv_session_wait_history_ora_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SESSION_ID AS SID, TENANT_ID AS CON_ID, SVR_IP AS SVR_IP, SVR_PORT AS SVR_PORT, "SEQ#" AS "SEQ#", "EVENT#" AS "EVENT#", EVENT AS EVENT, P1TEXT AS P1TEXT, P1 AS P1, P2TEXT AS P2TEXT, P2 AS P2, P3TEXT AS P3TEXT, P3 AS P3, WAIT_TIME_MICRO AS WAIT_TIME_MICRO, TIME_SINCE_LAST_WAIT_MICRO AS TIME_SINCE_LAST_WAIT_MICRO, WAIT_TIME AS WAIT_TIME FROM SYS.ALL_VIRTUAL_SESSION_WAIT_HISTORY WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SESSION_ID AS SID, TENANT_ID AS CON_ID, SVR_IP AS SVR_IP, SVR_PORT AS SVR_PORT, "SEQ#" AS "SEQ#", "EVENT#" AS "EVENT#", EVENT AS EVENT, P1TEXT AS P1TEXT, P1 AS P1, P2TEXT AS P2TEXT, P2 AS P2, P3TEXT AS P3TEXT, P3 AS P3, WAIT_TIME_MICRO AS WAIT_TIME_MICRO, TIME_SINCE_LAST_WAIT_MICRO AS TIME_SINCE_LAST_WAIT_MICRO, WAIT_TIME AS WAIT_TIME FROM SYS.ALL_VIRTUAL_SESSION_WAIT_HISTORY WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -666,17 +644,16 @@ int ObInnerTableSchema::gv_session_wait_history_ora_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_session_wait_history_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_session_wait_history_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -707,8 +684,7 @@ int ObInnerTableSchema::v_session_wait_history_ora_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SID,CON_ID,"SEQ#" AS "SEQ#","EVENT#" AS "EVENT#",EVENT, P1TEXT,P1,P2TEXT,P2,P3TEXT, P3,WAIT_TIME_MICRO,TIME_SINCE_LAST_WAIT_MICRO,WAIT_TIME FROM SYS.GV$SESSION_WAIT_HISTORY WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SID,CON_ID,"SEQ#" AS "SEQ#","EVENT#" AS "EVENT#",EVENT, P1TEXT,P1,P2TEXT,P2,P3TEXT, P3,WAIT_TIME_MICRO,TIME_SINCE_LAST_WAIT_MICRO,WAIT_TIME FROM SYS.GV$SESSION_WAIT_HISTORY WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -720,17 +696,16 @@ int ObInnerTableSchema::v_session_wait_history_ora_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_memory_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_memory_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -761,8 +736,7 @@ int ObInnerTableSchema::gv_memory_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID AS CON_ID, SVR_IP AS SVR_IP, SVR_PORT AS SVR_PORT, MOD_NAME AS CONTEXT, SUM(COUNT) AS COUNT, SUM(USED) AS USED, SUM(ALLOC_COUNT) AS ALLOC_COUNT, SUM(FREE_COUNT) AS FREE_COUNT FROM SYS.ALL_VIRTUAL_MEMORY_INFO WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND MOD_TYPE = 'USER' GROUP BY TENANT_ID, SVR_IP, SVR_PORT, MOD_NAME ORDER BY TENANT_ID, SVR_IP, SVR_PORT, MOD_NAME )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID AS CON_ID, SVR_IP AS SVR_IP, SVR_PORT AS SVR_PORT, MOD_NAME AS CONTEXT, SUM(COUNT) AS COUNT, SUM(USED) AS USED, SUM(ALLOC_COUNT) AS ALLOC_COUNT, SUM(FREE_COUNT) AS FREE_COUNT FROM SYS.ALL_VIRTUAL_MEMORY_INFO WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND MOD_TYPE = 'USER' GROUP BY TENANT_ID, SVR_IP, SVR_PORT, MOD_NAME ORDER BY TENANT_ID, SVR_IP, SVR_PORT, MOD_NAME )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -774,17 +748,16 @@ int ObInnerTableSchema::gv_memory_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_memory_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_memory_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -815,8 +788,7 @@ int ObInnerTableSchema::v_memory_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CON_ID, CONTEXT, COUNT, USED, ALLOC_COUNT, FREE_COUNT FROM SYS.GV$MEMORY WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CON_ID, CONTEXT, COUNT, USED, ALLOC_COUNT, FREE_COUNT FROM SYS.GV$MEMORY WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -828,17 +800,16 @@ int ObInnerTableSchema::v_memory_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_memstore_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_memstore_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -869,8 +840,7 @@ int ObInnerTableSchema::gv_memstore_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID AS CON_ID, SVR_IP AS SVR_IP, SVR_PORT AS SVR_PORT, ACTIVE_MEMSTORE_USED AS ACTIVE, TOTAL_MEMSTORE_USED AS TOTAL, MAJOR_FREEZE_TRIGGER AS "FREEZE_TRIGGER", MEMSTORE_LIMIT AS "MEM_LIMIT", FREEZE_CNT AS FREEZE_CNT FROM SYS.ALL_VIRTUAL_TENANT_MEMSTORE_INFO WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID AS CON_ID, SVR_IP AS SVR_IP, SVR_PORT AS SVR_PORT, ACTIVE_MEMSTORE_USED AS ACTIVE, TOTAL_MEMSTORE_USED AS TOTAL, MAJOR_FREEZE_TRIGGER AS "FREEZE_TRIGGER", MEMSTORE_LIMIT AS "MEM_LIMIT", FREEZE_CNT AS FREEZE_CNT FROM SYS.ALL_VIRTUAL_TENANT_MEMSTORE_INFO WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -882,17 +852,16 @@ int ObInnerTableSchema::gv_memstore_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_memstore_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_memstore_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -923,8 +892,7 @@ int ObInnerTableSchema::v_memstore_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CON_ID, ACTIVE, TOTAL, "FREEZE_TRIGGER", "MEM_LIMIT", FREEZE_CNT FROM SYS.GV$MEMSTORE WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CON_ID, ACTIVE, TOTAL, "FREEZE_TRIGGER", "MEM_LIMIT", FREEZE_CNT FROM SYS.GV$MEMSTORE WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -936,17 +904,16 @@ int ObInnerTableSchema::v_memstore_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_memstore_info_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_memstore_info_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -977,8 +944,7 @@ int ObInnerTableSchema::gv_memstore_info_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID AS CON_ID, SVR_IP AS SVR_IP, SVR_PORT AS SVR_PORT, TABLE_ID AS TABLE_ID, PARTITION_IDX AS PARTITION_ID, VERSION, BASE_VERSION, MULTI_VERSION_START, SNAPSHOT_VERSION, IS_ACTIVE, MEM_USED as USED, HASH_ITEM_COUNT as HASH_ITEMS, BTREE_ITEM_COUNT as BTREE_ITEMS FROM SYS.ALL_VIRTUAL_MEMSTORE_INFO WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID AS CON_ID, SVR_IP AS SVR_IP, SVR_PORT AS SVR_PORT, TABLE_ID AS TABLE_ID, PARTITION_IDX AS PARTITION_ID, VERSION, BASE_VERSION, MULTI_VERSION_START, SNAPSHOT_VERSION, IS_ACTIVE, MEM_USED as USED, HASH_ITEM_COUNT as HASH_ITEMS, BTREE_ITEM_COUNT as BTREE_ITEMS FROM SYS.ALL_VIRTUAL_MEMSTORE_INFO WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -990,17 +956,16 @@ int ObInnerTableSchema::gv_memstore_info_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_memstore_info_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_memstore_info_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1031,8 +996,7 @@ int ObInnerTableSchema::v_memstore_info_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CON_ID, PARTITION_ID, VERSION, BASE_VERSION, MULTI_VERSION_START, SNAPSHOT_VERSION, IS_ACTIVE, USED, HASH_ITEMS, BTREE_ITEMS FROM SYS.GV$MEMSTORE_INFO WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CON_ID, PARTITION_ID, VERSION, BASE_VERSION, MULTI_VERSION_START, SNAPSHOT_VERSION, IS_ACTIVE, USED, HASH_ITEMS, BTREE_ITEMS FROM SYS.GV$MEMSTORE_INFO WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1044,17 +1008,16 @@ int ObInnerTableSchema::v_memstore_info_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_server_memstore_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_server_memstore_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1085,8 +1048,7 @@ int ObInnerTableSchema::gv_server_memstore_ora_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SVR_IP AS SVR_IP, SVR_PORT AS SVR_PORT, ACTIVE_MEMSTORE_USED AS ACTIVE, TOTAL_MEMSTORE_USED AS TOTAL, MAJOR_FREEZE_TRIGGER AS "FREEZE_TRIGGER", MEMSTORE_LIMIT AS "MEM_LIMIT" FROM SYS.ALL_VIRTUAL_SERVER_MEMORY_INFO_AGENT WHERE SYS_CONTEXT('USERENV', 'CON_ID') = 1 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SVR_IP AS SVR_IP, SVR_PORT AS SVR_PORT, ACTIVE_MEMSTORE_USED AS ACTIVE, TOTAL_MEMSTORE_USED AS TOTAL, MAJOR_FREEZE_TRIGGER AS "FREEZE_TRIGGER", MEMSTORE_LIMIT AS "MEM_LIMIT" FROM SYS.ALL_VIRTUAL_SERVER_MEMORY_INFO_AGENT WHERE SYS_CONTEXT('USERENV', 'CON_ID') = 1 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1098,17 +1060,16 @@ int ObInnerTableSchema::gv_server_memstore_ora_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sesstat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sesstat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1139,8 +1100,7 @@ int ObInnerTableSchema::gv_sesstat_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SESSION_ID as SID, TENANT_ID as CON_ID, SVR_IP as SVR_IP, SVR_PORT as SVR_PORT, "STATISTIC#" as "STATISTIC#", VALUE as VALUE FROM SYS.ALL_VIRTUAL_SESSTAT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SESSION_ID as SID, TENANT_ID as CON_ID, SVR_IP as SVR_IP, SVR_PORT as SVR_PORT, "STATISTIC#" as "STATISTIC#", VALUE as VALUE FROM SYS.ALL_VIRTUAL_SESSTAT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1152,17 +1112,16 @@ int ObInnerTableSchema::gv_sesstat_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sesstat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sesstat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1193,8 +1152,7 @@ int ObInnerTableSchema::v_sesstat_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SID, CON_ID, "STATISTIC#", VALUE FROM SYS.GV$SESSTAT WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SID, CON_ID, "STATISTIC#", VALUE FROM SYS.GV$SESSTAT WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1206,17 +1164,16 @@ int ObInnerTableSchema::v_sesstat_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sysstat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sysstat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1247,8 +1204,7 @@ int ObInnerTableSchema::gv_sysstat_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID as CON_ID, SVR_IP as SVR_IP, SVR_PORT as SVR_PORT, "STATISTIC#" as "STATISTIC#", VALUE as VALUE, STAT_ID as STAT_ID, NAME as NAME, CLASS as CLASS FROM SYS.ALL_VIRTUAL_SYSSTAT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID as CON_ID, SVR_IP as SVR_IP, SVR_PORT as SVR_PORT, "STATISTIC#" as "STATISTIC#", VALUE as VALUE, STAT_ID as STAT_ID, NAME as NAME, CLASS as CLASS FROM SYS.ALL_VIRTUAL_SYSSTAT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1260,17 +1216,16 @@ int ObInnerTableSchema::gv_sysstat_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sysstat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sysstat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1301,8 +1256,7 @@ int ObInnerTableSchema::v_sysstat_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CON_ID, "STATISTIC#", VALUE, STAT_ID, NAME, CLASS FROM SYS.GV$SYSSTAT WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CON_ID, "STATISTIC#", VALUE, STAT_ID, NAME, CLASS FROM SYS.GV$SYSSTAT WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1314,17 +1268,16 @@ int ObInnerTableSchema::v_sysstat_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_system_event_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_system_event_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1355,8 +1308,7 @@ int ObInnerTableSchema::gv_system_event_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID as CON_ID, SVR_IP as SVR_IP, SVR_PORT as SVR_PORT, EVENT_ID as EVENT_ID, EVENT as EVENT, WAIT_CLASS_ID as WAIT_CLASS_ID, "WAIT_CLASS#" as "WAIT_CLASS#", WAIT_CLASS as WAIT_CLASS, TOTAL_WAITS as TOTAL_WAITS, TOTAL_TIMEOUTS as TOTAL_TIMEOUTS, TIME_WAITED as TIME_WAITED, AVERAGE_WAIT as AVERAGE_WAIT, TIME_WAITED_MICRO as TIME_WAITED_MICRO FROM SYS.ALL_VIRTUAL_SYSTEM_EVENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID as CON_ID, SVR_IP as SVR_IP, SVR_PORT as SVR_PORT, EVENT_ID as EVENT_ID, EVENT as EVENT, WAIT_CLASS_ID as WAIT_CLASS_ID, "WAIT_CLASS#" as "WAIT_CLASS#", WAIT_CLASS as WAIT_CLASS, TOTAL_WAITS as TOTAL_WAITS, TOTAL_TIMEOUTS as TOTAL_TIMEOUTS, TIME_WAITED as TIME_WAITED, AVERAGE_WAIT as AVERAGE_WAIT, TIME_WAITED_MICRO as TIME_WAITED_MICRO FROM SYS.ALL_VIRTUAL_SYSTEM_EVENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1368,17 +1320,16 @@ int ObInnerTableSchema::gv_system_event_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_system_event_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_system_event_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1409,8 +1360,7 @@ int ObInnerTableSchema::v_system_event_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CON_ID, EVENT_ID, EVENT, WAIT_CLASS_ID, "WAIT_CLASS#", WAIT_CLASS, TOTAL_WAITS, TOTAL_TIMEOUTS, TIME_WAITED, AVERAGE_WAIT, TIME_WAITED_MICRO FROM SYS.GV$SYSTEM_EVENT WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CON_ID, EVENT_ID, EVENT, WAIT_CLASS_ID, "WAIT_CLASS#", WAIT_CLASS, TOTAL_WAITS, TOTAL_TIMEOUTS, TIME_WAITED, AVERAGE_WAIT, TIME_WAITED_MICRO FROM SYS.GV$SYSTEM_EVENT WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1422,17 +1372,16 @@ int ObInnerTableSchema::v_system_event_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_tenant_memstore_allocator_info_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_tenant_memstore_allocator_info_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1463,8 +1412,7 @@ int ObInnerTableSchema::gv_tenant_memstore_allocator_info_ora_schema(ObTableSche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID as CON_ID, SVR_IP as SVR_IP, SVR_PORT as SVR_PORT, TABLE_ID as TABLE_ID, PARTITION_ID as PARTITION_ID, MT_BASE_VERSION as MT_BASE_VERSION, RETIRE_CLOCK as RETIRE_CLOCK, MT_IS_FROZEN as MT_IS_FROZEN, MT_PROTECTION_CLOCK as MT_PROTECTION_CLOCK, MT_SNAPSHOT_VERSION as MT_SNAPSHOT_VERSION FROM SYS.ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID as CON_ID, SVR_IP as SVR_IP, SVR_PORT as SVR_PORT, TABLE_ID as TABLE_ID, PARTITION_ID as PARTITION_ID, MT_BASE_VERSION as MT_BASE_VERSION, RETIRE_CLOCK as RETIRE_CLOCK, MT_IS_FROZEN as MT_IS_FROZEN, MT_PROTECTION_CLOCK as MT_PROTECTION_CLOCK, MT_SNAPSHOT_VERSION as MT_SNAPSHOT_VERSION FROM SYS.ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1476,17 +1424,16 @@ int ObInnerTableSchema::gv_tenant_memstore_allocator_info_ora_schema(ObTableSche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_tenant_memstore_allocator_info_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_tenant_memstore_allocator_info_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1517,8 +1464,7 @@ int ObInnerTableSchema::v_tenant_memstore_allocator_info_ora_schema(ObTableSchem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CON_ID, TABLE_ID, PARTITION_ID, MT_BASE_VERSION, RETIRE_CLOCK, MT_IS_FROZEN, MT_PROTECTION_CLOCK, MT_SNAPSHOT_VERSION FROM SYS.GV$TENANT_MEMSTORE_ALLOCATOR_INFO WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CON_ID, TABLE_ID, PARTITION_ID, MT_BASE_VERSION, RETIRE_CLOCK, MT_IS_FROZEN, MT_PROTECTION_CLOCK, MT_SNAPSHOT_VERSION FROM SYS.GV$TENANT_MEMSTORE_ALLOCATOR_INFO WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1530,17 +1476,16 @@ int ObInnerTableSchema::v_tenant_memstore_allocator_info_ora_schema(ObTableSchem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_plan_cache_stat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_plan_cache_stat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1571,8 +1516,7 @@ int ObInnerTableSchema::gv_plan_cache_stat_ora_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SVR_IP, SVR_PORT, SQL_NUM, MEM_USED, MEM_HOLD, ACCESS_COUNT, HIT_COUNT, HIT_RATE, PLAN_NUM, MEM_LIMIT, HASH_BUCKET, STMTKEY_NUM FROM SYS.ALL_VIRTUAL_PLAN_CACHE_STAT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SVR_IP, SVR_PORT, SQL_NUM, MEM_USED, MEM_HOLD, ACCESS_COUNT, HIT_COUNT, HIT_RATE, PLAN_NUM, MEM_LIMIT, HASH_BUCKET, STMTKEY_NUM FROM SYS.ALL_VIRTUAL_PLAN_CACHE_STAT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1584,17 +1528,16 @@ int ObInnerTableSchema::gv_plan_cache_stat_ora_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_plan_cache_stat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_plan_cache_stat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1625,8 +1568,7 @@ int ObInnerTableSchema::v_plan_cache_stat_ora_schema(ObTableSchema& table_schema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SQL_NUM, MEM_USED, MEM_HOLD, ACCESS_COUNT, HIT_COUNT, HIT_RATE, PLAN_NUM, MEM_LIMIT, HASH_BUCKET, STMTKEY_NUM FROM SYS.GV$PLAN_CACHE_STAT WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SQL_NUM, MEM_USED, MEM_HOLD, ACCESS_COUNT, HIT_COUNT, HIT_RATE, PLAN_NUM, MEM_LIMIT, HASH_BUCKET, STMTKEY_NUM FROM SYS.GV$PLAN_CACHE_STAT WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1638,17 +1580,16 @@ int ObInnerTableSchema::v_plan_cache_stat_ora_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_concurrent_limit_sql_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_concurrent_limit_sql_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1679,8 +1620,7 @@ int ObInnerTableSchema::gv_concurrent_limit_sql_ora_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT tenant_id TENANT_ID, database_id DATABASE_ID, outline_id OUTLINE_ID, database_name DATABASE_NAME, outline_name OUTLINE_NAME, outline_content OUTLINE_CONTENT, visible_signature VISIBLE_SIGNATURE, sql_text SQL_TEXT, concurrent_num CONCURRENT_NUM, limit_target LIMIT_TARGET FROM SYS.TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_AGENT)__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT tenant_id TENANT_ID, database_id DATABASE_ID, outline_id OUTLINE_ID, database_name DATABASE_NAME, outline_name OUTLINE_NAME, outline_content OUTLINE_CONTENT, visible_signature VISIBLE_SIGNATURE, sql_text SQL_TEXT, concurrent_num CONCURRENT_NUM, limit_target LIMIT_TARGET FROM SYS.TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_AGENT)__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1692,17 +1632,16 @@ int ObInnerTableSchema::gv_concurrent_limit_sql_ora_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::nls_session_parameters_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::nls_session_parameters_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1733,8 +1672,7 @@ int ObInnerTableSchema::nls_session_parameters_ora_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(UPPER(VARIABLE_NAME) AS VARCHAR(30)) AS PARAMETER, CAST(VALUE AS VARCHAR(64)) AS VALUE FROM SYS.TENANT_VIRTUAL_SESSION_VARIABLE WHERE VARIABLE_NAME LIKE 'nls_%' AND VARIABLE_NAME != 'nls_characterset' AND VARIABLE_NAME != 'nls_nchar_characterset' )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(UPPER(VARIABLE_NAME) AS VARCHAR(30)) AS PARAMETER, CAST(VALUE AS VARCHAR(64)) AS VALUE FROM SYS.TENANT_VIRTUAL_SESSION_VARIABLE WHERE VARIABLE_NAME LIKE 'nls_%' AND VARIABLE_NAME != 'nls_characterset' AND VARIABLE_NAME != 'nls_nchar_characterset' )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1746,17 +1684,16 @@ int ObInnerTableSchema::nls_session_parameters_ora_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::nls_instance_parameters_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::nls_instance_parameters_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1787,8 +1724,7 @@ int ObInnerTableSchema::nls_instance_parameters_ora_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(UPPER(VARIABLE_NAME) AS VARCHAR(30)) AS PARAMETER, CAST(VALUE AS VARCHAR(64)) AS VALUE FROM SYS.TENANT_VIRTUAL_GLOBAL_VARIABLE WHERE VARIABLE_NAME LIKE 'nls_%' )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(UPPER(VARIABLE_NAME) AS VARCHAR(30)) AS PARAMETER, CAST(VALUE AS VARCHAR(64)) AS VALUE FROM SYS.TENANT_VIRTUAL_GLOBAL_VARIABLE WHERE VARIABLE_NAME LIKE 'nls_%' )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1800,17 +1736,16 @@ int ObInnerTableSchema::nls_instance_parameters_ora_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::nls_database_parameters_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::nls_database_parameters_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1841,8 +1776,7 @@ int ObInnerTableSchema::nls_database_parameters_ora_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(UPPER(VARIABLE_NAME) AS VARCHAR(128)) AS PARAMETER, CAST(VALUE AS VARCHAR(64)) AS VALUE FROM SYS.TENANT_VIRTUAL_GLOBAL_VARIABLE WHERE VARIABLE_NAME LIKE 'nls_%' )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(UPPER(VARIABLE_NAME) AS VARCHAR(128)) AS PARAMETER, CAST(VALUE AS VARCHAR(64)) AS VALUE FROM SYS.TENANT_VIRTUAL_GLOBAL_VARIABLE WHERE VARIABLE_NAME LIKE 'nls_%' )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1854,17 +1788,16 @@ int ObInnerTableSchema::nls_database_parameters_ora_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_nls_parameters_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_nls_parameters_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1895,8 +1828,7 @@ int ObInnerTableSchema::v_nls_parameters_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(UPPER(VARIABLE_NAME) AS VARCHAR(64)) AS PARAMETER, CAST(VALUE AS VARCHAR(64)) AS VALUE, 0 AS CON_ID FROM SYS.TENANT_VIRTUAL_SESSION_VARIABLE WHERE VARIABLE_NAME LIKE 'nls_%' )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(UPPER(VARIABLE_NAME) AS VARCHAR(64)) AS PARAMETER, CAST(VALUE AS VARCHAR(64)) AS VALUE, 0 AS CON_ID FROM SYS.TENANT_VIRTUAL_SESSION_VARIABLE WHERE VARIABLE_NAME LIKE 'nls_%' )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1908,17 +1840,16 @@ int ObInnerTableSchema::v_nls_parameters_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_version_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_version_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1949,8 +1880,7 @@ int ObInnerTableSchema::v_version_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT VALUE AS BANNER, 0 AS CON_ID FROM SYS.TENANT_VIRTUAL_SESSION_VARIABLE WHERE VARIABLE_NAME = 'version_comment' )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT VALUE AS BANNER, 0 AS CON_ID FROM SYS.TENANT_VIRTUAL_SESSION_VARIABLE WHERE VARIABLE_NAME = 'version_comment' )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1962,17 +1892,16 @@ int ObInnerTableSchema::v_version_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_tenant_px_worker_stat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_tenant_px_worker_stat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2003,8 +1932,7 @@ int ObInnerTableSchema::gv_tenant_px_worker_stat_ora_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SESSION_ID, TENANT_ID, SVR_IP, SVR_PORT, TRACE_ID, QC_ID, SQC_ID, WORKER_ID, DFO_ID, START_TIME FROM SYS.ALL_VIRTUAL_PX_WORKER_STAT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SESSION_ID, TENANT_ID, SVR_IP, SVR_PORT, TRACE_ID, QC_ID, SQC_ID, WORKER_ID, DFO_ID, START_TIME FROM SYS.ALL_VIRTUAL_PX_WORKER_STAT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2016,17 +1944,16 @@ int ObInnerTableSchema::gv_tenant_px_worker_stat_ora_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_tenant_px_worker_stat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_tenant_px_worker_stat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2057,8 +1984,7 @@ int ObInnerTableSchema::v_tenant_px_worker_stat_ora_schema(ObTableSchema& table_ table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SESSION_ID, TENANT_ID, SVR_IP, SVR_PORT, TRACE_ID, QC_ID, SQC_ID, WORKER_ID, DFO_ID, START_TIME FROM SYS.GV$TENANT_PX_WORKER_STAT WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SESSION_ID, TENANT_ID, SVR_IP, SVR_PORT, TRACE_ID, QC_ID, SQC_ID, WORKER_ID, DFO_ID, START_TIME FROM SYS.GV$TENANT_PX_WORKER_STAT WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2070,17 +1996,16 @@ int ObInnerTableSchema::v_tenant_px_worker_stat_ora_schema(ObTableSchema& table_ table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_ps_stat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_ps_stat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2111,8 +2036,7 @@ int ObInnerTableSchema::gv_ps_stat_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT svr_ip, svr_port, stmt_count, hit_count, access_count, mem_hold FROM SYS.ALL_VIRTUAL_PS_STAT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT svr_ip, svr_port, stmt_count, hit_count, access_count, mem_hold FROM SYS.ALL_VIRTUAL_PS_STAT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2124,17 +2048,16 @@ int ObInnerTableSchema::gv_ps_stat_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_ps_stat_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_ps_stat_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2165,8 +2088,7 @@ int ObInnerTableSchema::v_ps_stat_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT svr_ip, svr_port, stmt_count, hit_count, access_count, mem_hold FROM SYS.GV$PS_STAT WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT svr_ip, svr_port, stmt_count, hit_count, access_count, mem_hold FROM SYS.GV$PS_STAT WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2178,17 +2100,16 @@ int ObInnerTableSchema::v_ps_stat_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_ps_item_info_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_ps_item_info_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2219,8 +2140,7 @@ int ObInnerTableSchema::gv_ps_item_info_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT svr_ip, svr_port, stmt_id, db_id, ps_sql, param_count, stmt_item_ref_count, stmt_info_ref_count, mem_hold, stmt_type, checksum, expired FROM SYS.ALL_VIRTUAL_PS_ITEM_INFO WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT svr_ip, svr_port, stmt_id, db_id, ps_sql, param_count, stmt_item_ref_count, stmt_info_ref_count, mem_hold, stmt_type, checksum, expired FROM SYS.ALL_VIRTUAL_PS_ITEM_INFO WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2232,17 +2152,16 @@ int ObInnerTableSchema::gv_ps_item_info_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_ps_item_info_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_ps_item_info_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2273,8 +2192,7 @@ int ObInnerTableSchema::v_ps_item_info_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT svr_ip, svr_port, stmt_id, db_id ps_sql, param_count, stmt_item_ref_count, stmt_info_ref_count, mem_hold, stmt_type, checksum, expired FROM SYS.GV$PS_ITEM_INFO WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT svr_ip, svr_port, stmt_id, db_id ps_sql, param_count, stmt_item_ref_count, stmt_info_ref_count, mem_hold, stmt_type, checksum, expired FROM SYS.GV$PS_ITEM_INFO WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2286,17 +2204,16 @@ int ObInnerTableSchema::v_ps_item_info_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sql_workarea_active_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sql_workarea_active_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2327,8 +2244,7 @@ int ObInnerTableSchema::gv_sql_workarea_active_ora_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(NULL AS NUMBER) AS SQL_HASH_VALUE, SQL_ID, CAST(NULL AS DATE) AS SQL_EXEC_START, SQL_EXEC_ID, CAST(NULL AS RAW(8)) AS WORKAREA_ADDRESS, OPERATION_TYPE, OPERATION_ID, POLICY, SID, CAST(NULL AS NUMBER) AS QCINST_ID, CAST(NULL AS NUMBER) AS QCSID, ACTIVE_TIME, WORK_AREA_SIZE, EXPECT_SIZE, ACTUAL_MEM_USED, MAX_MEM_USED, NUMBER_PASSES, TEMPSEG_SIZE, CAST(NULL AS VARCHAR2(20)) AS TABLESPACE, CAST(NULL AS NUMBER) AS "SEGRFNO#", CAST(NULL AS NUMBER) AS "SEGBLK#", TENANT_ID AS CON_ID FROM SYS.ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS NUMBER) AS SQL_HASH_VALUE, SQL_ID, CAST(NULL AS DATE) AS SQL_EXEC_START, SQL_EXEC_ID, CAST(NULL AS RAW(8)) AS WORKAREA_ADDRESS, OPERATION_TYPE, OPERATION_ID, POLICY, SID, CAST(NULL AS NUMBER) AS QCINST_ID, CAST(NULL AS NUMBER) AS QCSID, ACTIVE_TIME, WORK_AREA_SIZE, EXPECT_SIZE, ACTUAL_MEM_USED, MAX_MEM_USED, NUMBER_PASSES, TEMPSEG_SIZE, CAST(NULL AS VARCHAR2(20)) AS TABLESPACE, CAST(NULL AS NUMBER) AS "SEGRFNO#", CAST(NULL AS NUMBER) AS "SEGBLK#", TENANT_ID AS CON_ID FROM SYS.ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2340,17 +2256,16 @@ int ObInnerTableSchema::gv_sql_workarea_active_ora_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sql_workarea_active_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sql_workarea_active_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2381,8 +2296,7 @@ int ObInnerTableSchema::v_sql_workarea_active_ora_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(NULL AS NUMBER) AS SQL_HASH_VALUE, SQL_ID, CAST(NULL AS DATE) AS SQL_EXEC_START, SQL_EXEC_ID, CAST(NULL AS RAW(8)) AS WORKAREA_ADDRESS, OPERATION_TYPE, OPERATION_ID, POLICY, SID, CAST(NULL AS NUMBER) AS QCINST_ID, CAST(NULL AS NUMBER) AS QCSID, ACTIVE_TIME, WORK_AREA_SIZE, EXPECT_SIZE, ACTUAL_MEM_USED, MAX_MEM_USED, NUMBER_PASSES, TEMPSEG_SIZE, CAST(NULL AS VARCHAR2(20)) AS TABLESPACE, CAST(NULL AS NUMBER) AS "SEGRFNO#", CAST(NULL AS NUMBER) AS "SEGBLK#", TENANT_ID AS CON_ID FROM SYS.ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS NUMBER) AS SQL_HASH_VALUE, SQL_ID, CAST(NULL AS DATE) AS SQL_EXEC_START, SQL_EXEC_ID, CAST(NULL AS RAW(8)) AS WORKAREA_ADDRESS, OPERATION_TYPE, OPERATION_ID, POLICY, SID, CAST(NULL AS NUMBER) AS QCINST_ID, CAST(NULL AS NUMBER) AS QCSID, ACTIVE_TIME, WORK_AREA_SIZE, EXPECT_SIZE, ACTUAL_MEM_USED, MAX_MEM_USED, NUMBER_PASSES, TEMPSEG_SIZE, CAST(NULL AS VARCHAR2(20)) AS TABLESPACE, CAST(NULL AS NUMBER) AS "SEGRFNO#", CAST(NULL AS NUMBER) AS "SEGBLK#", TENANT_ID AS CON_ID FROM SYS.ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2394,17 +2308,16 @@ int ObInnerTableSchema::v_sql_workarea_active_ora_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sql_workarea_histogram_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sql_workarea_histogram_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2435,8 +2348,7 @@ int ObInnerTableSchema::gv_sql_workarea_histogram_ora_schema(ObTableSchema& tabl table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT LOW_OPTIMAL_SIZE, HIGH_OPTIMAL_SIZE, OPTIMAL_EXECUTIONS, ONEPASS_EXECUTIONS, MULTIPASSES_EXECUTIONS, TOTAL_EXECUTIONS, TENANT_ID AS CON_ID FROM SYS.ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT LOW_OPTIMAL_SIZE, HIGH_OPTIMAL_SIZE, OPTIMAL_EXECUTIONS, ONEPASS_EXECUTIONS, MULTIPASSES_EXECUTIONS, TOTAL_EXECUTIONS, TENANT_ID AS CON_ID FROM SYS.ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2448,17 +2360,16 @@ int ObInnerTableSchema::gv_sql_workarea_histogram_ora_schema(ObTableSchema& tabl table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sql_workarea_histogram_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sql_workarea_histogram_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2489,8 +2400,7 @@ int ObInnerTableSchema::v_sql_workarea_histogram_ora_schema(ObTableSchema& table table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT LOW_OPTIMAL_SIZE, HIGH_OPTIMAL_SIZE, OPTIMAL_EXECUTIONS, ONEPASS_EXECUTIONS, MULTIPASSES_EXECUTIONS, TOTAL_EXECUTIONS, TENANT_ID AS CON_ID FROM SYS.ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT LOW_OPTIMAL_SIZE, HIGH_OPTIMAL_SIZE, OPTIMAL_EXECUTIONS, ONEPASS_EXECUTIONS, MULTIPASSES_EXECUTIONS, TOTAL_EXECUTIONS, TENANT_ID AS CON_ID FROM SYS.ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2502,17 +2412,16 @@ int ObInnerTableSchema::v_sql_workarea_histogram_ora_schema(ObTableSchema& table table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_ob_sql_workarea_memory_info_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_ob_sql_workarea_memory_info_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -2543,8 +2452,7 @@ int ObInnerTableSchema::gv_ob_sql_workarea_memory_info_ora_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT MAX_WORKAREA_SIZE, WORKAREA_HOLD_SIZE, MAX_AUTO_WORKAREA_SIZE, MEM_TARGET, TOTAL_MEM_USED, GLOBAL_MEM_BOUND, DRIFT_SIZE, WORKAREA_COUNT, MANUAL_CALC_COUNT FROM SYS.ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT MAX_WORKAREA_SIZE, WORKAREA_HOLD_SIZE, MAX_AUTO_WORKAREA_SIZE, MEM_TARGET, TOTAL_MEM_USED, GLOBAL_MEM_BOUND, DRIFT_SIZE, WORKAREA_COUNT, MANUAL_CALC_COUNT FROM SYS.ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -2556,10 +2464,10 @@ int ObInnerTableSchema::gv_ob_sql_workarea_memory_info_ora_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.28051_28100.cpp b/src/share/inner_table/ob_inner_table_schema.28051_28100.cpp index e5f1e93e2..1387d0fe2 100644 --- a/src/share/inner_table/ob_inner_table_schema.28051_28100.cpp +++ b/src/share/inner_table/ob_inner_table_schema.28051_28100.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::v_ob_sql_workarea_memory_info_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_ob_sql_workarea_memory_info_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -58,8 +60,7 @@ int ObInnerTableSchema::v_ob_sql_workarea_memory_info_ora_schema(ObTableSchema& table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT MAX_WORKAREA_SIZE, WORKAREA_HOLD_SIZE, MAX_AUTO_WORKAREA_SIZE, MEM_TARGET, TOTAL_MEM_USED, GLOBAL_MEM_BOUND, DRIFT_SIZE, WORKAREA_COUNT, MANUAL_CALC_COUNT FROM SYS.ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT MAX_WORKAREA_SIZE, WORKAREA_HOLD_SIZE, MAX_AUTO_WORKAREA_SIZE, MEM_TARGET, TOTAL_MEM_USED, GLOBAL_MEM_BOUND, DRIFT_SIZE, WORKAREA_COUNT, MANUAL_CALC_COUNT FROM SYS.ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -71,17 +72,16 @@ int ObInnerTableSchema::v_ob_sql_workarea_memory_info_ora_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_plan_cache_reference_info_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_plan_cache_reference_info_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -112,8 +112,7 @@ int ObInnerTableSchema::gv_plan_cache_reference_info_ora_schema(ObTableSchema& t table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SVR_IP, SVR_PORT, TENANT_ID, PC_REF_PLAN_LOCAL, PC_REF_PLAN_REMOTE, PC_REF_PLAN_DIST, PC_REF_PLAN_ARR, PC_REF_PL, PC_REF_PL_STAT, PLAN_GEN, CLI_QUERY, OUTLINE_EXEC, PLAN_EXPLAIN, ASYN_BASELINE, LOAD_BASELINE, PS_EXEC, GV_SQL, PL_ANON, PL_ROUTINE, PACKAGE_VAR, PACKAGE_TYPE, PACKAGE_SPEC, PACKAGE_BODY, PACKAGE_RESV, GET_PKG, INDEX_BUILDER, PCV_SET, PCV_RD, PCV_WR, PCV_GET_PLAN_KEY, PCV_GET_PL_KEY, PCV_EXPIRE_BY_USED, PCV_EXPIRE_BY_MEM FROM SYS.ALL_VIRTUAL_PLAN_CACHE_STAT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SVR_IP, SVR_PORT, TENANT_ID, PC_REF_PLAN_LOCAL, PC_REF_PLAN_REMOTE, PC_REF_PLAN_DIST, PC_REF_PLAN_ARR, PC_REF_PL, PC_REF_PL_STAT, PLAN_GEN, CLI_QUERY, OUTLINE_EXEC, PLAN_EXPLAIN, ASYN_BASELINE, LOAD_BASELINE, PS_EXEC, GV_SQL, PL_ANON, PL_ROUTINE, PACKAGE_VAR, PACKAGE_TYPE, PACKAGE_SPEC, PACKAGE_BODY, PACKAGE_RESV, GET_PKG, INDEX_BUILDER, PCV_SET, PCV_RD, PCV_WR, PCV_GET_PLAN_KEY, PCV_GET_PL_KEY, PCV_EXPIRE_BY_USED, PCV_EXPIRE_BY_MEM FROM SYS.ALL_VIRTUAL_PLAN_CACHE_STAT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -125,17 +124,16 @@ int ObInnerTableSchema::gv_plan_cache_reference_info_ora_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_plan_cache_reference_info_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_plan_cache_reference_info_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -166,8 +164,7 @@ int ObInnerTableSchema::v_plan_cache_reference_info_ora_schema(ObTableSchema& ta table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * FROM GV$PLAN_CACHE_REFERENCE_INFO WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM GV$PLAN_CACHE_REFERENCE_INFO WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -179,17 +176,16 @@ int ObInnerTableSchema::v_plan_cache_reference_info_ora_schema(ObTableSchema& ta table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sql_workarea_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sql_workarea_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -220,8 +216,7 @@ int ObInnerTableSchema::gv_sql_workarea_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(NULL AS RAW(8)) AS ADDRESS, CAST(NULL AS NUMBER) AS HASH_VALUE, SQL_ID, CAST(NULL AS NUMBER) AS CHILD_NUMBER, CAST(NULL AS RAW(8)) AS WORKAREA_ADDRESS, OPERATION_TYPE, OPERATION_ID, POLICY, ESTIMATED_OPTIMAL_SIZE, ESTIMATED_ONEPASS_SIZE, LAST_MEMORY_USED, LAST_EXECUTION, LAST_DEGREE, TOTAL_EXECUTIONS, OPTIMAL_EXECUTIONS, ONEPASS_EXECUTIONS, multipasses_executions, ACTIVE_TIME, MAX_TEMPSEG_SIZE, LAST_TEMPSEG_SIZE, TENANT_ID AS CON_ID FROM SYS.ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS RAW(8)) AS ADDRESS, CAST(NULL AS NUMBER) AS HASH_VALUE, SQL_ID, CAST(NULL AS NUMBER) AS CHILD_NUMBER, CAST(NULL AS RAW(8)) AS WORKAREA_ADDRESS, OPERATION_TYPE, OPERATION_ID, POLICY, ESTIMATED_OPTIMAL_SIZE, ESTIMATED_ONEPASS_SIZE, LAST_MEMORY_USED, LAST_EXECUTION, LAST_DEGREE, TOTAL_EXECUTIONS, OPTIMAL_EXECUTIONS, ONEPASS_EXECUTIONS, multipasses_executions, ACTIVE_TIME, MAX_TEMPSEG_SIZE, LAST_TEMPSEG_SIZE, TENANT_ID AS CON_ID FROM SYS.ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -233,17 +228,16 @@ int ObInnerTableSchema::gv_sql_workarea_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sql_workarea_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sql_workarea_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -274,8 +268,7 @@ int ObInnerTableSchema::v_sql_workarea_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT CAST(NULL AS RAW(8)) AS ADDRESS, CAST(NULL AS NUMBER) AS HASH_VALUE, SQL_ID, CAST(NULL AS NUMBER) AS CHILD_NUMBER, CAST(NULL AS RAW(8)) AS WORKAREA_ADDRESS, OPERATION_TYPE, OPERATION_ID, POLICY, ESTIMATED_OPTIMAL_SIZE, ESTIMATED_ONEPASS_SIZE, LAST_MEMORY_USED, LAST_EXECUTION, LAST_DEGREE, TOTAL_EXECUTIONS, OPTIMAL_EXECUTIONS, ONEPASS_EXECUTIONS, multipasses_executions, ACTIVE_TIME, MAX_TEMPSEG_SIZE, LAST_TEMPSEG_SIZE, TENANT_ID AS CON_ID FROM SYS.ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS RAW(8)) AS ADDRESS, CAST(NULL AS NUMBER) AS HASH_VALUE, SQL_ID, CAST(NULL AS NUMBER) AS CHILD_NUMBER, CAST(NULL AS RAW(8)) AS WORKAREA_ADDRESS, OPERATION_TYPE, OPERATION_ID, POLICY, ESTIMATED_OPTIMAL_SIZE, ESTIMATED_ONEPASS_SIZE, LAST_MEMORY_USED, LAST_EXECUTION, LAST_DEGREE, TOTAL_EXECUTIONS, OPTIMAL_EXECUTIONS, ONEPASS_EXECUTIONS, multipasses_executions, ACTIVE_TIME, MAX_TEMPSEG_SIZE, LAST_TEMPSEG_SIZE, TENANT_ID AS CON_ID FROM SYS.ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') AND SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -287,17 +280,16 @@ int ObInnerTableSchema::v_sql_workarea_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sstable_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sstable_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -328,8 +320,7 @@ int ObInnerTableSchema::gv_sstable_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT M.SVR_IP, M.SVR_PORT, M.TABLE_TYPE, M.TABLE_ID, T.TABLE_NAME, T.TENANT_ID, M.PARTITION_ID, M.INDEX_ID, M.BASE_VERSION, M.MULTI_VERSION_START, M.SNAPSHOT_VERSION, M.START_LOG_ID, M.END_LOG_ID, M.MAX_LOG_ID, M.VERSION, M.LOGICAL_DATA_VERSION, M."SIZE", M.IS_ACTIVE, M.REF, M.WRITE_REF, M.TRX_COUNT, M.PENDING_LOG_PERSISTING_ROW_CNT, M.UPPER_TRANS_VERSION, M.CONTAIN_UNCOMMITTED_ROW FROM SYS.ALL_VIRTUAL_TABLE_MGR_AGENT M JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T ON M.TABLE_ID = T.TABLE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT M.SVR_IP, M.SVR_PORT, M.TABLE_TYPE, M.TABLE_ID, T.TABLE_NAME, T.TENANT_ID, M.PARTITION_ID, M.INDEX_ID, M.BASE_VERSION, M.MULTI_VERSION_START, M.SNAPSHOT_VERSION, M.START_LOG_ID, M.END_LOG_ID, M.MAX_LOG_ID, M.VERSION, M.LOGICAL_DATA_VERSION, M."SIZE", M.IS_ACTIVE, M.REF, M.WRITE_REF, M.TRX_COUNT, M.PENDING_LOG_PERSISTING_ROW_CNT, M.UPPER_TRANS_VERSION, M.CONTAIN_UNCOMMITTED_ROW FROM SYS.ALL_VIRTUAL_TABLE_MGR_AGENT M JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T ON M.TABLE_ID = T.TABLE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() AND T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -341,17 +332,16 @@ int ObInnerTableSchema::gv_sstable_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sstable_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sstable_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -382,8 +372,7 @@ int ObInnerTableSchema::v_sstable_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT M.TABLE_TYPE, M.TABLE_ID, T.TABLE_NAME, T.TENANT_ID, M.PARTITION_ID, M.INDEX_ID, M.BASE_VERSION, M.MULTI_VERSION_START, M.SNAPSHOT_VERSION, M.START_LOG_ID, M.END_LOG_ID, M.MAX_LOG_ID, M.VERSION, M.LOGICAL_DATA_VERSION, M."SIZE", M.IS_ACTIVE, M.REF, M.WRITE_REF, M.TRX_COUNT, M.PENDING_LOG_PERSISTING_ROW_CNT, M.UPPER_TRANS_VERSION, M.CONTAIN_UNCOMMITTED_ROW FROM SYS.ALL_VIRTUAL_TABLE_MGR_AGENT M JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T ON M.TABLE_ID = T.TABLE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE M.SVR_IP=HOST_IP() AND M.SVR_PORT=RPC_PORT() AND T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT M.TABLE_TYPE, M.TABLE_ID, T.TABLE_NAME, T.TENANT_ID, M.PARTITION_ID, M.INDEX_ID, M.BASE_VERSION, M.MULTI_VERSION_START, M.SNAPSHOT_VERSION, M.START_LOG_ID, M.END_LOG_ID, M.MAX_LOG_ID, M.VERSION, M.LOGICAL_DATA_VERSION, M."SIZE", M.IS_ACTIVE, M.REF, M.WRITE_REF, M.TRX_COUNT, M.PENDING_LOG_PERSISTING_ROW_CNT, M.UPPER_TRANS_VERSION, M.CONTAIN_UNCOMMITTED_ROW FROM SYS.ALL_VIRTUAL_TABLE_MGR_AGENT M JOIN SYS.ALL_VIRTUAL_TABLE_REAL_AGENT T ON M.TABLE_ID = T.TABLE_ID AND T.TENANT_ID = EFFECTIVE_TENANT_ID() WHERE M.SVR_IP=HOST_IP() AND M.SVR_PORT=RPC_PORT() AND T.TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -395,17 +384,16 @@ int ObInnerTableSchema::v_sstable_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_server_schema_info_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_server_schema_info_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -436,8 +424,7 @@ int ObInnerTableSchema::gv_server_schema_info_ora_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SVR_IP, SVR_PORT, TENANT_ID, REFRESHED_SCHEMA_VERSION, RECEIVED_SCHEMA_VERSION, SCHEMA_COUNT, SCHEMA_SIZE, MIN_SSTABLE_SCHEMA_VERSION FROM SYS.ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SVR_IP, SVR_PORT, TENANT_ID, REFRESHED_SCHEMA_VERSION, RECEIVED_SCHEMA_VERSION, SCHEMA_COUNT, SCHEMA_SIZE, MIN_SSTABLE_SCHEMA_VERSION FROM SYS.ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT WHERE TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -449,17 +436,16 @@ int ObInnerTableSchema::gv_server_schema_info_ora_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_server_schema_info_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_server_schema_info_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -490,8 +476,7 @@ int ObInnerTableSchema::v_server_schema_info_ora_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TENANT_ID, REFRESHED_SCHEMA_VERSION, RECEIVED_SCHEMA_VERSION, SCHEMA_COUNT, SCHEMA_SIZE, MIN_SSTABLE_SCHEMA_VERSION FROM SYS.ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() AND TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, REFRESHED_SCHEMA_VERSION, RECEIVED_SCHEMA_VERSION, SCHEMA_COUNT, SCHEMA_SIZE, MIN_SSTABLE_SCHEMA_VERSION FROM SYS.ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() AND TENANT_ID = SYS_CONTEXT('USERENV', 'CON_ID') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -503,17 +488,16 @@ int ObInnerTableSchema::v_server_schema_info_ora_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_sql_plan_monitor_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_sql_plan_monitor_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -544,8 +528,7 @@ int ObInnerTableSchema::gv_sql_plan_monitor_ora_schema(ObTableSchema& table_sche table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT TENANT_ID CON_ID, REQUEST_ID, NULL KEY, NULL STATUS, SVR_IP, SVR_PORT, TRACE_ID, FIRST_REFRESH_TIME, LAST_REFRESH_TIME, FIRST_CHANGE_TIME, LAST_CHANGE_TIME, NULL REFRESH_COUNT, NULL SID, THREAD_ID PROCESS_NAME, NULL SQL_ID, NULL SQL_EXEC_START, NULL SQL_EXEC_ID, NULL SQL_PLAN_HASH_VALUE, NULL SQL_CHILD_ADDRESS, NULL PLAN_PARENT_ID, PLAN_LINE_ID, PLAN_OPERATION, NULL PLAN_OPTIONS, NULL PLAN_OBJECT_OWNER, NULL PLAN_OBJECT_NAME, NULL PLAN_OBJECT_TYPE, PLAN_DEPTH, NULL PLAN_POSITION, NULL PLAN_COST, NULL PLAN_CARDINALITY, NULL PLAN_BYTES, NULL PLAN_TIME, NULL PLAN_PARTITION_START, NULL PLAN_PARTITION_STOP, NULL PLAN_CPU_COST, NULL PLAN_IO_COST, NULL PLAN_TEMP_SPACE, STARTS, OUTPUT_ROWS, NULL IO_INTERCONNECT_BYTES, NULL PHYSICAL_READ_REQUESTS, NULL PHYSICAL_READ_BYTES, NULL PHYSICAL_WRITE_REQUESTS, NULL PHYSICAL_WRITE_BYTES, NULL WORKAREA_MEM, NULL WORKAREA_MAX_MEM, NULL WORKAREA_TEMPSEG, NULL WORKAREA_MAX_TEMPSEG, NULL OTHERSTAT_GROUP_ID, OTHERSTAT_1_ID, NULL OTHERSTAT_1_TYPE, OTHERSTAT_1_VALUE, OTHERSTAT_2_ID, NULL OTHERSTAT_2_TYPE, OTHERSTAT_2_VALUE, OTHERSTAT_3_ID, NULL OTHERSTAT_3_TYPE, OTHERSTAT_3_VALUE, OTHERSTAT_4_ID, NULL OTHERSTAT_4_TYPE, OTHERSTAT_4_VALUE, OTHERSTAT_5_ID, NULL OTHERSTAT_5_TYPE, OTHERSTAT_5_VALUE, OTHERSTAT_6_ID, NULL OTHERSTAT_6_TYPE, OTHERSTAT_6_VALUE, OTHERSTAT_7_ID, NULL OTHERSTAT_7_TYPE, OTHERSTAT_7_VALUE, OTHERSTAT_8_ID, NULL OTHERSTAT_8_TYPE, OTHERSTAT_8_VALUE, OTHERSTAT_9_ID, NULL OTHERSTAT_9_TYPE, OTHERSTAT_9_VALUE, OTHERSTAT_10_ID, NULL OTHERSTAT_10_TYPE, OTHERSTAT_10_VALUE, NULL OTHER_XML, NULL PLAN_OPERATION_INACTIVE FROM SYS.ALL_VIRTUAL_SQL_PLAN_MONITOR WHERE (is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) = 1) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT TENANT_ID CON_ID, REQUEST_ID, NULL KEY, NULL STATUS, SVR_IP, SVR_PORT, TRACE_ID, FIRST_REFRESH_TIME, LAST_REFRESH_TIME, FIRST_CHANGE_TIME, LAST_CHANGE_TIME, NULL REFRESH_COUNT, NULL SID, THREAD_ID PROCESS_NAME, NULL SQL_ID, NULL SQL_EXEC_START, NULL SQL_EXEC_ID, NULL SQL_PLAN_HASH_VALUE, NULL SQL_CHILD_ADDRESS, NULL PLAN_PARENT_ID, PLAN_LINE_ID, PLAN_OPERATION, NULL PLAN_OPTIONS, NULL PLAN_OBJECT_OWNER, NULL PLAN_OBJECT_NAME, NULL PLAN_OBJECT_TYPE, PLAN_DEPTH, NULL PLAN_POSITION, NULL PLAN_COST, NULL PLAN_CARDINALITY, NULL PLAN_BYTES, NULL PLAN_TIME, NULL PLAN_PARTITION_START, NULL PLAN_PARTITION_STOP, NULL PLAN_CPU_COST, NULL PLAN_IO_COST, NULL PLAN_TEMP_SPACE, STARTS, OUTPUT_ROWS, NULL IO_INTERCONNECT_BYTES, NULL PHYSICAL_READ_REQUESTS, NULL PHYSICAL_READ_BYTES, NULL PHYSICAL_WRITE_REQUESTS, NULL PHYSICAL_WRITE_BYTES, NULL WORKAREA_MEM, NULL WORKAREA_MAX_MEM, NULL WORKAREA_TEMPSEG, NULL WORKAREA_MAX_TEMPSEG, NULL OTHERSTAT_GROUP_ID, OTHERSTAT_1_ID, NULL OTHERSTAT_1_TYPE, OTHERSTAT_1_VALUE, OTHERSTAT_2_ID, NULL OTHERSTAT_2_TYPE, OTHERSTAT_2_VALUE, OTHERSTAT_3_ID, NULL OTHERSTAT_3_TYPE, OTHERSTAT_3_VALUE, OTHERSTAT_4_ID, NULL OTHERSTAT_4_TYPE, OTHERSTAT_4_VALUE, OTHERSTAT_5_ID, NULL OTHERSTAT_5_TYPE, OTHERSTAT_5_VALUE, OTHERSTAT_6_ID, NULL OTHERSTAT_6_TYPE, OTHERSTAT_6_VALUE, OTHERSTAT_7_ID, NULL OTHERSTAT_7_TYPE, OTHERSTAT_7_VALUE, OTHERSTAT_8_ID, NULL OTHERSTAT_8_TYPE, OTHERSTAT_8_VALUE, OTHERSTAT_9_ID, NULL OTHERSTAT_9_TYPE, OTHERSTAT_9_VALUE, OTHERSTAT_10_ID, NULL OTHERSTAT_10_TYPE, OTHERSTAT_10_VALUE, NULL OTHER_XML, NULL PLAN_OPERATION_INACTIVE FROM SYS.ALL_VIRTUAL_SQL_PLAN_MONITOR WHERE (is_serving_tenant(svr_ip, svr_port, effective_tenant_id()) = 1) and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -557,17 +540,16 @@ int ObInnerTableSchema::gv_sql_plan_monitor_ora_schema(ObTableSchema& table_sche table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sql_plan_monitor_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sql_plan_monitor_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -598,8 +580,7 @@ int ObInnerTableSchema::v_sql_plan_monitor_ora_schema(ObTableSchema& table_schem table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT * from SYS.GV$SQL_PLAN_MONITOR WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_Port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * from SYS.GV$SQL_PLAN_MONITOR WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_Port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -611,17 +592,16 @@ int ObInnerTableSchema::v_sql_plan_monitor_ora_schema(ObTableSchema& table_schem table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_sql_monitor_statname_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_sql_monitor_statname_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -652,8 +632,7 @@ int ObInnerTableSchema::v_sql_monitor_statname_ora_schema(ObTableSchema& table_s table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT NULL CON_ID, ID, GROUP_ID, NAME, DESCRIPTION, 0 TYPE, 0 FLAGS FROM SYS.ALL_VIRTUAL_SQL_MONITOR_STATNAME )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT NULL CON_ID, ID, GROUP_ID, NAME, DESCRIPTION, 0 TYPE, 0 FLAGS FROM SYS.ALL_VIRTUAL_SQL_MONITOR_STATNAME )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -665,17 +644,16 @@ int ObInnerTableSchema::v_sql_monitor_statname_ora_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_lock_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_lock_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -706,8 +684,7 @@ int ObInnerTableSchema::gv_lock_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT DISTINCT A.SVR_IP AS SVR_IP, A.SVR_PORT AS SVR_PORT, A.TABLE_ID AS TABLE_ID, A.ROWKEY AS ADDR, B.ROW_LOCK_ADDR AS KADDR, B.SESSION_ID AS SID, A.TYPE AS TYPE, A.LOCK_MODE AS LMODE, CAST(NULL AS NUMBER) AS REQUEST, A.TIME_AFTER_RECV AS CTIME, A.BLOCK_SESSION_ID AS BLOCK, TRUNC(A.TABLE_ID / POWER(2, 40)) AS CON_ID FROM SYS.ALL_VIRTUAL_LOCK_WAIT_STAT A JOIN SYS.ALL_VIRTUAL_TRANS_LOCK_STAT B ON A.SVR_IP = B.SVR_IP AND A.SVR_PORT = B.SVR_PORT AND A.TABLE_ID = B.TABLE_ID AND SUBSTR(A.ROWKEY, 1, 512) = SUBSTR(B.ROWKEY, 1, 512) WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = 1 OR SYS_CONTEXT('USERENV', 'CON_ID') = TRUNC(A.TABLE_ID / POWER(2, 40))) AND A.SESSION_ID = A.BLOCK_SESSION_ID )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT DISTINCT A.SVR_IP AS SVR_IP, A.SVR_PORT AS SVR_PORT, A.TABLE_ID AS TABLE_ID, A.ROWKEY AS ADDR, B.ROW_LOCK_ADDR AS KADDR, B.SESSION_ID AS SID, A.TYPE AS TYPE, A.LOCK_MODE AS LMODE, CAST(NULL AS NUMBER) AS REQUEST, A.TIME_AFTER_RECV AS CTIME, A.BLOCK_SESSION_ID AS BLOCK, TRUNC(A.TABLE_ID / POWER(2, 40)) AS CON_ID FROM SYS.ALL_VIRTUAL_LOCK_WAIT_STAT A JOIN SYS.ALL_VIRTUAL_TRANS_LOCK_STAT B ON A.SVR_IP = B.SVR_IP AND A.SVR_PORT = B.SVR_PORT AND A.TABLE_ID = B.TABLE_ID AND SUBSTR(A.ROWKEY, 1, 512) = SUBSTR(B.ROWKEY, 1, 512) WHERE (SYS_CONTEXT('USERENV', 'CON_ID') = 1 OR SYS_CONTEXT('USERENV', 'CON_ID') = TRUNC(A.TABLE_ID / POWER(2, 40))) AND A.SESSION_ID = A.BLOCK_SESSION_ID )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -719,17 +696,16 @@ int ObInnerTableSchema::gv_lock_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_lock_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_lock_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -760,8 +736,7 @@ int ObInnerTableSchema::v_lock_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT TABLE_ID, ADDR, KADDR, SID, TYPE, LMODE, REQUEST, CTIME, BLOCK, CON_ID FROM GV$LOCK WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TABLE_ID, ADDR, KADDR, SID, TYPE, LMODE, REQUEST, CTIME, BLOCK, CON_ID FROM GV$LOCK WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -773,17 +748,16 @@ int ObInnerTableSchema::v_lock_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_open_cursor_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_open_cursor_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -814,8 +788,7 @@ int ObInnerTableSchema::gv_open_cursor_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SVR_IP, SVR_PORT, SADDR, SID, USER_NAME, ADDRESS, HASH_VALUE, SQL_ID, SQL_TEXT, CAST(LAST_SQL_ACTIVE_TIME as DATE) LAST_SQL_ACTIVE_TIME, SQL_EXEC_ID FROM SYS.ALL_VIRTUAL_OPEN_CURSOR )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SVR_IP, SVR_PORT, SADDR, SID, USER_NAME, ADDRESS, HASH_VALUE, SQL_ID, SQL_TEXT, CAST(LAST_SQL_ACTIVE_TIME as DATE) LAST_SQL_ACTIVE_TIME, SQL_EXEC_ID FROM SYS.ALL_VIRTUAL_OPEN_CURSOR )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -827,17 +800,16 @@ int ObInnerTableSchema::gv_open_cursor_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_open_cursor_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_open_cursor_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -868,8 +840,7 @@ int ObInnerTableSchema::v_open_cursor_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT SADDR, SID, USER_NAME, ADDRESS, HASH_VALUE, SQL_ID, SQL_TEXT, LAST_SQL_ACTIVE_TIME, SQL_EXEC_ID FROM GV$OPEN_CURSOR WHERE svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SADDR, SID, USER_NAME, ADDRESS, HASH_VALUE, SQL_ID, SQL_TEXT, LAST_SQL_ACTIVE_TIME, SQL_EXEC_ID FROM GV$OPEN_CURSOR WHERE svr_ip = host_ip() AND svr_port = rpc_port() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -881,17 +852,16 @@ int ObInnerTableSchema::v_open_cursor_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_timezone_names_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_timezone_names_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -922,8 +892,7 @@ int ObInnerTableSchema::v_timezone_names_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT NA.NAME AS TZNAME, TR.ABBREVIATION AS TZABBREV, NA.TENANT_ID AS CON_ID FROM SYS.ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_REAL_AGENT NA JOIN SYS.ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT TR ON NA.TIME_ZONE_ID = TR.TIME_ZONE_ID AND NA.TENANT_ID = EFFECTIVE_TENANT_ID() AND TR.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT NA.NAME AS TZNAME, TR.ABBREVIATION AS TZABBREV, NA.TENANT_ID AS CON_ID FROM SYS.ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_REAL_AGENT NA JOIN SYS.ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT TR ON NA.TIME_ZONE_ID = TR.TIME_ZONE_ID AND NA.TENANT_ID = EFFECTIVE_TENANT_ID() AND TR.TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -935,17 +904,16 @@ int ObInnerTableSchema::v_timezone_names_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::gv_global_transaction_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::gv_global_transaction_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -976,8 +944,7 @@ int ObInnerTableSchema::gv_global_transaction_ora_schema(ObTableSchema& table_sc table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT A.FORMAT_ID AS FORMATID, A.SCHEDULER_IP AS SVR_IP, A.SCHEDULER_PORT AS SVR_PORT, RAWTOHEX(A.GTRID) AS GLOBALID, RAWTOHEX(A.BQUAL) AS BRANCHID, B.BRANCHES AS BRANCHES, B.BRANCHES AS REFCOUNT, NVL(C.PREPARECOUNT, 0) AS PREPARECOUNT, 'ACTIVE' AS STATE, 0 AS FLAGS, CASE WHEN bitand(end_flag,65536)=65536 THEN 'LOOSELY COUPLED' ELSE 'TIGHTLY COUPLED' END AS COUPLING, SYS_CONTEXT('USERENV', 'CON_ID') AS CON_ID FROM SYS.ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT A LEFT JOIN (SELECT GTRID, FORMAT_ID, COUNT(BQUAL) AS BRANCHES FROM SYS.ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT GROUP BY GTRID, FORMAT_ID) B ON A.GTRID = B.GTRID AND A.FORMAT_ID = B.FORMAT_ID LEFT JOIN (SELECT GTRID, FORMAT_ID, COUNT(BQUAL) AS PREPARECOUNT FROM SYS.ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT WHERE STATE = 3 GROUP BY GTRID, FORMAT_ID) C ON B.GTRID = C.GTRID AND B.FORMAT_ID = C.FORMAT_ID WHERE A.format_id != -2 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT A.FORMAT_ID AS FORMATID, A.SCHEDULER_IP AS SVR_IP, A.SCHEDULER_PORT AS SVR_PORT, RAWTOHEX(A.GTRID) AS GLOBALID, RAWTOHEX(A.BQUAL) AS BRANCHID, B.BRANCHES AS BRANCHES, B.BRANCHES AS REFCOUNT, NVL(C.PREPARECOUNT, 0) AS PREPARECOUNT, 'ACTIVE' AS STATE, 0 AS FLAGS, CASE WHEN bitand(end_flag,65536)=65536 THEN 'LOOSELY COUPLED' ELSE 'TIGHTLY COUPLED' END AS COUPLING, SYS_CONTEXT('USERENV', 'CON_ID') AS CON_ID FROM SYS.ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT A LEFT JOIN (SELECT GTRID, FORMAT_ID, COUNT(BQUAL) AS BRANCHES FROM SYS.ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT GROUP BY GTRID, FORMAT_ID) B ON A.GTRID = B.GTRID AND A.FORMAT_ID = B.FORMAT_ID LEFT JOIN (SELECT GTRID, FORMAT_ID, COUNT(BQUAL) AS PREPARECOUNT FROM SYS.ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT WHERE STATE = 3 GROUP BY GTRID, FORMAT_ID) C ON B.GTRID = C.GTRID AND B.FORMAT_ID = C.FORMAT_ID WHERE A.format_id != -2 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -989,17 +956,16 @@ int ObInnerTableSchema::gv_global_transaction_ora_schema(ObTableSchema& table_sc table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_global_transaction_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_global_transaction_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1030,8 +996,7 @@ int ObInnerTableSchema::v_global_transaction_ora_schema(ObTableSchema& table_sch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__( SELECT FORMATID, GLOBALID, BRANCHID, BRANCHES, REFCOUNT, PREPARECOUNT, STATE, FLAGS, COUPLING, CON_ID FROM GV$GLOBAL_TRANSACTION WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT FORMATID, GLOBALID, BRANCHID, BRANCHES, REFCOUNT, PREPARECOUNT, STATE, FLAGS, COUPLING, CON_ID FROM GV$GLOBAL_TRANSACTION WHERE SVR_IP = HOST_IP() AND SVR_PORT = RPC_PORT() )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1043,17 +1008,16 @@ int ObInnerTableSchema::v_global_transaction_ora_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_restore_point_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_restore_point_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1084,8 +1048,7 @@ int ObInnerTableSchema::v_restore_point_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT TENANT_ID, SNAPSHOT_TS as SNAPSHOT, GMT_CREATE as TIME, EXTRA_INFO as NAME FROM SYS.ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT WHERE snapshot_type = 3 and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT TENANT_ID, SNAPSHOT_TS as SNAPSHOT, GMT_CREATE as TIME, EXTRA_INFO as NAME FROM SYS.ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT WHERE snapshot_type = 3 and (tenant_id = effective_tenant_id() or effective_tenant_id() = 1) )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1097,17 +1060,16 @@ int ObInnerTableSchema::v_restore_point_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::v_rsrc_plan_ora_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::v_rsrc_plan_ora_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_ORA_SYS_DATABASE_ID)); @@ -1138,8 +1100,7 @@ int ObInnerTableSchema::v_rsrc_plan_ora_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT CAST(NULL as NUMBER) AS ID, B.plan NAME, CAST('TRUE' AS VARCHAR2(5)) AS IS_TOP_PLAN, CAST('ON' AS VARCHAR2(3)) AS CPU_MANAGED, CAST(NULL AS VARCHAR2(3)) AS INSTANCE_CAGING, CAST(NULL AS NUMBER) AS PARALLEL_SERVERS_ACTIVE, CAST(NULL AS NUMBER) AS PARALLEL_SERVERS_TOTAL, CAST(NULL AS VARCHAR2(32)) AS PARALLEL_EXECUTION_MANAGED FROM SYS.tenant_virtual_global_variable A, SYS.DBA_RSRC_PLANS B WHERE A.variable_name = 'resource_manager_plan' AND A.value = B.plan )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(NULL as NUMBER) AS ID, B.plan NAME, CAST('TRUE' AS VARCHAR2(5)) AS IS_TOP_PLAN, CAST('ON' AS VARCHAR2(3)) AS CPU_MANAGED, CAST(NULL AS VARCHAR2(3)) AS INSTANCE_CAGING, CAST(NULL AS NUMBER) AS PARALLEL_SERVERS_ACTIVE, CAST(NULL AS NUMBER) AS PARALLEL_SERVERS_TOTAL, CAST(NULL AS VARCHAR2(32)) AS PARALLEL_EXECUTION_MANAGED FROM SYS.tenant_virtual_global_variable A, SYS.DBA_RSRC_PLANS B WHERE A.variable_name = 'resource_manager_plan' AND A.value = B.plan )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1151,17 +1112,16 @@ int ObInnerTableSchema::v_rsrc_plan_ora_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::triggers_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::triggers_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_INFORMATION_SCHEMA_ID)); @@ -1192,8 +1152,7 @@ int ObInnerTableSchema::triggers_schema(ObTableSchema& table_schema) table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition( - R"__(SELECT CAST(NULL AS CHARACTER(64)) AS TRIGGER_CATALOG, CAST(NULL AS CHARACTER(64)) AS TRIGGER_SCHEMA, CAST(NULL AS CHARACTER(64)) AS TRIGGER_NAME, NULL AS EVENT_MANIPULATION, CAST(NULL AS CHARACTER(64)) AS EVENT_OBJECT_CATALOG, CAST(NULL AS CHARACTER(64)) AS EVENT_OBJECT_SCHEMA, CAST(NULL AS CHARACTER(64)) AS EVENT_OBJECT_TABLE, CAST(NULL AS UNSIGNED) AS ACTION_ORDER, CAST(NULL AS BINARY(0)) AS ACTION_CONDITION, NULL AS ACTION_STATEMENT, CAST(NULL AS CHARACTER(3)) AS ACTION_ORIENTATION, NULL AS ACTION_TIMING, CAST(NULL AS BINARY(0)) AS ACTION_REFERENCE_OLD_TABLE, CAST(NULL AS BINARY(0)) AS ACTION_REFERENCE_NEW_TABLE, CAST(NULL AS CHARACTER(3)) AS ACTION_REFERENCE_OLD_ROW, CAST(NULL AS CHARACTER(3)) AS ACTION_REFERENCE_NEW_ROW, CAST(NULL AS TIME(2)) AS CREATED, NULL AS SQL_MODE, CAST(NULL AS CHARACTER(288)) AS DEFINER, CAST(NULL AS CHARACTER(64)) AS CHARACTER_SET_CLIENT, CAST(NULL AS CHARACTER(64)) AS COLLATION_CONNECTION, CAST(NULL AS CHARACTER(64)) AS DATABASE_COLLATION FROM DUAL WHERE 1 = 0 )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(NULL AS CHARACTER(64)) AS TRIGGER_CATALOG, CAST(NULL AS CHARACTER(64)) AS TRIGGER_SCHEMA, CAST(NULL AS CHARACTER(64)) AS TRIGGER_NAME, NULL AS EVENT_MANIPULATION, CAST(NULL AS CHARACTER(64)) AS EVENT_OBJECT_CATALOG, CAST(NULL AS CHARACTER(64)) AS EVENT_OBJECT_SCHEMA, CAST(NULL AS CHARACTER(64)) AS EVENT_OBJECT_TABLE, CAST(NULL AS UNSIGNED) AS ACTION_ORDER, CAST(NULL AS BINARY(0)) AS ACTION_CONDITION, NULL AS ACTION_STATEMENT, CAST(NULL AS CHARACTER(3)) AS ACTION_ORIENTATION, NULL AS ACTION_TIMING, CAST(NULL AS BINARY(0)) AS ACTION_REFERENCE_OLD_TABLE, CAST(NULL AS BINARY(0)) AS ACTION_REFERENCE_NEW_TABLE, CAST(NULL AS CHARACTER(3)) AS ACTION_REFERENCE_OLD_ROW, CAST(NULL AS CHARACTER(3)) AS ACTION_REFERENCE_NEW_ROW, CAST(NULL AS TIME(2)) AS CREATED, NULL AS SQL_MODE, CAST(NULL AS CHARACTER(288)) AS DEFINER, CAST(NULL AS CHARACTER(64)) AS CHARACTER_SET_CLIENT, CAST(NULL AS CHARACTER(64)) AS COLLATION_CONNECTION, CAST(NULL AS CHARACTER(64)) AS DATABASE_COLLATION FROM DUAL WHERE 1 = 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1205,10 +1164,10 @@ int ObInnerTableSchema::triggers_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.301_350.cpp b/src/share/inner_table/ob_inner_table_schema.301_350.cpp index 7354f9a3e..006be7cfb 100644 --- a/src/share/inner_table/ob_inner_table_schema.301_350.cpp +++ b/src/share/inner_table/ob_inner_table_schema.301_350.cpp @@ -17,17 +17,19 @@ #include "share/schema/ob_schema_service_sql_impl.h" #include "share/schema/ob_table_schema.h" -namespace oceanbase { +namespace oceanbase +{ using namespace share::schema; using namespace common; -namespace share { +namespace share +{ -int ObInnerTableSchema::all_tenant_backup_backupset_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_backup_backupset_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -63,21 +65,21 @@ int ObInnerTableSchema::all_tenant_backup_backupset_task_schema(ObTableSchema& t gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -86,541 +88,541 @@ int ObInnerTableSchema::all_tenant_backup_backupset_task_schema(ObTableSchema& t gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("copy_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("copy_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_type", // 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 - OB_INNER_TABLE_BACKUP_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_type", //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 + OB_INNER_TABLE_BACKUP_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_full_backup_set_id", // 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 + ADD_COLUMN_SCHEMA("prev_full_backup_set_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_inc_backup_set_id", // 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 + ADD_COLUMN_SCHEMA("prev_inc_backup_set_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_backup_data_version", // 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 + ADD_COLUMN_SCHEMA("prev_backup_data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("input_bytes", // 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 + ADD_COLUMN_SCHEMA("input_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("output_bytes", // 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 + ADD_COLUMN_SCHEMA("output_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("end_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("end_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compatible", // 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 + ADD_COLUMN_SCHEMA("compatible", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version", // 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 + ADD_COLUMN_SCHEMA("cluster_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version_display", // 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 - OB_INNER_TABLE_BACKUP_TASK_CLUSTER_FORMAT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_version_display", //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 + OB_INNER_TABLE_BACKUP_TASK_CLUSTER_FORMAT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("src_backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("src_backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dst_backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dst_backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("src_device_type", // 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 - OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("src_device_type", //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 + OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dst_device_type", // 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 - OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dst_device_type", //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 + OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_data_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_data_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_schema_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_schema_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_pg_count", // 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 + ADD_COLUMN_SCHEMA("total_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_pg_count", // 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 + ADD_COLUMN_SCHEMA("finish_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_partition_count", // 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 + ADD_COLUMN_SCHEMA("total_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 + ADD_COLUMN_SCHEMA("finish_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("total_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { ObObj encryption_mode_default; encryption_mode_default.set_varchar(ObString::make_string("None")); - ADD_COLUMN_SCHEMA_T("encryption_mode", // 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 - OB_MAX_ENCRYPTION_MODE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - encryption_mode_default, - encryption_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("encryption_mode", //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 + OB_MAX_ENCRYPTION_MODE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + encryption_mode_default, + encryption_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj passwd_default; passwd_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("passwd", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - passwd_default, - passwd_default); // default_value + ADD_COLUMN_SCHEMA_T("passwd", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + passwd_default, + passwd_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -630,17 +632,16 @@ int ObInnerTableSchema::all_tenant_backup_backupset_task_schema(ObTableSchema& t table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_backup_backupset_task_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_backup_backupset_task_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -676,21 +677,21 @@ int ObInnerTableSchema::all_backup_backupset_task_history_schema(ObTableSchema& gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -699,556 +700,556 @@ int ObInnerTableSchema::all_backup_backupset_task_history_schema(ObTableSchema& gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("copy_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("copy_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_type", // 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 - OB_INNER_TABLE_BACKUP_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_type", //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 + OB_INNER_TABLE_BACKUP_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("snapshot_version", // 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 + ADD_COLUMN_SCHEMA("snapshot_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_full_backup_set_id", // 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 + ADD_COLUMN_SCHEMA("prev_full_backup_set_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_inc_backup_set_id", // 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 + ADD_COLUMN_SCHEMA("prev_inc_backup_set_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("prev_backup_data_version", // 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 + ADD_COLUMN_SCHEMA("prev_backup_data_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("input_bytes", // 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 + ADD_COLUMN_SCHEMA("input_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("output_bytes", // 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 + ADD_COLUMN_SCHEMA("output_bytes", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("start_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("start_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("end_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("end_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("compatible", // 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 + ADD_COLUMN_SCHEMA("compatible", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_id", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_id", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version", // 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 + ADD_COLUMN_SCHEMA("cluster_version", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("cluster_version_display", // 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 - OB_INNER_TABLE_BACKUP_TASK_CLUSTER_FORMAT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("cluster_version_display", //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 + OB_INNER_TABLE_BACKUP_TASK_CLUSTER_FORMAT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("src_backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("src_backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dst_backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dst_backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("src_device_type", // 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 - OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("src_device_type", //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 + OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("dst_device_type", // 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 - OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("dst_device_type", //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 + OB_DEFAULT_OUTPUT_DEVICE_TYPE_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_data_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_data_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_schema_version", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_schema_version", //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 + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_pg_count", // 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 + ADD_COLUMN_SCHEMA("total_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_pg_count", // 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 + ADD_COLUMN_SCHEMA("finish_pg_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_partition_count", // 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 + ADD_COLUMN_SCHEMA("total_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 + ADD_COLUMN_SCHEMA("finish_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("total_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { ObObj encryption_mode_default; encryption_mode_default.set_varchar(ObString::make_string("None")); - ADD_COLUMN_SCHEMA_T("encryption_mode", // 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 - OB_MAX_ENCRYPTION_MODE_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - encryption_mode_default, - encryption_mode_default); // default_value + ADD_COLUMN_SCHEMA_T("encryption_mode", //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 + OB_MAX_ENCRYPTION_MODE_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + encryption_mode_default, + encryption_mode_default); //default_value } if (OB_SUCC(ret)) { ObObj passwd_default; passwd_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("passwd", // 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 - OB_MAX_PASSWORD_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - passwd_default, - passwd_default); // default_value + ADD_COLUMN_SCHEMA_T("passwd", //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 + OB_MAX_PASSWORD_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + passwd_default, + passwd_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_mark_deleted", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_mark_deleted", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //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(FLAT_ROW_STORE); @@ -1258,17 +1259,16 @@ int ObInnerTableSchema::all_backup_backupset_task_history_schema(ObTableSchema& table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_pg_backup_backupset_task_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_pg_backup_backupset_task_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1304,21 +1304,21 @@ int ObInnerTableSchema::all_tenant_pg_backup_backupset_task_schema(ObTableSchema gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -1327,276 +1327,276 @@ int ObInnerTableSchema::all_tenant_pg_backup_backupset_task_schema(ObTableSchema gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("job_id", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("job_id", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_set_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("backup_set_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("copy_id", // column_name - ++column_id, // column_id - 5, // 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 + ADD_COLUMN_SCHEMA("copy_id", //column_name + ++column_id, //column_id + 5, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - ++column_id, // column_id - 6, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + ++column_id, //column_id + 6, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("partition_id", // column_name - ++column_id, // column_id - 7, // 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 + ADD_COLUMN_SCHEMA("partition_id", //column_name + ++column_id, //column_id + 7, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("trace_id", // 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 - OB_MAX_TRACE_ID_BUFFER_SIZE, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("trace_id", //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 + OB_MAX_TRACE_ID_BUFFER_SIZE, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_ip", // 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 - OB_MAX_SERVER_ADDR_SIZE, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("svr_ip", //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 + OB_MAX_SERVER_ADDR_SIZE, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("svr_port", // 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 + ADD_COLUMN_SCHEMA("svr_port", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_partition_count", // 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 + ADD_COLUMN_SCHEMA("total_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_partition_count", // 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 + ADD_COLUMN_SCHEMA("finish_partition_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("total_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("total_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("finish_macro_block_count", // 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 + ADD_COLUMN_SCHEMA("finish_macro_block_count", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("result", // 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 + ADD_COLUMN_SCHEMA("result", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comment", // 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 - MAX_TABLE_COMMENT_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comment", //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 + MAX_TABLE_COMMENT_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1606,17 +1606,16 @@ int ObInnerTableSchema::all_tenant_pg_backup_backupset_task_schema(ObTableSchema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_tenant_backup_backup_log_archive_status_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_tenant_backup_backup_log_archive_status_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1652,21 +1651,21 @@ int ObInnerTableSchema::all_tenant_backup_backup_log_archive_status_schema(ObTab gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -1675,227 +1674,227 @@ int ObInnerTableSchema::all_tenant_backup_backup_log_archive_status_schema(ObTab gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_archive_round", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("log_archive_round", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("copy_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("copy_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("min_first_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("min_first_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("max_next_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("max_next_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj input_bytes_default; input_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("input_bytes", // 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 - input_bytes_default, - input_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("input_bytes", //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 + input_bytes_default, + input_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj output_bytes_default; output_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("output_bytes", // 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 - output_bytes_default, - output_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("output_bytes", //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 + output_bytes_default, + output_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj deleted_input_bytes_default; deleted_input_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("deleted_input_bytes", // 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 - deleted_input_bytes_default, - deleted_input_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("deleted_input_bytes", //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 + deleted_input_bytes_default, + deleted_input_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj deleted_output_bytes_default; deleted_output_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("deleted_output_bytes", // 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 - deleted_output_bytes_default, - deleted_output_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("deleted_output_bytes", //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 + deleted_output_bytes_default, + deleted_output_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj pg_count_default; pg_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("pg_count", // 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 - pg_count_default, - pg_count_default); // default_value + ADD_COLUMN_SCHEMA_T("pg_count", //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 + pg_count_default, + pg_count_default); //default_value } if (OB_SUCC(ret)) { ObObj status_default; status_default.set_varchar(ObString::make_string("")); - ADD_COLUMN_SCHEMA_T("status", // 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 - OB_DEFAULT_STATUS_LENTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - status_default, - status_default); // default_value + ADD_COLUMN_SCHEMA_T("status", //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 + OB_DEFAULT_STATUS_LENTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + status_default, + status_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -1905,17 +1904,16 @@ int ObInnerTableSchema::all_tenant_backup_backup_log_archive_status_schema(ObTab table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_backup_backup_log_archive_status_history_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_backup_backup_log_archive_status_history_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -1951,21 +1949,21 @@ int ObInnerTableSchema::all_backup_backup_log_archive_status_history_schema(ObTa gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -1974,238 +1972,238 @@ int ObInnerTableSchema::all_backup_backup_log_archive_status_history_schema(ObTa gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("incarnation", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("incarnation", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("log_archive_round", // column_name - ++column_id, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("log_archive_round", //column_name + ++column_id, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("copy_id", // column_name - ++column_id, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("copy_id", //column_name + ++column_id, //column_id + 4, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("min_first_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("min_first_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA_TS("max_next_time", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_INVALID, // column_collation_type - sizeof(ObPreciseDateTime), // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false, // is_autoincrement - false); // is_on_update_for_timestamp + ADD_COLUMN_SCHEMA_TS("max_next_time", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_INVALID, //column_collation_type + sizeof(ObPreciseDateTime), //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false, //is_autoincrement + false); //is_on_update_for_timestamp } if (OB_SUCC(ret)) { ObObj input_bytes_default; input_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("input_bytes", // 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 - input_bytes_default, - input_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("input_bytes", //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 + input_bytes_default, + input_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj output_bytes_default; output_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("output_bytes", // 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 - output_bytes_default, - output_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("output_bytes", //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 + output_bytes_default, + output_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj deleted_input_bytes_default; deleted_input_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("deleted_input_bytes", // 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 - deleted_input_bytes_default, - deleted_input_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("deleted_input_bytes", //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 + deleted_input_bytes_default, + deleted_input_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj deleted_output_bytes_default; deleted_output_bytes_default.set_int(0); - ADD_COLUMN_SCHEMA_T("deleted_output_bytes", // 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 - deleted_output_bytes_default, - deleted_output_bytes_default); // default_value + ADD_COLUMN_SCHEMA_T("deleted_output_bytes", //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 + deleted_output_bytes_default, + deleted_output_bytes_default); //default_value } if (OB_SUCC(ret)) { ObObj pg_count_default; pg_count_default.set_int(0); - ADD_COLUMN_SCHEMA_T("pg_count", // 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 - pg_count_default, - pg_count_default); // default_value + ADD_COLUMN_SCHEMA_T("pg_count", //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 + pg_count_default, + pg_count_default); //default_value } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("backup_dest", // 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 - OB_MAX_BACKUP_DEST_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("backup_dest", //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 + OB_MAX_BACKUP_DEST_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("is_mark_deleted", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTinyIntType, // column_type - CS_TYPE_INVALID, // column_collation_type - 1, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("is_mark_deleted", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTinyIntType, //column_type + CS_TYPE_INVALID, //column_collation_type + 1, //column_length + -1, //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(FLAT_ROW_STORE); @@ -2215,17 +2213,16 @@ int ObInnerTableSchema::all_backup_backup_log_archive_status_history_schema(ObTa table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_res_mgr_plan_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_res_mgr_plan_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2261,21 +2258,21 @@ int ObInnerTableSchema::all_res_mgr_plan_schema(ObTableSchema& table_schema) gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2284,66 +2281,66 @@ int ObInnerTableSchema::all_res_mgr_plan_schema(ObTableSchema& table_schema) gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan", // column_name - ++column_id, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("plan", //column_name + ++column_id, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comments", // 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 - 2000, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comments", //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 + 2000, //column_length + -1, //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(FLAT_ROW_STORE); @@ -2353,17 +2350,16 @@ int ObInnerTableSchema::all_res_mgr_plan_schema(ObTableSchema& table_schema) table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_res_mgr_directive_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_res_mgr_directive_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2399,21 +2395,21 @@ int ObInnerTableSchema::all_res_mgr_directive_schema(ObTableSchema& table_schema gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2422,119 +2418,119 @@ int ObInnerTableSchema::all_res_mgr_directive_schema(ObTableSchema& table_schema gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("plan", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_RESOURCE_PLAN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("plan", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_RESOURCE_PLAN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("group_or_subplan", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_RESOURCE_PLAN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("group_or_subplan", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_RESOURCE_PLAN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comments", // 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 - 2000, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comments", //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 + 2000, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { ObObj mgmt_p1_default; mgmt_p1_default.set_int(100); - ADD_COLUMN_SCHEMA_T("mgmt_p1", // 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 - mgmt_p1_default, - mgmt_p1_default); // default_value + ADD_COLUMN_SCHEMA_T("mgmt_p1", //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 + mgmt_p1_default, + mgmt_p1_default); //default_value } if (OB_SUCC(ret)) { ObObj utilization_limit_default; utilization_limit_default.set_int(100); - ADD_COLUMN_SCHEMA_T("utilization_limit", // 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 - utilization_limit_default, - utilization_limit_default); // default_value + ADD_COLUMN_SCHEMA_T("utilization_limit", //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 + utilization_limit_default, + utilization_limit_default); //default_value } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2544,17 +2540,16 @@ int ObInnerTableSchema::all_res_mgr_directive_schema(ObTableSchema& table_schema table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_res_mgr_mapping_rule_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_res_mgr_mapping_rule_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2590,21 +2585,21 @@ int ObInnerTableSchema::all_res_mgr_mapping_rule_schema(ObTableSchema& table_sch gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2613,96 +2608,96 @@ int ObInnerTableSchema::all_res_mgr_mapping_rule_schema(ObTableSchema& table_sch gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("attribute", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_RESOURCE_PLAN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("attribute", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_RESOURCE_PLAN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("value", // column_name - ++column_id, // column_id - 3, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_BINARY, // column_collation_type - OB_MAX_RESOURCE_PLAN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("value", //column_name + ++column_id, //column_id + 3, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_BINARY, //column_collation_type + OB_MAX_RESOURCE_PLAN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("consumer_group", // 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 - OB_MAX_RESOURCE_PLAN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("consumer_group", //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 + OB_MAX_RESOURCE_PLAN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + true, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("status", // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("status", //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 + true, //is_nullable + false); //is_autoincrement } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2712,17 +2707,16 @@ int ObInnerTableSchema::all_res_mgr_mapping_rule_schema(ObTableSchema& table_sch table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_res_mgr_consumer_group_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_res_mgr_consumer_group_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2758,21 +2752,21 @@ int ObInnerTableSchema::all_res_mgr_consumer_group_schema(ObTableSchema& table_s gmt_create_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_create_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_create", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - false, // is_on_update_for_timestamp - gmt_create_default_null, - gmt_create_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_create", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + false, //is_on_update_for_timestamp + gmt_create_default_null, + gmt_create_default) } if (OB_SUCC(ret)) { @@ -2781,81 +2775,81 @@ int ObInnerTableSchema::all_res_mgr_consumer_group_schema(ObTableSchema& table_s gmt_modified_default.set_ext(ObActionFlag::OP_DEFAULT_NOW_FLAG); gmt_modified_default_null.set_null(); - ADD_COLUMN_SCHEMA_TS_T("gmt_modified", // column_name - ++column_id, // column_id - 0, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObTimestampType, // column_type - CS_TYPE_BINARY, // collation_type - 0, // column length - -1, // column_precision - 6, // column_scale - true, // is nullable - false, // is_autoincrement - true, // is_on_update_for_timestamp - gmt_modified_default_null, - gmt_modified_default) + ADD_COLUMN_SCHEMA_TS_T("gmt_modified", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObTimestampType, //column_type + CS_TYPE_BINARY,//collation_type + 0, //column length + -1, //column_precision + 6, //column_scale + true,//is nullable + false, //is_autoincrement + true, //is_on_update_for_timestamp + gmt_modified_default_null, + gmt_modified_default) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - ++column_id, // column_id - 1, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + ++column_id, //column_id + 1, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("consumer_group", // column_name - ++column_id, // column_id - 2, // rowkey_id - 0, // index_id - 0, // part_key_pos - ObVarcharType, // column_type - CS_TYPE_INVALID, // column_collation_type - OB_MAX_RESOURCE_PLAN_NAME_LENGTH, // column_length - -1, // column_precision - -1, // column_scale - false, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("consumer_group", //column_name + ++column_id, //column_id + 2, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_INVALID, //column_collation_type + OB_MAX_RESOURCE_PLAN_NAME_LENGTH, //column_length + -1, //column_precision + -1, //column_scale + false, //is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("consumer_group_id", // 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 + ADD_COLUMN_SCHEMA("consumer_group_id", //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("comments", // 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 - 2000, // column_length - -1, // column_precision - -1, // column_scale - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("comments", //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 + 2000, //column_length + -1, //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(FLAT_ROW_STORE); @@ -2865,17 +2859,16 @@ int ObInnerTableSchema::all_res_mgr_consumer_group_schema(ObTableSchema& table_s table_schema.set_max_used_column_id(column_id); table_schema.get_part_option().set_max_used_part_id(table_schema.get_part_option().get_part_num() - 1); - table_schema.get_part_option().set_partition_cnt_within_partition_table( - OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); + table_schema.get_part_option().set_partition_cnt_within_partition_table(OB_ALL_CORE_TABLE_TID == common::extract_pure_id(table_schema.get_table_id()) ? 1 : 0); return ret; } -int ObInnerTableSchema::all_table_v2_history_idx_data_table_id_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_table_v2_history_idx_data_table_id_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -2906,11 +2899,11 @@ int ObInnerTableSchema::all_table_v2_history_idx_data_table_id_schema(ObTableSch table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ++column_id; // for gmt_create + ++column_id; // for gmt_create } if (OB_SUCC(ret)) { - ++column_id; // for gmt_modified + ++column_id; // for gmt_modified } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -2919,63 +2912,63 @@ int ObInnerTableSchema::all_table_v2_history_idx_data_table_id_schema(ObTableSch table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_table_id", // column_name - column_id + 24, // column_id - 1, // rowkey_id - 1, // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_table_id", //column_name + column_id + 24, //column_id + 1, //rowkey_id + 1, //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 + true,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - column_id + 1, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + column_id + 1, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - column_id + 2, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + column_id + 2, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - column_id + 3, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + column_id + 3, //column_id + 4, //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 } table_schema.set_index_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -2985,12 +2978,12 @@ int ObInnerTableSchema::all_table_v2_history_idx_data_table_id_schema(ObTableSch return ret; } -int ObInnerTableSchema::all_table_history_idx_data_table_id_schema(ObTableSchema& table_schema) +int ObInnerTableSchema::all_table_history_idx_data_table_id_schema(ObTableSchema &table_schema) { int ret = OB_SUCCESS; uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1; - // generated fields: + //generated fields: table_schema.set_tenant_id(OB_SYS_TENANT_ID); table_schema.set_tablegroup_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_TABLEGROUP_ID)); table_schema.set_database_id(combine_id(OB_SYS_TENANT_ID, OB_SYS_DATABASE_ID)); @@ -3021,11 +3014,11 @@ int ObInnerTableSchema::all_table_history_idx_data_table_id_schema(ObTableSchema table_schema.set_create_mem_version(1); if (OB_SUCC(ret)) { - ++column_id; // for gmt_create + ++column_id; // for gmt_create } if (OB_SUCC(ret)) { - ++column_id; // for gmt_modified + ++column_id; // for gmt_modified } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(FLAT_ROW_STORE); @@ -3034,63 +3027,63 @@ int ObInnerTableSchema::all_table_history_idx_data_table_id_schema(ObTableSchema table_schema.set_storage_format_version(3); if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_table_id", // column_name - column_id + 24, // column_id - 1, // rowkey_id - 1, // 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 - true, // is_nullable - false); // is_autoincrement + ADD_COLUMN_SCHEMA("data_table_id", //column_name + column_id + 24, //column_id + 1, //rowkey_id + 1, //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 + true,//is_nullable + false); //is_autoincrement } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("tenant_id", // column_name - column_id + 1, // column_id - 2, // 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 + ADD_COLUMN_SCHEMA("tenant_id", //column_name + column_id + 1, //column_id + 2, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("table_id", // column_name - column_id + 2, // column_id - 3, // 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 + ADD_COLUMN_SCHEMA("table_id", //column_name + column_id + 2, //column_id + 3, //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 } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("schema_version", // column_name - column_id + 3, // column_id - 4, // 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 + ADD_COLUMN_SCHEMA("schema_version", //column_name + column_id + 3, //column_id + 4, //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 } table_schema.set_index_status(INDEX_STATUS_AVAILABLE); table_schema.set_index_type(INDEX_TYPE_NORMAL_LOCAL); @@ -3100,5 +3093,6 @@ int ObInnerTableSchema::all_table_history_idx_data_table_id_schema(ObTableSchema return ret; } -} // end namespace share -} // end namespace oceanbase + +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema.h b/src/share/inner_table/ob_inner_table_schema.h index 13967c1aa..a09b3fe23 100644 --- a/src/share/inner_table/ob_inner_table_schema.h +++ b/src/share/inner_table/ob_inner_table_schema.h @@ -17,14 +17,18 @@ #include "ob_inner_table_schema_constants.h" #include "share/ob_cluster_version.h" -namespace oceanbase { -namespace share { -namespace schema { +namespace oceanbase +{ +namespace share +{ +namespace schema +{ class ObTableSchema; } -} // namespace share +} -namespace share { +namespace share +{ struct TENANT_VIRTUAL_INTERM_RESULT_CDE { enum { @@ -44,6 +48,7 @@ struct TENANT_VIRTUAL_INTERM_RESULT_CDE { }; }; + struct ALL_VIRTUAL_PLAN_STAT_CDE { enum { TENANT_ID = common::OB_APP_MIN_COLUMN_ID, @@ -114,6 +119,7 @@ struct ALL_VIRTUAL_PLAN_STAT_CDE { }; }; + struct ALL_VIRTUAL_TENANT_PARAMETER_STAT_CDE { enum { ZONE = common::OB_APP_MIN_COLUMN_ID, @@ -131,10 +137,20 @@ struct ALL_VIRTUAL_TENANT_PARAMETER_STAT_CDE { }; }; + struct ALL_VIRTUAL_PS_STAT_CDE { - enum { TENANT_ID = common::OB_APP_MIN_COLUMN_ID, SVR_IP, SVR_PORT, STMT_COUNT, HIT_COUNT, ACCESS_COUNT, MEM_HOLD }; + enum { + TENANT_ID = common::OB_APP_MIN_COLUMN_ID, + SVR_IP, + SVR_PORT, + STMT_COUNT, + HIT_COUNT, + ACCESS_COUNT, + MEM_HOLD + }; }; + struct ALL_VIRTUAL_PS_ITEM_INFO_CDE { enum { TENANT_ID = common::OB_APP_MIN_COLUMN_ID, @@ -153,6 +169,7 @@ struct ALL_VIRTUAL_PS_ITEM_INFO_CDE { }; }; + struct ALL_VIRTUAL_PLAN_STAT_ORA_CDE { enum { TENANT_ID = common::OB_APP_MIN_COLUMN_ID, @@ -223,10 +240,20 @@ struct ALL_VIRTUAL_PLAN_STAT_ORA_CDE { }; }; + struct ALL_VIRTUAL_PS_STAT_ORA_CDE { - enum { TENANT_ID = common::OB_APP_MIN_COLUMN_ID, SVR_IP, SVR_PORT, STMT_COUNT, HIT_COUNT, ACCESS_COUNT, MEM_HOLD }; + enum { + TENANT_ID = common::OB_APP_MIN_COLUMN_ID, + SVR_IP, + SVR_PORT, + STMT_COUNT, + HIT_COUNT, + ACCESS_COUNT, + MEM_HOLD + }; }; + struct ALL_VIRTUAL_PS_ITEM_INFO_ORA_CDE { enum { TENANT_ID = common::OB_APP_MIN_COLUMN_ID, @@ -245,6 +272,7 @@ struct ALL_VIRTUAL_PS_ITEM_INFO_ORA_CDE { }; }; + struct ALL_VIRTUAL_TENANT_PARAMETER_STAT_ORA_CDE { enum { ZONE = common::OB_APP_MIN_COLUMN_ID, @@ -262,3644 +290,3627 @@ struct ALL_VIRTUAL_TENANT_PARAMETER_STAT_ORA_CDE { }; }; -class ObInnerTableSchema { +class ObInnerTableSchema +{ public: - static int all_core_table_schema(share::schema::ObTableSchema& table_schema); - static int all_root_table_schema(share::schema::ObTableSchema& table_schema); - static int all_table_schema(share::schema::ObTableSchema& table_schema); - static int all_column_schema(share::schema::ObTableSchema& table_schema); - static int all_ddl_operation_schema(share::schema::ObTableSchema& table_schema); - static int all_table_v2_schema(share::schema::ObTableSchema& table_schema); - static int all_meta_table_schema(share::schema::ObTableSchema& table_schema); - static int all_user_schema(share::schema::ObTableSchema& table_schema); - static int all_user_history_schema(share::schema::ObTableSchema& table_schema); - static int all_database_schema(share::schema::ObTableSchema& table_schema); - static int all_database_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tablegroup_schema(share::schema::ObTableSchema& table_schema); - static int all_tablegroup_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_history_schema(share::schema::ObTableSchema& table_schema); - static int all_table_privilege_schema(share::schema::ObTableSchema& table_schema); - static int all_table_privilege_history_schema(share::schema::ObTableSchema& table_schema); - static int all_database_privilege_schema(share::schema::ObTableSchema& table_schema); - static int all_database_privilege_history_schema(share::schema::ObTableSchema& table_schema); - static int all_table_history_schema(share::schema::ObTableSchema& table_schema); - static int all_column_history_schema(share::schema::ObTableSchema& table_schema); - static int all_zone_schema(share::schema::ObTableSchema& table_schema); - static int all_server_schema(share::schema::ObTableSchema& table_schema); - static int all_sys_parameter_schema(share::schema::ObTableSchema& table_schema); - static int tenant_parameter_schema(share::schema::ObTableSchema& table_schema); - static int all_sys_variable_schema(share::schema::ObTableSchema& table_schema); - static int all_sys_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_column_statistic_schema(share::schema::ObTableSchema& table_schema); - static int all_unit_schema(share::schema::ObTableSchema& table_schema); - static int all_unit_config_schema(share::schema::ObTableSchema& table_schema); - static int all_resource_pool_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_resource_usage_schema(share::schema::ObTableSchema& table_schema); - static int all_sequence_schema(share::schema::ObTableSchema& table_schema); - static int all_charset_schema(share::schema::ObTableSchema& table_schema); - static int all_collation_schema(share::schema::ObTableSchema& table_schema); - static int all_local_index_status_schema(share::schema::ObTableSchema& table_schema); - static int all_dummy_schema(share::schema::ObTableSchema& table_schema); - static int all_frozen_map_schema(share::schema::ObTableSchema& table_schema); - static int all_clog_history_info_schema(share::schema::ObTableSchema& table_schema); - static int all_clog_history_info_v2_schema(share::schema::ObTableSchema& table_schema); - static int all_rootservice_event_history_schema(share::schema::ObTableSchema& table_schema); - static int all_privilege_schema(share::schema::ObTableSchema& table_schema); - static int all_outline_schema(share::schema::ObTableSchema& table_schema); - static int all_outline_history_schema(share::schema::ObTableSchema& table_schema); - static int all_election_event_history_schema(share::schema::ObTableSchema& table_schema); - static int all_recyclebin_schema(share::schema::ObTableSchema& table_schema); - static int all_part_schema(share::schema::ObTableSchema& table_schema); - static int all_part_history_schema(share::schema::ObTableSchema& table_schema); - static int all_sub_part_schema(share::schema::ObTableSchema& table_schema); - static int all_sub_part_history_schema(share::schema::ObTableSchema& table_schema); - static int all_part_info_schema(share::schema::ObTableSchema& table_schema); - static int all_part_info_history_schema(share::schema::ObTableSchema& table_schema); - static int all_def_sub_part_schema(share::schema::ObTableSchema& table_schema); - static int all_def_sub_part_history_schema(share::schema::ObTableSchema& table_schema); - static int all_server_event_history_schema(share::schema::ObTableSchema& table_schema); - static int all_rootservice_job_schema(share::schema::ObTableSchema& table_schema); - static int all_unit_load_history_schema(share::schema::ObTableSchema& table_schema); - static int all_sys_variable_history_schema(share::schema::ObTableSchema& table_schema); - static int all_restore_job_schema(share::schema::ObTableSchema& table_schema); - static int all_restore_task_schema(share::schema::ObTableSchema& table_schema); - static int all_restore_job_history_schema(share::schema::ObTableSchema& table_schema); - static int all_time_zone_schema(share::schema::ObTableSchema& table_schema); - static int all_time_zone_name_schema(share::schema::ObTableSchema& table_schema); - static int all_time_zone_transition_schema(share::schema::ObTableSchema& table_schema); - static int all_time_zone_transition_type_schema(share::schema::ObTableSchema& table_schema); - static int all_ddl_id_schema(share::schema::ObTableSchema& table_schema); - static int all_foreign_key_schema(share::schema::ObTableSchema& table_schema); - static int all_foreign_key_history_schema(share::schema::ObTableSchema& table_schema); - static int all_foreign_key_column_schema(share::schema::ObTableSchema& table_schema); - static int all_foreign_key_column_history_schema(share::schema::ObTableSchema& table_schema); - static int all_synonym_schema(share::schema::ObTableSchema& table_schema); - static int all_synonym_history_schema(share::schema::ObTableSchema& table_schema); - static int all_sequence_v2_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_meta_table_schema(share::schema::ObTableSchema& table_schema); - static int all_index_wait_transaction_status_schema(share::schema::ObTableSchema& table_schema); - static int all_index_schedule_task_schema(share::schema::ObTableSchema& table_schema); - static int all_index_checksum_schema(share::schema::ObTableSchema& table_schema); - static int all_routine_schema(share::schema::ObTableSchema& table_schema); - static int all_routine_history_schema(share::schema::ObTableSchema& table_schema); - static int all_routine_param_schema(share::schema::ObTableSchema& table_schema); - static int all_routine_param_history_schema(share::schema::ObTableSchema& table_schema); - static int all_table_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_column_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_histogram_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_package_schema(share::schema::ObTableSchema& table_schema); - static int all_package_history_schema(share::schema::ObTableSchema& table_schema); - static int all_sql_execute_task_schema(share::schema::ObTableSchema& table_schema); - static int all_index_build_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_build_index_param_schema(share::schema::ObTableSchema& table_schema); - static int all_global_index_data_src_schema(share::schema::ObTableSchema& table_schema); - static int all_acquired_snapshot_schema(share::schema::ObTableSchema& table_schema); - static int all_immediate_effect_index_sstable_schema(share::schema::ObTableSchema& table_schema); - static int all_sstable_checksum_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_gc_partition_info_schema(share::schema::ObTableSchema& table_schema); - static int all_constraint_schema(share::schema::ObTableSchema& table_schema); - static int all_constraint_history_schema(share::schema::ObTableSchema& table_schema); - static int all_ori_schema_version_schema(share::schema::ObTableSchema& table_schema); - static int all_func_schema(share::schema::ObTableSchema& table_schema); - static int all_func_history_schema(share::schema::ObTableSchema& table_schema); - static int all_temp_table_schema(share::schema::ObTableSchema& table_schema); - static int all_sstable_column_checksum_schema(share::schema::ObTableSchema& table_schema); - static int all_sequence_object_schema(share::schema::ObTableSchema& table_schema); - static int all_sequence_object_history_schema(share::schema::ObTableSchema& table_schema); - static int all_sequence_value_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_plan_baseline_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_plan_baseline_history_schema(share::schema::ObTableSchema& table_schema); - static int all_ddl_helper_schema(share::schema::ObTableSchema& table_schema); - static int all_freeze_schema_version_schema(share::schema::ObTableSchema& table_schema); - static int all_type_schema(share::schema::ObTableSchema& table_schema); - static int all_type_history_schema(share::schema::ObTableSchema& table_schema); - static int all_type_attr_schema(share::schema::ObTableSchema& table_schema); - static int all_type_attr_history_schema(share::schema::ObTableSchema& table_schema); - static int all_coll_type_schema(share::schema::ObTableSchema& table_schema); - static int all_coll_type_history_schema(share::schema::ObTableSchema& table_schema); - static int all_weak_read_service_schema(share::schema::ObTableSchema& table_schema); - static int all_gts_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_gts_schema(share::schema::ObTableSchema& table_schema); - static int all_partition_member_list_schema(share::schema::ObTableSchema& table_schema); - static int all_dblink_schema(share::schema::ObTableSchema& table_schema); - static int all_dblink_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_partition_meta_table_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_role_grantee_map_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_role_grantee_map_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_keystore_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_keystore_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_tablespace_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_tablespace_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_user_failed_login_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_profile_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_profile_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_security_audit_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_security_audit_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_trigger_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_trigger_history_schema(share::schema::ObTableSchema& table_schema); - static int all_seed_parameter_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_sstable_column_checksum_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_security_audit_record_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_sysauth_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_sysauth_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_objauth_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_objauth_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_backup_info_schema(share::schema::ObTableSchema& table_schema); - static int all_restore_info_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_backup_log_archive_status_schema(share::schema::ObTableSchema& table_schema); - static int all_backup_log_archive_status_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_backup_task_schema(share::schema::ObTableSchema& table_schema); - static int all_backup_task_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_pg_backup_task_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_error_schema(share::schema::ObTableSchema& table_schema); - static int all_server_recovery_status_schema(share::schema::ObTableSchema& table_schema); - static int all_datafile_recovery_status_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_backup_clean_info_schema(share::schema::ObTableSchema& table_schema); - static int all_backup_clean_info_history_schema(share::schema::ObTableSchema& table_schema); - static int all_backup_task_clean_history_schema(share::schema::ObTableSchema& table_schema); - static int all_restore_progress_schema(share::schema::ObTableSchema& table_schema); - static int all_restore_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_restore_pg_info_schema(share::schema::ObTableSchema& table_schema); - static int all_table_v2_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_object_type_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_object_type_history_schema(share::schema::ObTableSchema& table_schema); - static int all_backup_validation_job_schema(share::schema::ObTableSchema& table_schema); - static int all_backup_validation_job_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_backup_validation_task_schema(share::schema::ObTableSchema& table_schema); - static int all_backup_validation_task_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_pg_backup_validation_task_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_time_zone_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_time_zone_name_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_time_zone_transition_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_time_zone_transition_type_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_constraint_column_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_constraint_column_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_global_transaction_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_dependency_schema(share::schema::ObTableSchema& table_schema); - static int all_backup_backupset_job_schema(share::schema::ObTableSchema& table_schema); - static int all_backup_backupset_job_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_backup_backupset_task_schema(share::schema::ObTableSchema& table_schema); - static int all_backup_backupset_task_history_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_pg_backup_backupset_task_schema(share::schema::ObTableSchema& table_schema); - static int all_tenant_backup_backup_log_archive_status_schema(share::schema::ObTableSchema& table_schema); - static int all_backup_backup_log_archive_status_history_schema(share::schema::ObTableSchema& table_schema); - static int all_res_mgr_plan_schema(share::schema::ObTableSchema& table_schema); - static int all_res_mgr_directive_schema(share::schema::ObTableSchema& table_schema); - static int all_res_mgr_mapping_rule_schema(share::schema::ObTableSchema& table_schema); - static int all_res_mgr_consumer_group_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_all_table_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_table_column_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_table_index_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_show_create_database_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_show_create_table_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_session_variable_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_privilege_grant_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_processlist_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_warning_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_current_tenant_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_database_status_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_tenant_status_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_interm_result_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_partition_stat_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_statname_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_event_name_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_global_variable_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_show_tables_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_show_create_procedure_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_core_meta_table_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_zone_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_plan_cache_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_plan_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_mem_leak_checker_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_latch_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_kvcache_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_data_type_class_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_data_type_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_server_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_rebalance_task_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_session_event_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_session_wait_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_session_wait_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_system_event_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_memstore_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_concurrency_object_pool_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sesstat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sysstat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_storage_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_disk_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_memstore_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_partition_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_upgrade_inspection_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_trans_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_trans_mgr_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_election_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_election_mem_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_audit_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_trans_mem_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_partition_sstable_image_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_core_root_table_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_core_all_table_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_core_column_table_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_memory_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sys_parameter_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_partition_replay_status_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_clog_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_trace_log_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_engine_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_proxy_server_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_proxy_sys_variable_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_proxy_schema_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_plan_cache_plan_explain_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_obrpc_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_partition_sstable_merge_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_monitor_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_outline_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_concurrent_limit_sql_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_plan_statistics_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_partition_sstable_macro_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_proxy_partition_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_proxy_partition_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_proxy_sub_partition_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_proxy_route_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_rebalance_tenant_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_rebalance_unit_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_rebalance_replica_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_partition_amplification_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_election_event_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_partition_store_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_leader_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_partition_migration_status_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sys_task_status_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_macro_block_marker_status_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_server_clog_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_rootservice_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_election_priority_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_disk_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_rebalance_map_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_rebalance_map_item_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_io_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_long_ops_status_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_rebalance_unit_migrate_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_rebalance_unit_distribution_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_server_object_pool_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_trans_lock_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_election_group_info_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_show_create_tablegroup_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_server_blacklist_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_partition_split_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_trans_result_info_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_duplicate_partition_mgr_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_parameter_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_server_schema_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_memory_context_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_dump_tenant_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_parameter_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_dag_warning_history_schema(share::schema::ObTableSchema& table_schema); - static int session_variables_schema(share::schema::ObTableSchema& table_schema); - static int table_privileges_schema(share::schema::ObTableSchema& table_schema); - static int user_privileges_schema(share::schema::ObTableSchema& table_schema); - static int schema_privileges_schema(share::schema::ObTableSchema& table_schema); - static int table_constraints_schema(share::schema::ObTableSchema& table_schema); - static int global_status_schema(share::schema::ObTableSchema& table_schema); - static int partitions_schema(share::schema::ObTableSchema& table_schema); - static int session_status_schema(share::schema::ObTableSchema& table_schema); - static int user_schema(share::schema::ObTableSchema& table_schema); - static int db_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_server_memory_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_partition_table_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_lock_wait_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_partition_item_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_replica_task_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_partition_location_schema(share::schema::ObTableSchema& table_schema); - static int proc_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_collation_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_charset_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_memstore_allocator_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_table_mgr_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_meta_table_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_freeze_info_schema(share::schema::ObTableSchema& table_schema); - static int parameters_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_bad_block_table_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_px_worker_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_trans_audit_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_trans_sql_audit_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_weak_read_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_partition_audit_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sequence_v2_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sequence_value_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_cluster_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_partition_table_store_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_ddl_operation_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_outline_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_outline_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_synonym_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_synonym_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_database_privilege_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_database_privilege_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_table_privilege_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_table_privilege_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_database_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_database_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tablegroup_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tablegroup_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_table_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_table_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_column_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_column_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_part_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_part_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_part_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_part_info_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_def_sub_part_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_def_sub_part_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sub_part_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sub_part_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_constraint_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_constraint_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_foreign_key_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_foreign_key_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_foreign_key_column_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_foreign_key_column_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_temp_table_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_ori_schema_version_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sys_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_user_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_user_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sys_variable_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sys_variable_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_func_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_func_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_package_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_package_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_routine_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_routine_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_routine_param_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_routine_param_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_type_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_type_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_type_attr_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_type_attr_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_coll_type_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_coll_type_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_column_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_table_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_histogram_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_column_statistic_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_recyclebin_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_gc_partition_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_plan_baseline_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_plan_baseline_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sequence_object_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sequence_object_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_raid_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_server_log_meta_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_dtl_channel_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_dtl_memory_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_dtl_first_cached_buffer_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_dblink_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_dblink_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_partition_meta_table_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_role_grantee_map_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_role_grantee_map_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_keystore_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_keystore_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_deadlock_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_tablespace_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_tablespace_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_information_columns_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_pg_partition_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_user_failed_login_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_profile_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_profile_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_security_audit_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_security_audit_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_trigger_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_trigger_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_cluster_stats_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sstable_column_checksum_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_ps_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_ps_item_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_workarea_history_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_workarea_active_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_workarea_histogram_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_workarea_memory_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_security_audit_record_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sysauth_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sysauth_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_objauth_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_objauth_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_backup_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_backup_log_archive_status_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_backup_task_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_pg_backup_task_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_pg_backup_log_archive_status_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_server_backup_log_archive_status_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_error_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_timestamp_service_schema(share::schema::ObTableSchema& table_schema); - static int referential_constraints_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_table_modifications_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_backup_clean_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_restore_pg_info_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_object_type_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_trans_table_status_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_pg_log_archive_stat_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_plan_monitor_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_monitor_statname_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_open_cursor_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_backup_validation_task_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_pg_backup_validation_task_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_time_zone_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_time_zone_name_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_time_zone_transition_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_time_zone_transition_type_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_constraint_column_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_constraint_column_history_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_files_schema(share::schema::ObTableSchema& table_schema); - static int files_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_dependency_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_object_definition_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_reserved_table_mgr_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_backupset_history_mgr_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_backup_backupset_task_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_pg_backup_backupset_task_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_backup_backup_log_archive_status_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_global_transaction_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_table_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_column_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_database_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sequence_v2_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_part_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sub_part_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_package_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_meta_table_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_audit_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_plan_stat_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_plan_statistics_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_plan_cache_plan_explain_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sequence_value_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sequence_object_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_user_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_synonym_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_foreign_key_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_column_stat_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_column_statistic_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_partition_table_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_table_stat_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_recyclebin_agent_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_outline_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_routine_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tablegroup_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_privilege_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sys_parameter_stat_agent_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_table_index_agent_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_charset_agent_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_all_table_agent_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_collation_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_foreign_key_column_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_server_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_plan_cache_stat_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_processlist_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_session_wait_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_session_wait_history_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_memory_info_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_memstore_info_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_memstore_info_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_server_memory_info_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sesstat_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sysstat_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_system_event_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_memstore_allocator_info_agent_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_session_variable_ora_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_global_variable_ora_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_show_create_table_ora_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_show_create_procedure_ora_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_show_create_tablegroup_ora_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_privilege_grant_ora_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_table_column_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_trace_log_ora_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_concurrent_limit_sql_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_constraint_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_type_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_type_attr_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_coll_type_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_routine_param_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_data_type_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_table_sys_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sstable_checksum_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_partition_info_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_partition_meta_table_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_keystore_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_tablespace_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_profile_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_role_grantee_map_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_table_privilege_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_security_audit_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_security_audit_history_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_trigger_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_px_worker_stat_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_ps_stat_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_ps_item_info_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_parameter_stat_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_workarea_history_stat_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_workarea_active_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_workarea_histogram_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_workarea_memory_info_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_security_audit_record_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sysauth_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sysauth_history_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_objauth_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_objauth_history_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_error_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_table_mgr_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_def_sub_part_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_object_type_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_server_schema_info_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_dblink_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_dblink_history_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_plan_monitor_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_monitor_statname_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_lock_wait_stat_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_open_cursor_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_constraint_column_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_dependency_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_time_zone_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_time_zone_name_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_time_zone_transition_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_time_zone_transition_type_agent_schema(share::schema::ObTableSchema& table_schema); - static int tenant_virtual_object_definition_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_routine_param_sys_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_type_sys_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_type_attr_sys_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_coll_type_sys_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_package_sys_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_trigger_sys_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_routine_sys_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_global_transaction_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_acquired_snapshot_agent_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_table_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_column_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_database_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sequence_v2_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_part_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sub_part_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_package_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sequence_value_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sequence_object_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_user_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_synonym_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_foreign_key_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_column_stat_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_column_statistic_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_table_stat_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_recyclebin_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_routine_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tablegroup_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_foreign_key_column_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_constraint_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_type_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_type_attr_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_coll_type_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_routine_param_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_partition_meta_table_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_keystore_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_tablespace_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_profile_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_role_grantee_map_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_table_privilege_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_security_audit_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_security_audit_history_real_agent_ora_schema( - share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_trigger_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_security_audit_record_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_sysauth_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_sysauth_history_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_objauth_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_objauth_history_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_error_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_def_sub_part_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_object_type_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_dblink_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_dblink_history_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_constraint_column_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_dependency_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_meta_table_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_time_zone_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_time_zone_name_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_time_zone_transition_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_tenant_time_zone_transition_type_real_agent_ora_schema( - share::schema::ObTableSchema& table_schema); - static int all_virtual_res_mgr_plan_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_res_mgr_directive_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_trans_lock_stat_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_res_mgr_mapping_rule_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_res_mgr_consumer_group_real_agent_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_plan_cache_stat_schema(share::schema::ObTableSchema& table_schema); - static int gv_plan_cache_plan_stat_schema(share::schema::ObTableSchema& table_schema); - static int schemata_schema(share::schema::ObTableSchema& table_schema); - static int character_sets_schema(share::schema::ObTableSchema& table_schema); - static int global_variables_schema(share::schema::ObTableSchema& table_schema); - static int statistics_schema(share::schema::ObTableSchema& table_schema); - static int views_schema(share::schema::ObTableSchema& table_schema); - static int tables_schema(share::schema::ObTableSchema& table_schema); - static int collations_schema(share::schema::ObTableSchema& table_schema); - static int collation_character_set_applicability_schema(share::schema::ObTableSchema& table_schema); - static int processlist_schema(share::schema::ObTableSchema& table_schema); - static int key_column_usage_schema(share::schema::ObTableSchema& table_schema); - static int dba_outlines_schema(share::schema::ObTableSchema& table_schema); - static int engines_schema(share::schema::ObTableSchema& table_schema); - static int routines_schema(share::schema::ObTableSchema& table_schema); - static int gv_session_event_schema(share::schema::ObTableSchema& table_schema); - static int gv_session_wait_schema(share::schema::ObTableSchema& table_schema); - static int gv_session_wait_history_schema(share::schema::ObTableSchema& table_schema); - static int gv_system_event_schema(share::schema::ObTableSchema& table_schema); - static int gv_sesstat_schema(share::schema::ObTableSchema& table_schema); - static int gv_sysstat_schema(share::schema::ObTableSchema& table_schema); - static int v_statname_schema(share::schema::ObTableSchema& table_schema); - static int v_event_name_schema(share::schema::ObTableSchema& table_schema); - static int v_session_event_schema(share::schema::ObTableSchema& table_schema); - static int v_session_wait_schema(share::schema::ObTableSchema& table_schema); - static int v_session_wait_history_schema(share::schema::ObTableSchema& table_schema); - static int v_sesstat_schema(share::schema::ObTableSchema& table_schema); - static int v_sysstat_schema(share::schema::ObTableSchema& table_schema); - static int v_system_event_schema(share::schema::ObTableSchema& table_schema); - static int gv_sql_audit_schema(share::schema::ObTableSchema& table_schema); - static int gv_latch_schema(share::schema::ObTableSchema& table_schema); - static int gv_memory_schema(share::schema::ObTableSchema& table_schema); - static int v_memory_schema(share::schema::ObTableSchema& table_schema); - static int gv_memstore_schema(share::schema::ObTableSchema& table_schema); - static int v_memstore_schema(share::schema::ObTableSchema& table_schema); - static int gv_memstore_info_schema(share::schema::ObTableSchema& table_schema); - static int v_memstore_info_schema(share::schema::ObTableSchema& table_schema); - static int v_plan_cache_stat_schema(share::schema::ObTableSchema& table_schema); - static int v_plan_cache_plan_stat_schema(share::schema::ObTableSchema& table_schema); - static int gv_plan_cache_plan_explain_schema(share::schema::ObTableSchema& table_schema); - static int v_plan_cache_plan_explain_schema(share::schema::ObTableSchema& table_schema); - static int v_sql_audit_schema(share::schema::ObTableSchema& table_schema); - static int v_latch_schema(share::schema::ObTableSchema& table_schema); - static int gv_obrpc_outgoing_schema(share::schema::ObTableSchema& table_schema); - static int v_obrpc_outgoing_schema(share::schema::ObTableSchema& table_schema); - static int gv_obrpc_incoming_schema(share::schema::ObTableSchema& table_schema); - static int v_obrpc_incoming_schema(share::schema::ObTableSchema& table_schema); - static int gv_sql_schema(share::schema::ObTableSchema& table_schema); - static int v_sql_schema(share::schema::ObTableSchema& table_schema); - static int gv_sql_monitor_schema(share::schema::ObTableSchema& table_schema); - static int v_sql_monitor_schema(share::schema::ObTableSchema& table_schema); - static int gv_sql_plan_monitor_schema(share::schema::ObTableSchema& table_schema); - static int v_sql_plan_monitor_schema(share::schema::ObTableSchema& table_schema); - static int user_recyclebin_schema(share::schema::ObTableSchema& table_schema); - static int gv_outline_schema(share::schema::ObTableSchema& table_schema); - static int gv_concurrent_limit_sql_schema(share::schema::ObTableSchema& table_schema); - static int gv_sql_plan_statistics_schema(share::schema::ObTableSchema& table_schema); - static int v_sql_plan_statistics_schema(share::schema::ObTableSchema& table_schema); - static int gv_server_memstore_schema(share::schema::ObTableSchema& table_schema); - static int gv_unit_load_balance_event_history_schema(share::schema::ObTableSchema& table_schema); - static int gv_tenant_schema(share::schema::ObTableSchema& table_schema); - static int gv_database_schema(share::schema::ObTableSchema& table_schema); - static int gv_table_schema(share::schema::ObTableSchema& table_schema); - static int gv_unit_schema(share::schema::ObTableSchema& table_schema); - static int v_unit_schema(share::schema::ObTableSchema& table_schema); - static int gv_partition_schema(share::schema::ObTableSchema& table_schema); - static int v_partition_schema(share::schema::ObTableSchema& table_schema); - static int gv_lock_wait_stat_schema(share::schema::ObTableSchema& table_schema); - static int v_lock_wait_stat_schema(share::schema::ObTableSchema& table_schema); - static int time_zone_schema(share::schema::ObTableSchema& table_schema); - static int time_zone_name_schema(share::schema::ObTableSchema& table_schema); - static int time_zone_transition_schema(share::schema::ObTableSchema& table_schema); - static int time_zone_transition_type_schema(share::schema::ObTableSchema& table_schema); - static int gv_session_longops_schema(share::schema::ObTableSchema& table_schema); - static int v_session_longops_schema(share::schema::ObTableSchema& table_schema); - static int gv_tenant_memstore_allocator_info_schema(share::schema::ObTableSchema& table_schema); - static int v_tenant_memstore_allocator_info_schema(share::schema::ObTableSchema& table_schema); - static int gv_tenant_sequence_object_schema(share::schema::ObTableSchema& table_schema); - static int columns_schema(share::schema::ObTableSchema& table_schema); - static int gv_minor_merge_info_schema(share::schema::ObTableSchema& table_schema); - static int gv_tenant_px_worker_stat_schema(share::schema::ObTableSchema& table_schema); - static int v_tenant_px_worker_stat_schema(share::schema::ObTableSchema& table_schema); - static int gv_partition_audit_schema(share::schema::ObTableSchema& table_schema); - static int v_partition_audit_schema(share::schema::ObTableSchema& table_schema); - static int v_ob_cluster_schema(share::schema::ObTableSchema& table_schema); - static int gv_ps_stat_schema(share::schema::ObTableSchema& table_schema); - static int v_ps_stat_schema(share::schema::ObTableSchema& table_schema); - static int gv_ps_item_info_schema(share::schema::ObTableSchema& table_schema); - static int v_ps_item_info_schema(share::schema::ObTableSchema& table_schema); - static int gv_sql_workarea_schema(share::schema::ObTableSchema& table_schema); - static int v_sql_workarea_schema(share::schema::ObTableSchema& table_schema); - static int gv_sql_workarea_active_schema(share::schema::ObTableSchema& table_schema); - static int v_sql_workarea_active_schema(share::schema::ObTableSchema& table_schema); - static int gv_sql_workarea_histogram_schema(share::schema::ObTableSchema& table_schema); - static int v_sql_workarea_histogram_schema(share::schema::ObTableSchema& table_schema); - static int gv_ob_sql_workarea_memory_info_schema(share::schema::ObTableSchema& table_schema); - static int v_ob_sql_workarea_memory_info_schema(share::schema::ObTableSchema& table_schema); - static int gv_plan_cache_reference_info_schema(share::schema::ObTableSchema& table_schema); - static int v_plan_cache_reference_info_schema(share::schema::ObTableSchema& table_schema); - static int v_ob_timestamp_service_schema(share::schema::ObTableSchema& table_schema); - static int gv_sstable_schema(share::schema::ObTableSchema& table_schema); - static int v_sstable_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_archivelog_summary_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_job_details_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_set_details_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_set_expired_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_progress_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_archivelog_progress_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_clean_history_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_task_clean_history_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_restore_progress_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_restore_history_schema(share::schema::ObTableSchema& table_schema); - static int gv_server_schema_info_schema(share::schema::ObTableSchema& table_schema); - static int v_server_schema_info_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ckpt_history_schema(share::schema::ObTableSchema& table_schema); - static int gv_ob_trans_table_status_schema(share::schema::ObTableSchema& table_schema); - static int v_ob_trans_table_status_schema(share::schema::ObTableSchema& table_schema); - static int v_sql_monitor_statname_schema(share::schema::ObTableSchema& table_schema); - static int gv_merge_info_schema(share::schema::ObTableSchema& table_schema); - static int v_merge_info_schema(share::schema::ObTableSchema& table_schema); - static int gv_lock_schema(share::schema::ObTableSchema& table_schema); - static int v_lock_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_validation_job_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_validation_job_history_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_tenant_backup_validation_task_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_validation_task_history_schema(share::schema::ObTableSchema& table_schema); - static int v_restore_point_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_set_obsolete_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_backupset_job_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_backupset_job_history_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_backupset_task_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_backupset_task_history_schema(share::schema::ObTableSchema& table_schema); - static int cdb_ob_backup_backup_archivelog_summary_schema(share::schema::ObTableSchema& table_schema); - static int dba_synonyms_schema(share::schema::ObTableSchema& table_schema); - static int dba_objects_schema(share::schema::ObTableSchema& table_schema); - static int all_objects_schema(share::schema::ObTableSchema& table_schema); - static int user_objects_schema(share::schema::ObTableSchema& table_schema); - static int dba_sequences_schema(share::schema::ObTableSchema& table_schema); - static int all_sequences_schema(share::schema::ObTableSchema& table_schema); - static int user_sequences_schema(share::schema::ObTableSchema& table_schema); - static int dba_users_schema(share::schema::ObTableSchema& table_schema); - static int all_users_schema(share::schema::ObTableSchema& table_schema); - static int all_synonyms_schema(share::schema::ObTableSchema& table_schema); - static int user_synonyms_schema(share::schema::ObTableSchema& table_schema); - static int dba_ind_columns_schema(share::schema::ObTableSchema& table_schema); - static int all_ind_columns_schema(share::schema::ObTableSchema& table_schema); - static int user_ind_columns_schema(share::schema::ObTableSchema& table_schema); - static int dba_constraints_schema(share::schema::ObTableSchema& table_schema); - static int all_constraints_schema(share::schema::ObTableSchema& table_schema); - static int user_constraints_schema(share::schema::ObTableSchema& table_schema); - static int all_tab_cols_v_schema(share::schema::ObTableSchema& table_schema); - static int dba_tab_cols_v_schema(share::schema::ObTableSchema& table_schema); - static int user_tab_cols_v_schema(share::schema::ObTableSchema& table_schema); - static int all_tab_cols_schema(share::schema::ObTableSchema& table_schema); - static int dba_tab_cols_schema(share::schema::ObTableSchema& table_schema); - static int user_tab_cols_schema(share::schema::ObTableSchema& table_schema); - static int all_tab_columns_schema(share::schema::ObTableSchema& table_schema); - static int dba_tab_columns_schema(share::schema::ObTableSchema& table_schema); - static int user_tab_columns_schema(share::schema::ObTableSchema& table_schema); - static int all_tables_schema(share::schema::ObTableSchema& table_schema); - static int dba_tables_schema(share::schema::ObTableSchema& table_schema); - static int user_tables_schema(share::schema::ObTableSchema& table_schema); - static int dba_tab_comments_schema(share::schema::ObTableSchema& table_schema); - static int all_tab_comments_schema(share::schema::ObTableSchema& table_schema); - static int user_tab_comments_schema(share::schema::ObTableSchema& table_schema); - static int dba_col_comments_schema(share::schema::ObTableSchema& table_schema); - static int all_col_comments_schema(share::schema::ObTableSchema& table_schema); - static int user_col_comments_schema(share::schema::ObTableSchema& table_schema); - static int dba_indexes_schema(share::schema::ObTableSchema& table_schema); - static int all_indexes_schema(share::schema::ObTableSchema& table_schema); - static int user_indexes_schema(share::schema::ObTableSchema& table_schema); - static int dba_cons_columns_schema(share::schema::ObTableSchema& table_schema); - static int all_cons_columns_schema(share::schema::ObTableSchema& table_schema); - static int user_cons_columns_schema(share::schema::ObTableSchema& table_schema); - static int user_segments_schema(share::schema::ObTableSchema& table_schema); - static int dba_segments_schema(share::schema::ObTableSchema& table_schema); - static int dba_types_schema(share::schema::ObTableSchema& table_schema); - static int all_types_schema(share::schema::ObTableSchema& table_schema); - static int user_types_schema(share::schema::ObTableSchema& table_schema); - static int dba_type_attrs_schema(share::schema::ObTableSchema& table_schema); - static int all_type_attrs_schema(share::schema::ObTableSchema& table_schema); - static int user_type_attrs_schema(share::schema::ObTableSchema& table_schema); - static int dba_coll_types_schema(share::schema::ObTableSchema& table_schema); - static int all_coll_types_schema(share::schema::ObTableSchema& table_schema); - static int user_coll_types_schema(share::schema::ObTableSchema& table_schema); - static int dba_procedures_schema(share::schema::ObTableSchema& table_schema); - static int dba_arguments_schema(share::schema::ObTableSchema& table_schema); - static int dba_source_schema(share::schema::ObTableSchema& table_schema); - static int all_procedures_schema(share::schema::ObTableSchema& table_schema); - static int all_arguments_schema(share::schema::ObTableSchema& table_schema); - static int all_source_schema(share::schema::ObTableSchema& table_schema); - static int user_procedures_schema(share::schema::ObTableSchema& table_schema); - static int user_arguments_schema(share::schema::ObTableSchema& table_schema); - static int user_source_schema(share::schema::ObTableSchema& table_schema); - static int dba_part_key_columns_schema(share::schema::ObTableSchema& table_schema); - static int all_part_key_columns_schema(share::schema::ObTableSchema& table_schema); - static int user_part_key_columns_schema(share::schema::ObTableSchema& table_schema); - static int dba_subpart_key_columns_schema(share::schema::ObTableSchema& table_schema); - static int all_subpart_key_columns_schema(share::schema::ObTableSchema& table_schema); - static int user_subpart_key_columns_schema(share::schema::ObTableSchema& table_schema); - static int dba_views_schema(share::schema::ObTableSchema& table_schema); - static int all_views_schema(share::schema::ObTableSchema& table_schema); - static int user_views_schema(share::schema::ObTableSchema& table_schema); - static int all_tab_partitions_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_tab_subpartitions_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_part_tables_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_part_tables_ora_schema(share::schema::ObTableSchema& table_schema); - static int user_part_tables_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_tab_partitions_ora_schema(share::schema::ObTableSchema& table_schema); - static int user_tab_partitions_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_tab_subpartitions_ora_schema(share::schema::ObTableSchema& table_schema); - static int user_tab_subpartitions_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_subpartition_templates_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_subpartition_templates_ora_schema(share::schema::ObTableSchema& table_schema); - static int user_subpartition_templates_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_part_indexes_schema(share::schema::ObTableSchema& table_schema); - static int all_part_indexes_schema(share::schema::ObTableSchema& table_schema); - static int user_part_indexes_schema(share::schema::ObTableSchema& table_schema); - static int all_all_tables_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_all_tables_ora_schema(share::schema::ObTableSchema& table_schema); - static int user_all_tables_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_profiles_ora_schema(share::schema::ObTableSchema& table_schema); - static int user_profiles_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_profiles_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_mview_comments_ora_schema(share::schema::ObTableSchema& table_schema); - static int user_mview_comments_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_mview_comments_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_scheduler_program_args_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_scheduler_program_args_ora_schema(share::schema::ObTableSchema& table_schema); - static int user_scheduler_program_args_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_scheduler_job_args_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_scheduler_job_args_ora_schema(share::schema::ObTableSchema& table_schema); - static int user_scheduler_job_args_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_errors_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_errors_ora_schema(share::schema::ObTableSchema& table_schema); - static int user_errors_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_type_methods_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_type_methods_ora_schema(share::schema::ObTableSchema& table_schema); - static int user_type_methods_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_method_params_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_method_params_ora_schema(share::schema::ObTableSchema& table_schema); - static int user_method_params_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_tablespaces_ora_schema(share::schema::ObTableSchema& table_schema); - static int user_tablespaces_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_ind_expressions_schema(share::schema::ObTableSchema& table_schema); - static int user_ind_expressions_schema(share::schema::ObTableSchema& table_schema); - static int all_ind_expressions_schema(share::schema::ObTableSchema& table_schema); - static int all_ind_partitions_schema(share::schema::ObTableSchema& table_schema); - static int user_ind_partitions_schema(share::schema::ObTableSchema& table_schema); - static int dba_ind_partitions_schema(share::schema::ObTableSchema& table_schema); - static int dba_ind_subpartitions_schema(share::schema::ObTableSchema& table_schema); - static int all_ind_subpartitions_schema(share::schema::ObTableSchema& table_schema); - static int user_ind_subpartitions_schema(share::schema::ObTableSchema& table_schema); - static int dba_roles_schema(share::schema::ObTableSchema& table_schema); - static int dba_role_privs_schema(share::schema::ObTableSchema& table_schema); - static int user_role_privs_schema(share::schema::ObTableSchema& table_schema); - static int dba_tab_privs_schema(share::schema::ObTableSchema& table_schema); - static int all_tab_privs_schema(share::schema::ObTableSchema& table_schema); - static int user_tab_privs_schema(share::schema::ObTableSchema& table_schema); - static int dba_sys_privs_schema(share::schema::ObTableSchema& table_schema); - static int user_sys_privs_schema(share::schema::ObTableSchema& table_schema); - static int dba_col_privs_ora_schema(share::schema::ObTableSchema& table_schema); - static int user_col_privs_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_col_privs_ora_schema(share::schema::ObTableSchema& table_schema); - static int role_tab_privs_ora_schema(share::schema::ObTableSchema& table_schema); - static int role_sys_privs_ora_schema(share::schema::ObTableSchema& table_schema); - static int role_role_privs_ora_schema(share::schema::ObTableSchema& table_schema); - static int dictionary_ora_schema(share::schema::ObTableSchema& table_schema); - static int dict_ora_schema(share::schema::ObTableSchema& table_schema); - static int all_triggers_schema(share::schema::ObTableSchema& table_schema); - static int dba_triggers_schema(share::schema::ObTableSchema& table_schema); - static int user_triggers_schema(share::schema::ObTableSchema& table_schema); - static int all_dependencies_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_dependencies_ora_schema(share::schema::ObTableSchema& table_schema); - static int user_dependencies_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_rsrc_plans_schema(share::schema::ObTableSchema& table_schema); - static int dba_rsrc_plan_directives_schema(share::schema::ObTableSchema& table_schema); - static int dba_rsrc_group_mappings_schema(share::schema::ObTableSchema& table_schema); - static int dba_recyclebin_ora_schema(share::schema::ObTableSchema& table_schema); - static int user_recyclebin_ora_schema(share::schema::ObTableSchema& table_schema); - static int dba_rsrc_consumer_groups_schema(share::schema::ObTableSchema& table_schema); - static int gv_outline_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_sql_audit_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_sql_audit_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_instance_schema(share::schema::ObTableSchema& table_schema); - static int v_instance_schema(share::schema::ObTableSchema& table_schema); - static int gv_plan_cache_plan_stat_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_plan_cache_plan_stat_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_plan_cache_plan_explain_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_plan_cache_plan_explain_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_session_wait_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_session_wait_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_session_wait_history_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_session_wait_history_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_memory_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_memory_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_memstore_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_memstore_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_memstore_info_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_memstore_info_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_server_memstore_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_sesstat_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_sesstat_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_sysstat_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_sysstat_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_system_event_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_system_event_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_tenant_memstore_allocator_info_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_tenant_memstore_allocator_info_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_plan_cache_stat_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_plan_cache_stat_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_concurrent_limit_sql_ora_schema(share::schema::ObTableSchema& table_schema); - static int nls_session_parameters_ora_schema(share::schema::ObTableSchema& table_schema); - static int nls_instance_parameters_ora_schema(share::schema::ObTableSchema& table_schema); - static int nls_database_parameters_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_nls_parameters_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_version_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_tenant_px_worker_stat_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_tenant_px_worker_stat_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_ps_stat_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_ps_stat_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_ps_item_info_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_ps_item_info_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_sql_workarea_active_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_sql_workarea_active_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_sql_workarea_histogram_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_sql_workarea_histogram_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_ob_sql_workarea_memory_info_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_ob_sql_workarea_memory_info_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_plan_cache_reference_info_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_plan_cache_reference_info_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_sql_workarea_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_sql_workarea_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_sstable_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_sstable_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_server_schema_info_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_server_schema_info_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_sql_plan_monitor_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_sql_plan_monitor_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_sql_monitor_statname_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_lock_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_lock_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_open_cursor_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_open_cursor_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_timezone_names_ora_schema(share::schema::ObTableSchema& table_schema); - static int gv_global_transaction_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_global_transaction_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_restore_point_ora_schema(share::schema::ObTableSchema& table_schema); - static int v_rsrc_plan_ora_schema(share::schema::ObTableSchema& table_schema); - static int triggers_schema(share::schema::ObTableSchema& table_schema); - static int all_table_v2_history_idx_data_table_id_schema(share::schema::ObTableSchema& table_schema); - static int all_table_history_idx_data_table_id_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_plan_cache_stat_all_virtual_plan_cache_stat_i1_schema( - share::schema::ObTableSchema& table_schema); - static int all_virtual_session_event_all_virtual_session_event_i1_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_session_wait_all_virtual_session_wait_i1_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_session_wait_history_all_virtual_session_wait_history_i1_schema( - share::schema::ObTableSchema& table_schema); - static int all_virtual_system_event_all_virtual_system_event_i1_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sesstat_all_virtual_sesstat_i1_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sysstat_all_virtual_sysstat_i1_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_audit_all_virtual_sql_audit_i1_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_replica_task_all_virtual_replica_task_i1_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_plan_monitor_all_virtual_sql_plan_monitor_i1_schema( - share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_audit_ora_all_virtual_sql_audit_i1_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_plan_cache_stat_ora_all_virtual_plan_cache_stat_i1_schema( - share::schema::ObTableSchema& table_schema); - static int all_virtual_session_wait_ora_all_virtual_session_wait_i1_schema( - share::schema::ObTableSchema& table_schema); - static int all_virtual_session_wait_history_ora_all_virtual_session_wait_history_i1_schema( - share::schema::ObTableSchema& table_schema); - static int all_virtual_sesstat_ora_all_virtual_sesstat_i1_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_sysstat_ora_all_virtual_sysstat_i1_schema(share::schema::ObTableSchema& table_schema); - static int all_virtual_system_event_ora_all_virtual_system_event_i1_schema( - share::schema::ObTableSchema& table_schema); - static int all_virtual_sql_plan_monitor_ora_all_virtual_sql_plan_monitor_i1_schema( - share::schema::ObTableSchema& table_schema); + static int all_core_table_schema(share::schema::ObTableSchema &table_schema); + static int all_root_table_schema(share::schema::ObTableSchema &table_schema); + static int all_table_schema(share::schema::ObTableSchema &table_schema); + static int all_column_schema(share::schema::ObTableSchema &table_schema); + static int all_ddl_operation_schema(share::schema::ObTableSchema &table_schema); + static int all_table_v2_schema(share::schema::ObTableSchema &table_schema); + static int all_meta_table_schema(share::schema::ObTableSchema &table_schema); + static int all_user_schema(share::schema::ObTableSchema &table_schema); + static int all_user_history_schema(share::schema::ObTableSchema &table_schema); + static int all_database_schema(share::schema::ObTableSchema &table_schema); + static int all_database_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tablegroup_schema(share::schema::ObTableSchema &table_schema); + static int all_tablegroup_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_history_schema(share::schema::ObTableSchema &table_schema); + static int all_table_privilege_schema(share::schema::ObTableSchema &table_schema); + static int all_table_privilege_history_schema(share::schema::ObTableSchema &table_schema); + static int all_database_privilege_schema(share::schema::ObTableSchema &table_schema); + static int all_database_privilege_history_schema(share::schema::ObTableSchema &table_schema); + static int all_table_history_schema(share::schema::ObTableSchema &table_schema); + static int all_column_history_schema(share::schema::ObTableSchema &table_schema); + static int all_zone_schema(share::schema::ObTableSchema &table_schema); + static int all_server_schema(share::schema::ObTableSchema &table_schema); + static int all_sys_parameter_schema(share::schema::ObTableSchema &table_schema); + static int tenant_parameter_schema(share::schema::ObTableSchema &table_schema); + static int all_sys_variable_schema(share::schema::ObTableSchema &table_schema); + static int all_sys_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_column_statistic_schema(share::schema::ObTableSchema &table_schema); + static int all_unit_schema(share::schema::ObTableSchema &table_schema); + static int all_unit_config_schema(share::schema::ObTableSchema &table_schema); + static int all_resource_pool_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_resource_usage_schema(share::schema::ObTableSchema &table_schema); + static int all_sequence_schema(share::schema::ObTableSchema &table_schema); + static int all_charset_schema(share::schema::ObTableSchema &table_schema); + static int all_collation_schema(share::schema::ObTableSchema &table_schema); + static int all_local_index_status_schema(share::schema::ObTableSchema &table_schema); + static int all_dummy_schema(share::schema::ObTableSchema &table_schema); + static int all_frozen_map_schema(share::schema::ObTableSchema &table_schema); + static int all_clog_history_info_schema(share::schema::ObTableSchema &table_schema); + static int all_clog_history_info_v2_schema(share::schema::ObTableSchema &table_schema); + static int all_rootservice_event_history_schema(share::schema::ObTableSchema &table_schema); + static int all_privilege_schema(share::schema::ObTableSchema &table_schema); + static int all_outline_schema(share::schema::ObTableSchema &table_schema); + static int all_outline_history_schema(share::schema::ObTableSchema &table_schema); + static int all_election_event_history_schema(share::schema::ObTableSchema &table_schema); + static int all_recyclebin_schema(share::schema::ObTableSchema &table_schema); + static int all_part_schema(share::schema::ObTableSchema &table_schema); + static int all_part_history_schema(share::schema::ObTableSchema &table_schema); + static int all_sub_part_schema(share::schema::ObTableSchema &table_schema); + static int all_sub_part_history_schema(share::schema::ObTableSchema &table_schema); + static int all_part_info_schema(share::schema::ObTableSchema &table_schema); + static int all_part_info_history_schema(share::schema::ObTableSchema &table_schema); + static int all_def_sub_part_schema(share::schema::ObTableSchema &table_schema); + static int all_def_sub_part_history_schema(share::schema::ObTableSchema &table_schema); + static int all_server_event_history_schema(share::schema::ObTableSchema &table_schema); + static int all_rootservice_job_schema(share::schema::ObTableSchema &table_schema); + static int all_unit_load_history_schema(share::schema::ObTableSchema &table_schema); + static int all_sys_variable_history_schema(share::schema::ObTableSchema &table_schema); + static int all_restore_job_schema(share::schema::ObTableSchema &table_schema); + static int all_restore_task_schema(share::schema::ObTableSchema &table_schema); + static int all_restore_job_history_schema(share::schema::ObTableSchema &table_schema); + static int all_time_zone_schema(share::schema::ObTableSchema &table_schema); + static int all_time_zone_name_schema(share::schema::ObTableSchema &table_schema); + static int all_time_zone_transition_schema(share::schema::ObTableSchema &table_schema); + static int all_time_zone_transition_type_schema(share::schema::ObTableSchema &table_schema); + static int all_ddl_id_schema(share::schema::ObTableSchema &table_schema); + static int all_foreign_key_schema(share::schema::ObTableSchema &table_schema); + static int all_foreign_key_history_schema(share::schema::ObTableSchema &table_schema); + static int all_foreign_key_column_schema(share::schema::ObTableSchema &table_schema); + static int all_foreign_key_column_history_schema(share::schema::ObTableSchema &table_schema); + static int all_synonym_schema(share::schema::ObTableSchema &table_schema); + static int all_synonym_history_schema(share::schema::ObTableSchema &table_schema); + static int all_sequence_v2_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_meta_table_schema(share::schema::ObTableSchema &table_schema); + static int all_index_wait_transaction_status_schema(share::schema::ObTableSchema &table_schema); + static int all_index_schedule_task_schema(share::schema::ObTableSchema &table_schema); + static int all_index_checksum_schema(share::schema::ObTableSchema &table_schema); + static int all_routine_schema(share::schema::ObTableSchema &table_schema); + static int all_routine_history_schema(share::schema::ObTableSchema &table_schema); + static int all_routine_param_schema(share::schema::ObTableSchema &table_schema); + static int all_routine_param_history_schema(share::schema::ObTableSchema &table_schema); + static int all_table_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_column_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_histogram_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_package_schema(share::schema::ObTableSchema &table_schema); + static int all_package_history_schema(share::schema::ObTableSchema &table_schema); + static int all_sql_execute_task_schema(share::schema::ObTableSchema &table_schema); + static int all_index_build_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_build_index_param_schema(share::schema::ObTableSchema &table_schema); + static int all_global_index_data_src_schema(share::schema::ObTableSchema &table_schema); + static int all_acquired_snapshot_schema(share::schema::ObTableSchema &table_schema); + static int all_immediate_effect_index_sstable_schema(share::schema::ObTableSchema &table_schema); + static int all_sstable_checksum_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_gc_partition_info_schema(share::schema::ObTableSchema &table_schema); + static int all_constraint_schema(share::schema::ObTableSchema &table_schema); + static int all_constraint_history_schema(share::schema::ObTableSchema &table_schema); + static int all_ori_schema_version_schema(share::schema::ObTableSchema &table_schema); + static int all_func_schema(share::schema::ObTableSchema &table_schema); + static int all_func_history_schema(share::schema::ObTableSchema &table_schema); + static int all_temp_table_schema(share::schema::ObTableSchema &table_schema); + static int all_sstable_column_checksum_schema(share::schema::ObTableSchema &table_schema); + static int all_sequence_object_schema(share::schema::ObTableSchema &table_schema); + static int all_sequence_object_history_schema(share::schema::ObTableSchema &table_schema); + static int all_sequence_value_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_plan_baseline_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_plan_baseline_history_schema(share::schema::ObTableSchema &table_schema); + static int all_ddl_helper_schema(share::schema::ObTableSchema &table_schema); + static int all_freeze_schema_version_schema(share::schema::ObTableSchema &table_schema); + static int all_type_schema(share::schema::ObTableSchema &table_schema); + static int all_type_history_schema(share::schema::ObTableSchema &table_schema); + static int all_type_attr_schema(share::schema::ObTableSchema &table_schema); + static int all_type_attr_history_schema(share::schema::ObTableSchema &table_schema); + static int all_coll_type_schema(share::schema::ObTableSchema &table_schema); + static int all_coll_type_history_schema(share::schema::ObTableSchema &table_schema); + static int all_weak_read_service_schema(share::schema::ObTableSchema &table_schema); + static int all_gts_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_gts_schema(share::schema::ObTableSchema &table_schema); + static int all_partition_member_list_schema(share::schema::ObTableSchema &table_schema); + static int all_dblink_schema(share::schema::ObTableSchema &table_schema); + static int all_dblink_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_partition_meta_table_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_role_grantee_map_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_role_grantee_map_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_keystore_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_keystore_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_tablespace_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_tablespace_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_user_failed_login_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_profile_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_profile_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_security_audit_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_security_audit_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_trigger_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_trigger_history_schema(share::schema::ObTableSchema &table_schema); + static int all_seed_parameter_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_sstable_column_checksum_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_security_audit_record_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_sysauth_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_sysauth_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_objauth_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_objauth_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_backup_info_schema(share::schema::ObTableSchema &table_schema); + static int all_restore_info_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_backup_log_archive_status_schema(share::schema::ObTableSchema &table_schema); + static int all_backup_log_archive_status_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_backup_task_schema(share::schema::ObTableSchema &table_schema); + static int all_backup_task_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_pg_backup_task_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_error_schema(share::schema::ObTableSchema &table_schema); + static int all_server_recovery_status_schema(share::schema::ObTableSchema &table_schema); + static int all_datafile_recovery_status_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_backup_clean_info_schema(share::schema::ObTableSchema &table_schema); + static int all_backup_clean_info_history_schema(share::schema::ObTableSchema &table_schema); + static int all_backup_task_clean_history_schema(share::schema::ObTableSchema &table_schema); + static int all_restore_progress_schema(share::schema::ObTableSchema &table_schema); + static int all_restore_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_restore_pg_info_schema(share::schema::ObTableSchema &table_schema); + static int all_table_v2_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_object_type_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_object_type_history_schema(share::schema::ObTableSchema &table_schema); + static int all_backup_validation_job_schema(share::schema::ObTableSchema &table_schema); + static int all_backup_validation_job_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_backup_validation_task_schema(share::schema::ObTableSchema &table_schema); + static int all_backup_validation_task_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_pg_backup_validation_task_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_time_zone_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_time_zone_name_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_time_zone_transition_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_time_zone_transition_type_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_constraint_column_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_constraint_column_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_global_transaction_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_dependency_schema(share::schema::ObTableSchema &table_schema); + static int all_backup_backupset_job_schema(share::schema::ObTableSchema &table_schema); + static int all_backup_backupset_job_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_backup_backupset_task_schema(share::schema::ObTableSchema &table_schema); + static int all_backup_backupset_task_history_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_pg_backup_backupset_task_schema(share::schema::ObTableSchema &table_schema); + static int all_tenant_backup_backup_log_archive_status_schema(share::schema::ObTableSchema &table_schema); + static int all_backup_backup_log_archive_status_history_schema(share::schema::ObTableSchema &table_schema); + static int all_res_mgr_plan_schema(share::schema::ObTableSchema &table_schema); + static int all_res_mgr_directive_schema(share::schema::ObTableSchema &table_schema); + static int all_res_mgr_mapping_rule_schema(share::schema::ObTableSchema &table_schema); + static int all_res_mgr_consumer_group_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_all_table_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_table_column_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_table_index_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_show_create_database_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_show_create_table_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_session_variable_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_privilege_grant_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_processlist_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_warning_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_current_tenant_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_database_status_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_tenant_status_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_interm_result_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_partition_stat_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_statname_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_event_name_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_global_variable_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_show_tables_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_show_create_procedure_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_core_meta_table_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_zone_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_plan_cache_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_plan_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_mem_leak_checker_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_latch_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_kvcache_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_data_type_class_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_data_type_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_server_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_rebalance_task_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_session_event_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_session_wait_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_session_wait_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_system_event_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_memstore_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_concurrency_object_pool_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sesstat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sysstat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_storage_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_disk_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_memstore_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_partition_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_upgrade_inspection_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_trans_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_trans_mgr_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_election_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_election_mem_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_audit_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_trans_mem_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_partition_sstable_image_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_core_root_table_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_core_all_table_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_core_column_table_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_memory_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sys_parameter_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_partition_replay_status_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_clog_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_trace_log_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_engine_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_proxy_server_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_proxy_sys_variable_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_proxy_schema_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_plan_cache_plan_explain_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_obrpc_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_partition_sstable_merge_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_monitor_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_outline_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_concurrent_limit_sql_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_plan_statistics_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_partition_sstable_macro_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_proxy_partition_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_proxy_partition_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_proxy_sub_partition_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_proxy_route_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_rebalance_tenant_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_rebalance_unit_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_rebalance_replica_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_partition_amplification_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_election_event_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_partition_store_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_leader_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_partition_migration_status_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sys_task_status_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_macro_block_marker_status_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_server_clog_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_rootservice_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_election_priority_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_disk_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_rebalance_map_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_rebalance_map_item_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_io_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_long_ops_status_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_rebalance_unit_migrate_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_rebalance_unit_distribution_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_server_object_pool_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_trans_lock_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_election_group_info_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_show_create_tablegroup_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_server_blacklist_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_partition_split_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_trans_result_info_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_duplicate_partition_mgr_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_parameter_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_server_schema_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_memory_context_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_dump_tenant_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_parameter_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_dag_warning_history_schema(share::schema::ObTableSchema &table_schema); + static int session_variables_schema(share::schema::ObTableSchema &table_schema); + static int table_privileges_schema(share::schema::ObTableSchema &table_schema); + static int user_privileges_schema(share::schema::ObTableSchema &table_schema); + static int schema_privileges_schema(share::schema::ObTableSchema &table_schema); + static int table_constraints_schema(share::schema::ObTableSchema &table_schema); + static int global_status_schema(share::schema::ObTableSchema &table_schema); + static int partitions_schema(share::schema::ObTableSchema &table_schema); + static int session_status_schema(share::schema::ObTableSchema &table_schema); + static int user_schema(share::schema::ObTableSchema &table_schema); + static int db_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_server_memory_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_partition_table_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_lock_wait_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_partition_item_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_replica_task_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_partition_location_schema(share::schema::ObTableSchema &table_schema); + static int proc_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_collation_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_charset_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_memstore_allocator_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_table_mgr_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_meta_table_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_freeze_info_schema(share::schema::ObTableSchema &table_schema); + static int parameters_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_bad_block_table_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_px_worker_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_trans_audit_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_trans_sql_audit_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_weak_read_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_partition_audit_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sequence_v2_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sequence_value_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_cluster_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_partition_table_store_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_ddl_operation_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_outline_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_outline_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_synonym_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_synonym_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_database_privilege_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_database_privilege_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_table_privilege_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_table_privilege_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_database_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_database_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tablegroup_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tablegroup_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_table_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_table_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_column_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_column_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_part_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_part_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_part_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_part_info_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_def_sub_part_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_def_sub_part_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sub_part_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sub_part_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_constraint_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_constraint_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_foreign_key_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_foreign_key_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_foreign_key_column_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_foreign_key_column_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_temp_table_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_ori_schema_version_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sys_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_user_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_user_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sys_variable_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sys_variable_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_func_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_func_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_package_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_package_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_routine_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_routine_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_routine_param_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_routine_param_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_type_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_type_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_type_attr_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_type_attr_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_coll_type_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_coll_type_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_column_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_table_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_histogram_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_column_statistic_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_recyclebin_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_gc_partition_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_plan_baseline_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_plan_baseline_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sequence_object_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sequence_object_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_raid_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_server_log_meta_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_dtl_channel_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_dtl_memory_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_dtl_first_cached_buffer_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_dblink_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_dblink_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_partition_meta_table_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_role_grantee_map_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_role_grantee_map_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_keystore_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_keystore_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_deadlock_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_tablespace_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_tablespace_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_information_columns_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_pg_partition_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_user_failed_login_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_profile_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_profile_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_security_audit_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_security_audit_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_trigger_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_trigger_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_cluster_stats_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sstable_column_checksum_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_ps_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_ps_item_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_workarea_history_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_workarea_active_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_workarea_histogram_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_workarea_memory_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_security_audit_record_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sysauth_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sysauth_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_objauth_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_objauth_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_backup_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_backup_log_archive_status_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_backup_task_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_pg_backup_task_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_pg_backup_log_archive_status_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_server_backup_log_archive_status_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_error_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_timestamp_service_schema(share::schema::ObTableSchema &table_schema); + static int referential_constraints_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_table_modifications_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_backup_clean_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_restore_pg_info_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_object_type_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_trans_table_status_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_pg_log_archive_stat_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_plan_monitor_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_monitor_statname_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_open_cursor_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_backup_validation_task_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_pg_backup_validation_task_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_time_zone_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_time_zone_name_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_time_zone_transition_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_time_zone_transition_type_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_constraint_column_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_constraint_column_history_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_files_schema(share::schema::ObTableSchema &table_schema); + static int files_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_dependency_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_object_definition_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_reserved_table_mgr_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_backupset_history_mgr_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_backup_backupset_task_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_pg_backup_backupset_task_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_backup_backup_log_archive_status_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_global_transaction_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_table_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_column_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_database_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sequence_v2_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_part_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sub_part_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_package_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_meta_table_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_audit_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_plan_stat_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_plan_statistics_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_plan_cache_plan_explain_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sequence_value_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sequence_object_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_user_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_synonym_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_foreign_key_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_column_stat_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_column_statistic_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_partition_table_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_table_stat_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_recyclebin_agent_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_outline_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_routine_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tablegroup_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_privilege_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sys_parameter_stat_agent_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_table_index_agent_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_charset_agent_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_all_table_agent_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_collation_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_foreign_key_column_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_server_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_plan_cache_stat_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_processlist_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_session_wait_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_session_wait_history_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_memory_info_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_memstore_info_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_memstore_info_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_server_memory_info_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sesstat_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sysstat_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_system_event_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_memstore_allocator_info_agent_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_session_variable_ora_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_global_variable_ora_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_show_create_table_ora_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_show_create_procedure_ora_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_show_create_tablegroup_ora_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_privilege_grant_ora_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_table_column_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_trace_log_ora_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_concurrent_limit_sql_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_constraint_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_type_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_type_attr_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_coll_type_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_routine_param_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_data_type_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_table_sys_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sstable_checksum_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_partition_info_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_partition_meta_table_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_keystore_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_tablespace_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_profile_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_role_grantee_map_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_table_privilege_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_security_audit_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_security_audit_history_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_trigger_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_px_worker_stat_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_ps_stat_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_ps_item_info_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_parameter_stat_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_workarea_history_stat_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_workarea_active_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_workarea_histogram_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_workarea_memory_info_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_security_audit_record_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sysauth_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sysauth_history_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_objauth_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_objauth_history_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_error_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_table_mgr_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_def_sub_part_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_object_type_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_server_schema_info_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_dblink_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_dblink_history_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_plan_monitor_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_monitor_statname_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_lock_wait_stat_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_open_cursor_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_constraint_column_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_dependency_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_time_zone_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_time_zone_name_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_time_zone_transition_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_time_zone_transition_type_agent_schema(share::schema::ObTableSchema &table_schema); + static int tenant_virtual_object_definition_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_routine_param_sys_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_type_sys_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_type_attr_sys_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_coll_type_sys_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_package_sys_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_trigger_sys_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_routine_sys_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_global_transaction_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_acquired_snapshot_agent_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_table_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_column_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_database_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sequence_v2_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_part_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sub_part_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_package_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sequence_value_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sequence_object_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_user_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_synonym_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_foreign_key_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_column_stat_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_column_statistic_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_table_stat_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_recyclebin_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_routine_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tablegroup_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_foreign_key_column_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_constraint_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_type_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_type_attr_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_coll_type_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_routine_param_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_partition_meta_table_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_keystore_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_tablespace_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_profile_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_role_grantee_map_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_table_privilege_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_security_audit_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_security_audit_history_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_trigger_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_security_audit_record_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_sysauth_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_sysauth_history_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_objauth_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_objauth_history_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_error_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_def_sub_part_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_object_type_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_dblink_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_dblink_history_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_constraint_column_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_dependency_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_meta_table_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_time_zone_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_time_zone_name_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_time_zone_transition_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_tenant_time_zone_transition_type_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_res_mgr_plan_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_res_mgr_directive_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_trans_lock_stat_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_res_mgr_mapping_rule_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_res_mgr_consumer_group_real_agent_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_plan_cache_stat_schema(share::schema::ObTableSchema &table_schema); + static int gv_plan_cache_plan_stat_schema(share::schema::ObTableSchema &table_schema); + static int schemata_schema(share::schema::ObTableSchema &table_schema); + static int character_sets_schema(share::schema::ObTableSchema &table_schema); + static int global_variables_schema(share::schema::ObTableSchema &table_schema); + static int statistics_schema(share::schema::ObTableSchema &table_schema); + static int views_schema(share::schema::ObTableSchema &table_schema); + static int tables_schema(share::schema::ObTableSchema &table_schema); + static int collations_schema(share::schema::ObTableSchema &table_schema); + static int collation_character_set_applicability_schema(share::schema::ObTableSchema &table_schema); + static int processlist_schema(share::schema::ObTableSchema &table_schema); + static int key_column_usage_schema(share::schema::ObTableSchema &table_schema); + static int dba_outlines_schema(share::schema::ObTableSchema &table_schema); + static int engines_schema(share::schema::ObTableSchema &table_schema); + static int routines_schema(share::schema::ObTableSchema &table_schema); + static int gv_session_event_schema(share::schema::ObTableSchema &table_schema); + static int gv_session_wait_schema(share::schema::ObTableSchema &table_schema); + static int gv_session_wait_history_schema(share::schema::ObTableSchema &table_schema); + static int gv_system_event_schema(share::schema::ObTableSchema &table_schema); + static int gv_sesstat_schema(share::schema::ObTableSchema &table_schema); + static int gv_sysstat_schema(share::schema::ObTableSchema &table_schema); + static int v_statname_schema(share::schema::ObTableSchema &table_schema); + static int v_event_name_schema(share::schema::ObTableSchema &table_schema); + static int v_session_event_schema(share::schema::ObTableSchema &table_schema); + static int v_session_wait_schema(share::schema::ObTableSchema &table_schema); + static int v_session_wait_history_schema(share::schema::ObTableSchema &table_schema); + static int v_sesstat_schema(share::schema::ObTableSchema &table_schema); + static int v_sysstat_schema(share::schema::ObTableSchema &table_schema); + static int v_system_event_schema(share::schema::ObTableSchema &table_schema); + static int gv_sql_audit_schema(share::schema::ObTableSchema &table_schema); + static int gv_latch_schema(share::schema::ObTableSchema &table_schema); + static int gv_memory_schema(share::schema::ObTableSchema &table_schema); + static int v_memory_schema(share::schema::ObTableSchema &table_schema); + static int gv_memstore_schema(share::schema::ObTableSchema &table_schema); + static int v_memstore_schema(share::schema::ObTableSchema &table_schema); + static int gv_memstore_info_schema(share::schema::ObTableSchema &table_schema); + static int v_memstore_info_schema(share::schema::ObTableSchema &table_schema); + static int v_plan_cache_stat_schema(share::schema::ObTableSchema &table_schema); + static int v_plan_cache_plan_stat_schema(share::schema::ObTableSchema &table_schema); + static int gv_plan_cache_plan_explain_schema(share::schema::ObTableSchema &table_schema); + static int v_plan_cache_plan_explain_schema(share::schema::ObTableSchema &table_schema); + static int v_sql_audit_schema(share::schema::ObTableSchema &table_schema); + static int v_latch_schema(share::schema::ObTableSchema &table_schema); + static int gv_obrpc_outgoing_schema(share::schema::ObTableSchema &table_schema); + static int v_obrpc_outgoing_schema(share::schema::ObTableSchema &table_schema); + static int gv_obrpc_incoming_schema(share::schema::ObTableSchema &table_schema); + static int v_obrpc_incoming_schema(share::schema::ObTableSchema &table_schema); + static int gv_sql_schema(share::schema::ObTableSchema &table_schema); + static int v_sql_schema(share::schema::ObTableSchema &table_schema); + static int gv_sql_monitor_schema(share::schema::ObTableSchema &table_schema); + static int v_sql_monitor_schema(share::schema::ObTableSchema &table_schema); + static int gv_sql_plan_monitor_schema(share::schema::ObTableSchema &table_schema); + static int v_sql_plan_monitor_schema(share::schema::ObTableSchema &table_schema); + static int user_recyclebin_schema(share::schema::ObTableSchema &table_schema); + static int gv_outline_schema(share::schema::ObTableSchema &table_schema); + static int gv_concurrent_limit_sql_schema(share::schema::ObTableSchema &table_schema); + static int gv_sql_plan_statistics_schema(share::schema::ObTableSchema &table_schema); + static int v_sql_plan_statistics_schema(share::schema::ObTableSchema &table_schema); + static int gv_server_memstore_schema(share::schema::ObTableSchema &table_schema); + static int gv_unit_load_balance_event_history_schema(share::schema::ObTableSchema &table_schema); + static int gv_tenant_schema(share::schema::ObTableSchema &table_schema); + static int gv_database_schema(share::schema::ObTableSchema &table_schema); + static int gv_table_schema(share::schema::ObTableSchema &table_schema); + static int gv_unit_schema(share::schema::ObTableSchema &table_schema); + static int v_unit_schema(share::schema::ObTableSchema &table_schema); + static int gv_partition_schema(share::schema::ObTableSchema &table_schema); + static int v_partition_schema(share::schema::ObTableSchema &table_schema); + static int gv_lock_wait_stat_schema(share::schema::ObTableSchema &table_schema); + static int v_lock_wait_stat_schema(share::schema::ObTableSchema &table_schema); + static int time_zone_schema(share::schema::ObTableSchema &table_schema); + static int time_zone_name_schema(share::schema::ObTableSchema &table_schema); + static int time_zone_transition_schema(share::schema::ObTableSchema &table_schema); + static int time_zone_transition_type_schema(share::schema::ObTableSchema &table_schema); + static int gv_session_longops_schema(share::schema::ObTableSchema &table_schema); + static int v_session_longops_schema(share::schema::ObTableSchema &table_schema); + static int gv_tenant_memstore_allocator_info_schema(share::schema::ObTableSchema &table_schema); + static int v_tenant_memstore_allocator_info_schema(share::schema::ObTableSchema &table_schema); + static int gv_tenant_sequence_object_schema(share::schema::ObTableSchema &table_schema); + static int columns_schema(share::schema::ObTableSchema &table_schema); + static int gv_minor_merge_info_schema(share::schema::ObTableSchema &table_schema); + static int gv_tenant_px_worker_stat_schema(share::schema::ObTableSchema &table_schema); + static int v_tenant_px_worker_stat_schema(share::schema::ObTableSchema &table_schema); + static int gv_partition_audit_schema(share::schema::ObTableSchema &table_schema); + static int v_partition_audit_schema(share::schema::ObTableSchema &table_schema); + static int v_ob_cluster_schema(share::schema::ObTableSchema &table_schema); + static int gv_ps_stat_schema(share::schema::ObTableSchema &table_schema); + static int v_ps_stat_schema(share::schema::ObTableSchema &table_schema); + static int gv_ps_item_info_schema(share::schema::ObTableSchema &table_schema); + static int v_ps_item_info_schema(share::schema::ObTableSchema &table_schema); + static int gv_sql_workarea_schema(share::schema::ObTableSchema &table_schema); + static int v_sql_workarea_schema(share::schema::ObTableSchema &table_schema); + static int gv_sql_workarea_active_schema(share::schema::ObTableSchema &table_schema); + static int v_sql_workarea_active_schema(share::schema::ObTableSchema &table_schema); + static int gv_sql_workarea_histogram_schema(share::schema::ObTableSchema &table_schema); + static int v_sql_workarea_histogram_schema(share::schema::ObTableSchema &table_schema); + static int gv_ob_sql_workarea_memory_info_schema(share::schema::ObTableSchema &table_schema); + static int v_ob_sql_workarea_memory_info_schema(share::schema::ObTableSchema &table_schema); + static int gv_plan_cache_reference_info_schema(share::schema::ObTableSchema &table_schema); + static int v_plan_cache_reference_info_schema(share::schema::ObTableSchema &table_schema); + static int v_ob_timestamp_service_schema(share::schema::ObTableSchema &table_schema); + static int gv_sstable_schema(share::schema::ObTableSchema &table_schema); + static int v_sstable_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_archivelog_summary_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_job_details_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_set_details_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_set_expired_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_progress_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_archivelog_progress_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_clean_history_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_task_clean_history_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_restore_progress_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_restore_history_schema(share::schema::ObTableSchema &table_schema); + static int gv_server_schema_info_schema(share::schema::ObTableSchema &table_schema); + static int v_server_schema_info_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ckpt_history_schema(share::schema::ObTableSchema &table_schema); + static int gv_ob_trans_table_status_schema(share::schema::ObTableSchema &table_schema); + static int v_ob_trans_table_status_schema(share::schema::ObTableSchema &table_schema); + static int v_sql_monitor_statname_schema(share::schema::ObTableSchema &table_schema); + static int gv_merge_info_schema(share::schema::ObTableSchema &table_schema); + static int v_merge_info_schema(share::schema::ObTableSchema &table_schema); + static int gv_lock_schema(share::schema::ObTableSchema &table_schema); + static int v_lock_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_validation_job_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_validation_job_history_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_tenant_backup_validation_task_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_validation_task_history_schema(share::schema::ObTableSchema &table_schema); + static int v_restore_point_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_set_obsolete_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_backupset_job_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_backupset_job_history_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_backupset_task_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_backupset_task_history_schema(share::schema::ObTableSchema &table_schema); + static int cdb_ob_backup_backup_archivelog_summary_schema(share::schema::ObTableSchema &table_schema); + static int dba_synonyms_schema(share::schema::ObTableSchema &table_schema); + static int dba_objects_schema(share::schema::ObTableSchema &table_schema); + static int all_objects_schema(share::schema::ObTableSchema &table_schema); + static int user_objects_schema(share::schema::ObTableSchema &table_schema); + static int dba_sequences_schema(share::schema::ObTableSchema &table_schema); + static int all_sequences_schema(share::schema::ObTableSchema &table_schema); + static int user_sequences_schema(share::schema::ObTableSchema &table_schema); + static int dba_users_schema(share::schema::ObTableSchema &table_schema); + static int all_users_schema(share::schema::ObTableSchema &table_schema); + static int all_synonyms_schema(share::schema::ObTableSchema &table_schema); + static int user_synonyms_schema(share::schema::ObTableSchema &table_schema); + static int dba_ind_columns_schema(share::schema::ObTableSchema &table_schema); + static int all_ind_columns_schema(share::schema::ObTableSchema &table_schema); + static int user_ind_columns_schema(share::schema::ObTableSchema &table_schema); + static int dba_constraints_schema(share::schema::ObTableSchema &table_schema); + static int all_constraints_schema(share::schema::ObTableSchema &table_schema); + static int user_constraints_schema(share::schema::ObTableSchema &table_schema); + static int all_tab_cols_v_schema(share::schema::ObTableSchema &table_schema); + static int dba_tab_cols_v_schema(share::schema::ObTableSchema &table_schema); + static int user_tab_cols_v_schema(share::schema::ObTableSchema &table_schema); + static int all_tab_cols_schema(share::schema::ObTableSchema &table_schema); + static int dba_tab_cols_schema(share::schema::ObTableSchema &table_schema); + static int user_tab_cols_schema(share::schema::ObTableSchema &table_schema); + static int all_tab_columns_schema(share::schema::ObTableSchema &table_schema); + static int dba_tab_columns_schema(share::schema::ObTableSchema &table_schema); + static int user_tab_columns_schema(share::schema::ObTableSchema &table_schema); + static int all_tables_schema(share::schema::ObTableSchema &table_schema); + static int dba_tables_schema(share::schema::ObTableSchema &table_schema); + static int user_tables_schema(share::schema::ObTableSchema &table_schema); + static int dba_tab_comments_schema(share::schema::ObTableSchema &table_schema); + static int all_tab_comments_schema(share::schema::ObTableSchema &table_schema); + static int user_tab_comments_schema(share::schema::ObTableSchema &table_schema); + static int dba_col_comments_schema(share::schema::ObTableSchema &table_schema); + static int all_col_comments_schema(share::schema::ObTableSchema &table_schema); + static int user_col_comments_schema(share::schema::ObTableSchema &table_schema); + static int dba_indexes_schema(share::schema::ObTableSchema &table_schema); + static int all_indexes_schema(share::schema::ObTableSchema &table_schema); + static int user_indexes_schema(share::schema::ObTableSchema &table_schema); + static int dba_cons_columns_schema(share::schema::ObTableSchema &table_schema); + static int all_cons_columns_schema(share::schema::ObTableSchema &table_schema); + static int user_cons_columns_schema(share::schema::ObTableSchema &table_schema); + static int user_segments_schema(share::schema::ObTableSchema &table_schema); + static int dba_segments_schema(share::schema::ObTableSchema &table_schema); + static int dba_types_schema(share::schema::ObTableSchema &table_schema); + static int all_types_schema(share::schema::ObTableSchema &table_schema); + static int user_types_schema(share::schema::ObTableSchema &table_schema); + static int dba_type_attrs_schema(share::schema::ObTableSchema &table_schema); + static int all_type_attrs_schema(share::schema::ObTableSchema &table_schema); + static int user_type_attrs_schema(share::schema::ObTableSchema &table_schema); + static int dba_coll_types_schema(share::schema::ObTableSchema &table_schema); + static int all_coll_types_schema(share::schema::ObTableSchema &table_schema); + static int user_coll_types_schema(share::schema::ObTableSchema &table_schema); + static int dba_procedures_schema(share::schema::ObTableSchema &table_schema); + static int dba_arguments_schema(share::schema::ObTableSchema &table_schema); + static int dba_source_schema(share::schema::ObTableSchema &table_schema); + static int all_procedures_schema(share::schema::ObTableSchema &table_schema); + static int all_arguments_schema(share::schema::ObTableSchema &table_schema); + static int all_source_schema(share::schema::ObTableSchema &table_schema); + static int user_procedures_schema(share::schema::ObTableSchema &table_schema); + static int user_arguments_schema(share::schema::ObTableSchema &table_schema); + static int user_source_schema(share::schema::ObTableSchema &table_schema); + static int dba_part_key_columns_schema(share::schema::ObTableSchema &table_schema); + static int all_part_key_columns_schema(share::schema::ObTableSchema &table_schema); + static int user_part_key_columns_schema(share::schema::ObTableSchema &table_schema); + static int dba_subpart_key_columns_schema(share::schema::ObTableSchema &table_schema); + static int all_subpart_key_columns_schema(share::schema::ObTableSchema &table_schema); + static int user_subpart_key_columns_schema(share::schema::ObTableSchema &table_schema); + static int dba_views_schema(share::schema::ObTableSchema &table_schema); + static int all_views_schema(share::schema::ObTableSchema &table_schema); + static int user_views_schema(share::schema::ObTableSchema &table_schema); + static int all_tab_partitions_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_tab_subpartitions_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_part_tables_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_part_tables_ora_schema(share::schema::ObTableSchema &table_schema); + static int user_part_tables_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_tab_partitions_ora_schema(share::schema::ObTableSchema &table_schema); + static int user_tab_partitions_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_tab_subpartitions_ora_schema(share::schema::ObTableSchema &table_schema); + static int user_tab_subpartitions_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_subpartition_templates_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_subpartition_templates_ora_schema(share::schema::ObTableSchema &table_schema); + static int user_subpartition_templates_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_part_indexes_schema(share::schema::ObTableSchema &table_schema); + static int all_part_indexes_schema(share::schema::ObTableSchema &table_schema); + static int user_part_indexes_schema(share::schema::ObTableSchema &table_schema); + static int all_all_tables_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_all_tables_ora_schema(share::schema::ObTableSchema &table_schema); + static int user_all_tables_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_profiles_ora_schema(share::schema::ObTableSchema &table_schema); + static int user_profiles_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_profiles_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_mview_comments_ora_schema(share::schema::ObTableSchema &table_schema); + static int user_mview_comments_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_mview_comments_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_scheduler_program_args_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_scheduler_program_args_ora_schema(share::schema::ObTableSchema &table_schema); + static int user_scheduler_program_args_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_scheduler_job_args_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_scheduler_job_args_ora_schema(share::schema::ObTableSchema &table_schema); + static int user_scheduler_job_args_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_errors_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_errors_ora_schema(share::schema::ObTableSchema &table_schema); + static int user_errors_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_type_methods_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_type_methods_ora_schema(share::schema::ObTableSchema &table_schema); + static int user_type_methods_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_method_params_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_method_params_ora_schema(share::schema::ObTableSchema &table_schema); + static int user_method_params_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_tablespaces_ora_schema(share::schema::ObTableSchema &table_schema); + static int user_tablespaces_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_ind_expressions_schema(share::schema::ObTableSchema &table_schema); + static int user_ind_expressions_schema(share::schema::ObTableSchema &table_schema); + static int all_ind_expressions_schema(share::schema::ObTableSchema &table_schema); + static int all_ind_partitions_schema(share::schema::ObTableSchema &table_schema); + static int user_ind_partitions_schema(share::schema::ObTableSchema &table_schema); + static int dba_ind_partitions_schema(share::schema::ObTableSchema &table_schema); + static int dba_ind_subpartitions_schema(share::schema::ObTableSchema &table_schema); + static int all_ind_subpartitions_schema(share::schema::ObTableSchema &table_schema); + static int user_ind_subpartitions_schema(share::schema::ObTableSchema &table_schema); + static int dba_roles_schema(share::schema::ObTableSchema &table_schema); + static int dba_role_privs_schema(share::schema::ObTableSchema &table_schema); + static int user_role_privs_schema(share::schema::ObTableSchema &table_schema); + static int dba_tab_privs_schema(share::schema::ObTableSchema &table_schema); + static int all_tab_privs_schema(share::schema::ObTableSchema &table_schema); + static int user_tab_privs_schema(share::schema::ObTableSchema &table_schema); + static int dba_sys_privs_schema(share::schema::ObTableSchema &table_schema); + static int user_sys_privs_schema(share::schema::ObTableSchema &table_schema); + static int dba_col_privs_ora_schema(share::schema::ObTableSchema &table_schema); + static int user_col_privs_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_col_privs_ora_schema(share::schema::ObTableSchema &table_schema); + static int role_tab_privs_ora_schema(share::schema::ObTableSchema &table_schema); + static int role_sys_privs_ora_schema(share::schema::ObTableSchema &table_schema); + static int role_role_privs_ora_schema(share::schema::ObTableSchema &table_schema); + static int dictionary_ora_schema(share::schema::ObTableSchema &table_schema); + static int dict_ora_schema(share::schema::ObTableSchema &table_schema); + static int all_triggers_schema(share::schema::ObTableSchema &table_schema); + static int dba_triggers_schema(share::schema::ObTableSchema &table_schema); + static int user_triggers_schema(share::schema::ObTableSchema &table_schema); + static int all_dependencies_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_dependencies_ora_schema(share::schema::ObTableSchema &table_schema); + static int user_dependencies_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_rsrc_plans_schema(share::schema::ObTableSchema &table_schema); + static int dba_rsrc_plan_directives_schema(share::schema::ObTableSchema &table_schema); + static int dba_rsrc_group_mappings_schema(share::schema::ObTableSchema &table_schema); + static int dba_recyclebin_ora_schema(share::schema::ObTableSchema &table_schema); + static int user_recyclebin_ora_schema(share::schema::ObTableSchema &table_schema); + static int dba_rsrc_consumer_groups_schema(share::schema::ObTableSchema &table_schema); + static int gv_outline_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_sql_audit_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_sql_audit_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_instance_schema(share::schema::ObTableSchema &table_schema); + static int v_instance_schema(share::schema::ObTableSchema &table_schema); + static int gv_plan_cache_plan_stat_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_plan_cache_plan_stat_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_plan_cache_plan_explain_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_plan_cache_plan_explain_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_session_wait_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_session_wait_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_session_wait_history_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_session_wait_history_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_memory_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_memory_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_memstore_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_memstore_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_memstore_info_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_memstore_info_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_server_memstore_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_sesstat_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_sesstat_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_sysstat_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_sysstat_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_system_event_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_system_event_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_tenant_memstore_allocator_info_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_tenant_memstore_allocator_info_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_plan_cache_stat_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_plan_cache_stat_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_concurrent_limit_sql_ora_schema(share::schema::ObTableSchema &table_schema); + static int nls_session_parameters_ora_schema(share::schema::ObTableSchema &table_schema); + static int nls_instance_parameters_ora_schema(share::schema::ObTableSchema &table_schema); + static int nls_database_parameters_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_nls_parameters_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_version_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_tenant_px_worker_stat_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_tenant_px_worker_stat_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_ps_stat_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_ps_stat_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_ps_item_info_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_ps_item_info_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_sql_workarea_active_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_sql_workarea_active_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_sql_workarea_histogram_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_sql_workarea_histogram_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_ob_sql_workarea_memory_info_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_ob_sql_workarea_memory_info_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_plan_cache_reference_info_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_plan_cache_reference_info_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_sql_workarea_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_sql_workarea_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_sstable_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_sstable_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_server_schema_info_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_server_schema_info_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_sql_plan_monitor_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_sql_plan_monitor_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_sql_monitor_statname_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_lock_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_lock_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_open_cursor_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_open_cursor_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_timezone_names_ora_schema(share::schema::ObTableSchema &table_schema); + static int gv_global_transaction_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_global_transaction_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_restore_point_ora_schema(share::schema::ObTableSchema &table_schema); + static int v_rsrc_plan_ora_schema(share::schema::ObTableSchema &table_schema); + static int triggers_schema(share::schema::ObTableSchema &table_schema); + static int all_table_v2_history_idx_data_table_id_schema(share::schema::ObTableSchema &table_schema); + static int all_table_history_idx_data_table_id_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_plan_cache_stat_all_virtual_plan_cache_stat_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_session_event_all_virtual_session_event_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_session_wait_all_virtual_session_wait_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_session_wait_history_all_virtual_session_wait_history_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_system_event_all_virtual_system_event_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sesstat_all_virtual_sesstat_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sysstat_all_virtual_sysstat_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_audit_all_virtual_sql_audit_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_replica_task_all_virtual_replica_task_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_plan_monitor_all_virtual_sql_plan_monitor_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_audit_ora_all_virtual_sql_audit_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_plan_cache_stat_ora_all_virtual_plan_cache_stat_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_session_wait_ora_all_virtual_session_wait_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_session_wait_history_ora_all_virtual_session_wait_history_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sesstat_ora_all_virtual_sesstat_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sysstat_ora_all_virtual_sysstat_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_system_event_ora_all_virtual_system_event_i1_schema(share::schema::ObTableSchema &table_schema); + static int all_virtual_sql_plan_monitor_ora_all_virtual_sql_plan_monitor_i1_schema(share::schema::ObTableSchema &table_schema); private: DISALLOW_COPY_AND_ASSIGN(ObInnerTableSchema); }; -typedef int (*schema_create_func)(share::schema::ObTableSchema& table_schema); +typedef int (*schema_create_func)(share::schema::ObTableSchema &table_schema); -const schema_create_func core_table_schema_creators[] = { - ObInnerTableSchema::all_root_table_schema, - ObInnerTableSchema::all_table_schema, - ObInnerTableSchema::all_column_schema, - ObInnerTableSchema::all_ddl_operation_schema, - ObInnerTableSchema::all_table_v2_schema, - NULL, -}; +const schema_create_func core_table_schema_creators [] = { + ObInnerTableSchema::all_root_table_schema, + ObInnerTableSchema::all_table_schema, + ObInnerTableSchema::all_column_schema, + ObInnerTableSchema::all_ddl_operation_schema, + ObInnerTableSchema::all_table_v2_schema, + NULL,}; -const schema_create_func sys_table_schema_creators[] = { - ObInnerTableSchema::all_meta_table_schema, - ObInnerTableSchema::all_user_schema, - ObInnerTableSchema::all_user_history_schema, - ObInnerTableSchema::all_database_schema, - ObInnerTableSchema::all_database_history_schema, - ObInnerTableSchema::all_tablegroup_schema, - ObInnerTableSchema::all_tablegroup_history_schema, - ObInnerTableSchema::all_tenant_schema, - ObInnerTableSchema::all_tenant_history_schema, - ObInnerTableSchema::all_table_privilege_schema, - ObInnerTableSchema::all_table_privilege_history_schema, - ObInnerTableSchema::all_database_privilege_schema, - ObInnerTableSchema::all_database_privilege_history_schema, - ObInnerTableSchema::all_table_history_schema, - ObInnerTableSchema::all_column_history_schema, - ObInnerTableSchema::all_zone_schema, - ObInnerTableSchema::all_server_schema, - ObInnerTableSchema::all_sys_parameter_schema, - ObInnerTableSchema::tenant_parameter_schema, - ObInnerTableSchema::all_sys_variable_schema, - ObInnerTableSchema::all_sys_stat_schema, - ObInnerTableSchema::all_column_statistic_schema, - ObInnerTableSchema::all_unit_schema, - ObInnerTableSchema::all_unit_config_schema, - ObInnerTableSchema::all_resource_pool_schema, - ObInnerTableSchema::all_tenant_resource_usage_schema, - ObInnerTableSchema::all_sequence_schema, - ObInnerTableSchema::all_charset_schema, - ObInnerTableSchema::all_collation_schema, - ObInnerTableSchema::all_local_index_status_schema, - ObInnerTableSchema::all_dummy_schema, - ObInnerTableSchema::all_frozen_map_schema, - ObInnerTableSchema::all_clog_history_info_schema, - ObInnerTableSchema::all_clog_history_info_v2_schema, - ObInnerTableSchema::all_rootservice_event_history_schema, - ObInnerTableSchema::all_privilege_schema, - ObInnerTableSchema::all_outline_schema, - ObInnerTableSchema::all_outline_history_schema, - ObInnerTableSchema::all_election_event_history_schema, - ObInnerTableSchema::all_recyclebin_schema, - ObInnerTableSchema::all_part_schema, - ObInnerTableSchema::all_part_history_schema, - ObInnerTableSchema::all_sub_part_schema, - ObInnerTableSchema::all_sub_part_history_schema, - ObInnerTableSchema::all_part_info_schema, - ObInnerTableSchema::all_part_info_history_schema, - ObInnerTableSchema::all_def_sub_part_schema, - ObInnerTableSchema::all_def_sub_part_history_schema, - ObInnerTableSchema::all_server_event_history_schema, - ObInnerTableSchema::all_rootservice_job_schema, - ObInnerTableSchema::all_unit_load_history_schema, - ObInnerTableSchema::all_sys_variable_history_schema, - ObInnerTableSchema::all_restore_job_schema, - ObInnerTableSchema::all_restore_task_schema, - ObInnerTableSchema::all_restore_job_history_schema, - ObInnerTableSchema::all_time_zone_schema, - ObInnerTableSchema::all_time_zone_name_schema, - ObInnerTableSchema::all_time_zone_transition_schema, - ObInnerTableSchema::all_time_zone_transition_type_schema, - ObInnerTableSchema::all_ddl_id_schema, - ObInnerTableSchema::all_foreign_key_schema, - ObInnerTableSchema::all_foreign_key_history_schema, - ObInnerTableSchema::all_foreign_key_column_schema, - ObInnerTableSchema::all_foreign_key_column_history_schema, - ObInnerTableSchema::all_synonym_schema, - ObInnerTableSchema::all_synonym_history_schema, - ObInnerTableSchema::all_sequence_v2_schema, - ObInnerTableSchema::all_tenant_meta_table_schema, - ObInnerTableSchema::all_index_wait_transaction_status_schema, - ObInnerTableSchema::all_index_schedule_task_schema, - ObInnerTableSchema::all_index_checksum_schema, - ObInnerTableSchema::all_routine_schema, - ObInnerTableSchema::all_routine_history_schema, - ObInnerTableSchema::all_routine_param_schema, - ObInnerTableSchema::all_routine_param_history_schema, - ObInnerTableSchema::all_table_stat_schema, - ObInnerTableSchema::all_column_stat_schema, - ObInnerTableSchema::all_histogram_stat_schema, - ObInnerTableSchema::all_package_schema, - ObInnerTableSchema::all_package_history_schema, - ObInnerTableSchema::all_sql_execute_task_schema, - ObInnerTableSchema::all_index_build_stat_schema, - ObInnerTableSchema::all_build_index_param_schema, - ObInnerTableSchema::all_global_index_data_src_schema, - ObInnerTableSchema::all_acquired_snapshot_schema, - ObInnerTableSchema::all_immediate_effect_index_sstable_schema, - ObInnerTableSchema::all_sstable_checksum_schema, - ObInnerTableSchema::all_tenant_gc_partition_info_schema, - ObInnerTableSchema::all_constraint_schema, - ObInnerTableSchema::all_constraint_history_schema, - ObInnerTableSchema::all_ori_schema_version_schema, - ObInnerTableSchema::all_func_schema, - ObInnerTableSchema::all_func_history_schema, - ObInnerTableSchema::all_temp_table_schema, - ObInnerTableSchema::all_sstable_column_checksum_schema, - ObInnerTableSchema::all_sequence_object_schema, - ObInnerTableSchema::all_sequence_object_history_schema, - ObInnerTableSchema::all_sequence_value_schema, - ObInnerTableSchema::all_tenant_plan_baseline_schema, - ObInnerTableSchema::all_tenant_plan_baseline_history_schema, - ObInnerTableSchema::all_ddl_helper_schema, - ObInnerTableSchema::all_freeze_schema_version_schema, - ObInnerTableSchema::all_type_schema, - ObInnerTableSchema::all_type_history_schema, - ObInnerTableSchema::all_type_attr_schema, - ObInnerTableSchema::all_type_attr_history_schema, - ObInnerTableSchema::all_coll_type_schema, - ObInnerTableSchema::all_coll_type_history_schema, - ObInnerTableSchema::all_weak_read_service_schema, - ObInnerTableSchema::all_gts_schema, - ObInnerTableSchema::all_tenant_gts_schema, - ObInnerTableSchema::all_partition_member_list_schema, - ObInnerTableSchema::all_dblink_schema, - ObInnerTableSchema::all_dblink_history_schema, - ObInnerTableSchema::all_tenant_partition_meta_table_schema, - ObInnerTableSchema::all_tenant_role_grantee_map_schema, - ObInnerTableSchema::all_tenant_role_grantee_map_history_schema, - ObInnerTableSchema::all_tenant_keystore_schema, - ObInnerTableSchema::all_tenant_keystore_history_schema, - ObInnerTableSchema::all_tenant_tablespace_schema, - ObInnerTableSchema::all_tenant_tablespace_history_schema, - ObInnerTableSchema::all_tenant_user_failed_login_stat_schema, - ObInnerTableSchema::all_tenant_profile_schema, - ObInnerTableSchema::all_tenant_profile_history_schema, - ObInnerTableSchema::all_tenant_security_audit_schema, - ObInnerTableSchema::all_tenant_security_audit_history_schema, - ObInnerTableSchema::all_tenant_trigger_schema, - ObInnerTableSchema::all_tenant_trigger_history_schema, - ObInnerTableSchema::all_seed_parameter_schema, - ObInnerTableSchema::all_tenant_sstable_column_checksum_schema, - ObInnerTableSchema::all_tenant_security_audit_record_schema, - ObInnerTableSchema::all_tenant_sysauth_schema, - ObInnerTableSchema::all_tenant_sysauth_history_schema, - ObInnerTableSchema::all_tenant_objauth_schema, - ObInnerTableSchema::all_tenant_objauth_history_schema, - ObInnerTableSchema::all_tenant_backup_info_schema, - ObInnerTableSchema::all_restore_info_schema, - ObInnerTableSchema::all_tenant_backup_log_archive_status_schema, - ObInnerTableSchema::all_backup_log_archive_status_history_schema, - ObInnerTableSchema::all_tenant_backup_task_schema, - ObInnerTableSchema::all_backup_task_history_schema, - ObInnerTableSchema::all_tenant_pg_backup_task_schema, - ObInnerTableSchema::all_tenant_error_schema, - ObInnerTableSchema::all_server_recovery_status_schema, - ObInnerTableSchema::all_datafile_recovery_status_schema, - ObInnerTableSchema::all_tenant_backup_clean_info_schema, - ObInnerTableSchema::all_backup_clean_info_history_schema, - ObInnerTableSchema::all_backup_task_clean_history_schema, - ObInnerTableSchema::all_restore_progress_schema, - ObInnerTableSchema::all_restore_history_schema, - ObInnerTableSchema::all_tenant_restore_pg_info_schema, - ObInnerTableSchema::all_table_v2_history_schema, - ObInnerTableSchema::all_tenant_object_type_schema, - ObInnerTableSchema::all_tenant_object_type_history_schema, - ObInnerTableSchema::all_backup_validation_job_schema, - ObInnerTableSchema::all_backup_validation_job_history_schema, - ObInnerTableSchema::all_tenant_backup_validation_task_schema, - ObInnerTableSchema::all_backup_validation_task_history_schema, - ObInnerTableSchema::all_tenant_pg_backup_validation_task_schema, - ObInnerTableSchema::all_tenant_time_zone_schema, - ObInnerTableSchema::all_tenant_time_zone_name_schema, - ObInnerTableSchema::all_tenant_time_zone_transition_schema, - ObInnerTableSchema::all_tenant_time_zone_transition_type_schema, - ObInnerTableSchema::all_tenant_constraint_column_schema, - ObInnerTableSchema::all_tenant_constraint_column_history_schema, - ObInnerTableSchema::all_tenant_global_transaction_schema, - ObInnerTableSchema::all_tenant_dependency_schema, - ObInnerTableSchema::all_backup_backupset_job_schema, - ObInnerTableSchema::all_backup_backupset_job_history_schema, - ObInnerTableSchema::all_tenant_backup_backupset_task_schema, - ObInnerTableSchema::all_backup_backupset_task_history_schema, - ObInnerTableSchema::all_tenant_pg_backup_backupset_task_schema, - ObInnerTableSchema::all_tenant_backup_backup_log_archive_status_schema, - ObInnerTableSchema::all_backup_backup_log_archive_status_history_schema, - ObInnerTableSchema::all_res_mgr_plan_schema, - ObInnerTableSchema::all_res_mgr_directive_schema, - ObInnerTableSchema::all_res_mgr_mapping_rule_schema, - ObInnerTableSchema::all_res_mgr_consumer_group_schema, - NULL, -}; +const schema_create_func sys_table_schema_creators [] = { + ObInnerTableSchema::all_meta_table_schema, + ObInnerTableSchema::all_user_schema, + ObInnerTableSchema::all_user_history_schema, + ObInnerTableSchema::all_database_schema, + ObInnerTableSchema::all_database_history_schema, + ObInnerTableSchema::all_tablegroup_schema, + ObInnerTableSchema::all_tablegroup_history_schema, + ObInnerTableSchema::all_tenant_schema, + ObInnerTableSchema::all_tenant_history_schema, + ObInnerTableSchema::all_table_privilege_schema, + ObInnerTableSchema::all_table_privilege_history_schema, + ObInnerTableSchema::all_database_privilege_schema, + ObInnerTableSchema::all_database_privilege_history_schema, + ObInnerTableSchema::all_table_history_schema, + ObInnerTableSchema::all_column_history_schema, + ObInnerTableSchema::all_zone_schema, + ObInnerTableSchema::all_server_schema, + ObInnerTableSchema::all_sys_parameter_schema, + ObInnerTableSchema::tenant_parameter_schema, + ObInnerTableSchema::all_sys_variable_schema, + ObInnerTableSchema::all_sys_stat_schema, + ObInnerTableSchema::all_column_statistic_schema, + ObInnerTableSchema::all_unit_schema, + ObInnerTableSchema::all_unit_config_schema, + ObInnerTableSchema::all_resource_pool_schema, + ObInnerTableSchema::all_tenant_resource_usage_schema, + ObInnerTableSchema::all_sequence_schema, + ObInnerTableSchema::all_charset_schema, + ObInnerTableSchema::all_collation_schema, + ObInnerTableSchema::all_local_index_status_schema, + ObInnerTableSchema::all_dummy_schema, + ObInnerTableSchema::all_frozen_map_schema, + ObInnerTableSchema::all_clog_history_info_schema, + ObInnerTableSchema::all_clog_history_info_v2_schema, + ObInnerTableSchema::all_rootservice_event_history_schema, + ObInnerTableSchema::all_privilege_schema, + ObInnerTableSchema::all_outline_schema, + ObInnerTableSchema::all_outline_history_schema, + ObInnerTableSchema::all_election_event_history_schema, + ObInnerTableSchema::all_recyclebin_schema, + ObInnerTableSchema::all_part_schema, + ObInnerTableSchema::all_part_history_schema, + ObInnerTableSchema::all_sub_part_schema, + ObInnerTableSchema::all_sub_part_history_schema, + ObInnerTableSchema::all_part_info_schema, + ObInnerTableSchema::all_part_info_history_schema, + ObInnerTableSchema::all_def_sub_part_schema, + ObInnerTableSchema::all_def_sub_part_history_schema, + ObInnerTableSchema::all_server_event_history_schema, + ObInnerTableSchema::all_rootservice_job_schema, + ObInnerTableSchema::all_unit_load_history_schema, + ObInnerTableSchema::all_sys_variable_history_schema, + ObInnerTableSchema::all_restore_job_schema, + ObInnerTableSchema::all_restore_task_schema, + ObInnerTableSchema::all_restore_job_history_schema, + ObInnerTableSchema::all_time_zone_schema, + ObInnerTableSchema::all_time_zone_name_schema, + ObInnerTableSchema::all_time_zone_transition_schema, + ObInnerTableSchema::all_time_zone_transition_type_schema, + ObInnerTableSchema::all_ddl_id_schema, + ObInnerTableSchema::all_foreign_key_schema, + ObInnerTableSchema::all_foreign_key_history_schema, + ObInnerTableSchema::all_foreign_key_column_schema, + ObInnerTableSchema::all_foreign_key_column_history_schema, + ObInnerTableSchema::all_synonym_schema, + ObInnerTableSchema::all_synonym_history_schema, + ObInnerTableSchema::all_sequence_v2_schema, + ObInnerTableSchema::all_tenant_meta_table_schema, + ObInnerTableSchema::all_index_wait_transaction_status_schema, + ObInnerTableSchema::all_index_schedule_task_schema, + ObInnerTableSchema::all_index_checksum_schema, + ObInnerTableSchema::all_routine_schema, + ObInnerTableSchema::all_routine_history_schema, + ObInnerTableSchema::all_routine_param_schema, + ObInnerTableSchema::all_routine_param_history_schema, + ObInnerTableSchema::all_table_stat_schema, + ObInnerTableSchema::all_column_stat_schema, + ObInnerTableSchema::all_histogram_stat_schema, + ObInnerTableSchema::all_package_schema, + ObInnerTableSchema::all_package_history_schema, + ObInnerTableSchema::all_sql_execute_task_schema, + ObInnerTableSchema::all_index_build_stat_schema, + ObInnerTableSchema::all_build_index_param_schema, + ObInnerTableSchema::all_global_index_data_src_schema, + ObInnerTableSchema::all_acquired_snapshot_schema, + ObInnerTableSchema::all_immediate_effect_index_sstable_schema, + ObInnerTableSchema::all_sstable_checksum_schema, + ObInnerTableSchema::all_tenant_gc_partition_info_schema, + ObInnerTableSchema::all_constraint_schema, + ObInnerTableSchema::all_constraint_history_schema, + ObInnerTableSchema::all_ori_schema_version_schema, + ObInnerTableSchema::all_func_schema, + ObInnerTableSchema::all_func_history_schema, + ObInnerTableSchema::all_temp_table_schema, + ObInnerTableSchema::all_sstable_column_checksum_schema, + ObInnerTableSchema::all_sequence_object_schema, + ObInnerTableSchema::all_sequence_object_history_schema, + ObInnerTableSchema::all_sequence_value_schema, + ObInnerTableSchema::all_tenant_plan_baseline_schema, + ObInnerTableSchema::all_tenant_plan_baseline_history_schema, + ObInnerTableSchema::all_ddl_helper_schema, + ObInnerTableSchema::all_freeze_schema_version_schema, + ObInnerTableSchema::all_type_schema, + ObInnerTableSchema::all_type_history_schema, + ObInnerTableSchema::all_type_attr_schema, + ObInnerTableSchema::all_type_attr_history_schema, + ObInnerTableSchema::all_coll_type_schema, + ObInnerTableSchema::all_coll_type_history_schema, + ObInnerTableSchema::all_weak_read_service_schema, + ObInnerTableSchema::all_gts_schema, + ObInnerTableSchema::all_tenant_gts_schema, + ObInnerTableSchema::all_partition_member_list_schema, + ObInnerTableSchema::all_dblink_schema, + ObInnerTableSchema::all_dblink_history_schema, + ObInnerTableSchema::all_tenant_partition_meta_table_schema, + ObInnerTableSchema::all_tenant_role_grantee_map_schema, + ObInnerTableSchema::all_tenant_role_grantee_map_history_schema, + ObInnerTableSchema::all_tenant_keystore_schema, + ObInnerTableSchema::all_tenant_keystore_history_schema, + ObInnerTableSchema::all_tenant_tablespace_schema, + ObInnerTableSchema::all_tenant_tablespace_history_schema, + ObInnerTableSchema::all_tenant_user_failed_login_stat_schema, + ObInnerTableSchema::all_tenant_profile_schema, + ObInnerTableSchema::all_tenant_profile_history_schema, + ObInnerTableSchema::all_tenant_security_audit_schema, + ObInnerTableSchema::all_tenant_security_audit_history_schema, + ObInnerTableSchema::all_tenant_trigger_schema, + ObInnerTableSchema::all_tenant_trigger_history_schema, + ObInnerTableSchema::all_seed_parameter_schema, + ObInnerTableSchema::all_tenant_sstable_column_checksum_schema, + ObInnerTableSchema::all_tenant_security_audit_record_schema, + ObInnerTableSchema::all_tenant_sysauth_schema, + ObInnerTableSchema::all_tenant_sysauth_history_schema, + ObInnerTableSchema::all_tenant_objauth_schema, + ObInnerTableSchema::all_tenant_objauth_history_schema, + ObInnerTableSchema::all_tenant_backup_info_schema, + ObInnerTableSchema::all_restore_info_schema, + ObInnerTableSchema::all_tenant_backup_log_archive_status_schema, + ObInnerTableSchema::all_backup_log_archive_status_history_schema, + ObInnerTableSchema::all_tenant_backup_task_schema, + ObInnerTableSchema::all_backup_task_history_schema, + ObInnerTableSchema::all_tenant_pg_backup_task_schema, + ObInnerTableSchema::all_tenant_error_schema, + ObInnerTableSchema::all_server_recovery_status_schema, + ObInnerTableSchema::all_datafile_recovery_status_schema, + ObInnerTableSchema::all_tenant_backup_clean_info_schema, + ObInnerTableSchema::all_backup_clean_info_history_schema, + ObInnerTableSchema::all_backup_task_clean_history_schema, + ObInnerTableSchema::all_restore_progress_schema, + ObInnerTableSchema::all_restore_history_schema, + ObInnerTableSchema::all_tenant_restore_pg_info_schema, + ObInnerTableSchema::all_table_v2_history_schema, + ObInnerTableSchema::all_tenant_object_type_schema, + ObInnerTableSchema::all_tenant_object_type_history_schema, + ObInnerTableSchema::all_backup_validation_job_schema, + ObInnerTableSchema::all_backup_validation_job_history_schema, + ObInnerTableSchema::all_tenant_backup_validation_task_schema, + ObInnerTableSchema::all_backup_validation_task_history_schema, + ObInnerTableSchema::all_tenant_pg_backup_validation_task_schema, + ObInnerTableSchema::all_tenant_time_zone_schema, + ObInnerTableSchema::all_tenant_time_zone_name_schema, + ObInnerTableSchema::all_tenant_time_zone_transition_schema, + ObInnerTableSchema::all_tenant_time_zone_transition_type_schema, + ObInnerTableSchema::all_tenant_constraint_column_schema, + ObInnerTableSchema::all_tenant_constraint_column_history_schema, + ObInnerTableSchema::all_tenant_global_transaction_schema, + ObInnerTableSchema::all_tenant_dependency_schema, + ObInnerTableSchema::all_backup_backupset_job_schema, + ObInnerTableSchema::all_backup_backupset_job_history_schema, + ObInnerTableSchema::all_tenant_backup_backupset_task_schema, + ObInnerTableSchema::all_backup_backupset_task_history_schema, + ObInnerTableSchema::all_tenant_pg_backup_backupset_task_schema, + ObInnerTableSchema::all_tenant_backup_backup_log_archive_status_schema, + ObInnerTableSchema::all_backup_backup_log_archive_status_history_schema, + ObInnerTableSchema::all_res_mgr_plan_schema, + ObInnerTableSchema::all_res_mgr_directive_schema, + ObInnerTableSchema::all_res_mgr_mapping_rule_schema, + ObInnerTableSchema::all_res_mgr_consumer_group_schema, + NULL,}; -const schema_create_func virtual_table_schema_creators[] = { - ObInnerTableSchema::tenant_virtual_all_table_schema, - ObInnerTableSchema::tenant_virtual_table_column_schema, - ObInnerTableSchema::tenant_virtual_table_index_schema, - ObInnerTableSchema::tenant_virtual_show_create_database_schema, - ObInnerTableSchema::tenant_virtual_show_create_table_schema, - ObInnerTableSchema::tenant_virtual_session_variable_schema, - ObInnerTableSchema::tenant_virtual_privilege_grant_schema, - ObInnerTableSchema::all_virtual_processlist_schema, - ObInnerTableSchema::tenant_virtual_warning_schema, - ObInnerTableSchema::tenant_virtual_current_tenant_schema, - ObInnerTableSchema::tenant_virtual_database_status_schema, - ObInnerTableSchema::tenant_virtual_tenant_status_schema, - ObInnerTableSchema::tenant_virtual_interm_result_schema, - ObInnerTableSchema::tenant_virtual_partition_stat_schema, - ObInnerTableSchema::tenant_virtual_statname_schema, - ObInnerTableSchema::tenant_virtual_event_name_schema, - ObInnerTableSchema::tenant_virtual_global_variable_schema, - ObInnerTableSchema::tenant_virtual_show_tables_schema, - ObInnerTableSchema::tenant_virtual_show_create_procedure_schema, - ObInnerTableSchema::all_virtual_core_meta_table_schema, - ObInnerTableSchema::all_virtual_zone_stat_schema, - ObInnerTableSchema::all_virtual_plan_cache_stat_schema, - ObInnerTableSchema::all_virtual_plan_stat_schema, - ObInnerTableSchema::all_virtual_mem_leak_checker_info_schema, - ObInnerTableSchema::all_virtual_latch_schema, - ObInnerTableSchema::all_virtual_kvcache_info_schema, - ObInnerTableSchema::all_virtual_data_type_class_schema, - ObInnerTableSchema::all_virtual_data_type_schema, - ObInnerTableSchema::all_virtual_server_stat_schema, - ObInnerTableSchema::all_virtual_rebalance_task_stat_schema, - ObInnerTableSchema::all_virtual_session_event_schema, - ObInnerTableSchema::all_virtual_session_wait_schema, - ObInnerTableSchema::all_virtual_session_wait_history_schema, - ObInnerTableSchema::all_virtual_system_event_schema, - ObInnerTableSchema::all_virtual_tenant_memstore_info_schema, - ObInnerTableSchema::all_virtual_concurrency_object_pool_schema, - ObInnerTableSchema::all_virtual_sesstat_schema, - ObInnerTableSchema::all_virtual_sysstat_schema, - ObInnerTableSchema::all_virtual_storage_stat_schema, - ObInnerTableSchema::all_virtual_disk_stat_schema, - ObInnerTableSchema::all_virtual_memstore_info_schema, - ObInnerTableSchema::all_virtual_partition_info_schema, - ObInnerTableSchema::all_virtual_upgrade_inspection_schema, - ObInnerTableSchema::all_virtual_trans_stat_schema, - ObInnerTableSchema::all_virtual_trans_mgr_stat_schema, - ObInnerTableSchema::all_virtual_election_info_schema, - ObInnerTableSchema::all_virtual_election_mem_stat_schema, - ObInnerTableSchema::all_virtual_sql_audit_schema, - ObInnerTableSchema::all_virtual_trans_mem_stat_schema, - ObInnerTableSchema::all_virtual_partition_sstable_image_info_schema, - ObInnerTableSchema::all_virtual_core_root_table_schema, - ObInnerTableSchema::all_virtual_core_all_table_schema, - ObInnerTableSchema::all_virtual_core_column_table_schema, - ObInnerTableSchema::all_virtual_memory_info_schema, - ObInnerTableSchema::all_virtual_tenant_stat_schema, - ObInnerTableSchema::all_virtual_sys_parameter_stat_schema, - ObInnerTableSchema::all_virtual_partition_replay_status_schema, - ObInnerTableSchema::all_virtual_clog_stat_schema, - ObInnerTableSchema::all_virtual_trace_log_schema, - ObInnerTableSchema::all_virtual_engine_schema, - ObInnerTableSchema::all_virtual_proxy_server_stat_schema, - ObInnerTableSchema::all_virtual_proxy_sys_variable_schema, - ObInnerTableSchema::all_virtual_proxy_schema_schema, - ObInnerTableSchema::all_virtual_plan_cache_plan_explain_schema, - ObInnerTableSchema::all_virtual_obrpc_stat_schema, - ObInnerTableSchema::all_virtual_partition_sstable_merge_info_schema, - ObInnerTableSchema::all_virtual_sql_monitor_schema, - ObInnerTableSchema::tenant_virtual_outline_schema, - ObInnerTableSchema::tenant_virtual_concurrent_limit_sql_schema, - ObInnerTableSchema::all_virtual_sql_plan_statistics_schema, - ObInnerTableSchema::all_virtual_partition_sstable_macro_info_schema, - ObInnerTableSchema::all_virtual_proxy_partition_info_schema, - ObInnerTableSchema::all_virtual_proxy_partition_schema, - ObInnerTableSchema::all_virtual_proxy_sub_partition_schema, - ObInnerTableSchema::all_virtual_proxy_route_schema, - ObInnerTableSchema::all_virtual_rebalance_tenant_stat_schema, - ObInnerTableSchema::all_virtual_rebalance_unit_stat_schema, - ObInnerTableSchema::all_virtual_rebalance_replica_stat_schema, - ObInnerTableSchema::all_virtual_partition_amplification_stat_schema, - ObInnerTableSchema::all_virtual_election_event_history_schema, - ObInnerTableSchema::all_virtual_partition_store_info_schema, - ObInnerTableSchema::all_virtual_leader_stat_schema, - ObInnerTableSchema::all_virtual_partition_migration_status_schema, - ObInnerTableSchema::all_virtual_sys_task_status_schema, - ObInnerTableSchema::all_virtual_macro_block_marker_status_schema, - ObInnerTableSchema::all_virtual_server_clog_stat_schema, - ObInnerTableSchema::all_virtual_rootservice_stat_schema, - ObInnerTableSchema::all_virtual_election_priority_schema, - ObInnerTableSchema::all_virtual_tenant_disk_stat_schema, - ObInnerTableSchema::all_virtual_rebalance_map_stat_schema, - ObInnerTableSchema::all_virtual_rebalance_map_item_stat_schema, - ObInnerTableSchema::all_virtual_io_stat_schema, - ObInnerTableSchema::all_virtual_long_ops_status_schema, - ObInnerTableSchema::all_virtual_rebalance_unit_migrate_stat_schema, - ObInnerTableSchema::all_virtual_rebalance_unit_distribution_stat_schema, - ObInnerTableSchema::all_virtual_server_object_pool_schema, - ObInnerTableSchema::all_virtual_trans_lock_stat_schema, - ObInnerTableSchema::all_virtual_election_group_info_schema, - ObInnerTableSchema::tenant_virtual_show_create_tablegroup_schema, - ObInnerTableSchema::all_virtual_server_blacklist_schema, - ObInnerTableSchema::all_virtual_partition_split_info_schema, - ObInnerTableSchema::all_virtual_trans_result_info_stat_schema, - ObInnerTableSchema::all_virtual_duplicate_partition_mgr_stat_schema, - ObInnerTableSchema::all_virtual_tenant_parameter_stat_schema, - ObInnerTableSchema::all_virtual_server_schema_info_schema, - ObInnerTableSchema::all_virtual_memory_context_stat_schema, - ObInnerTableSchema::all_virtual_dump_tenant_info_schema, - ObInnerTableSchema::all_virtual_tenant_parameter_info_schema, - ObInnerTableSchema::all_virtual_dag_warning_history_schema, - ObInnerTableSchema::session_variables_schema, - ObInnerTableSchema::table_privileges_schema, - ObInnerTableSchema::user_privileges_schema, - ObInnerTableSchema::schema_privileges_schema, - ObInnerTableSchema::table_constraints_schema, - ObInnerTableSchema::global_status_schema, - ObInnerTableSchema::partitions_schema, - ObInnerTableSchema::session_status_schema, - ObInnerTableSchema::user_schema, - ObInnerTableSchema::db_schema, - ObInnerTableSchema::all_virtual_server_memory_info_schema, - ObInnerTableSchema::all_virtual_partition_table_schema, - ObInnerTableSchema::all_virtual_lock_wait_stat_schema, - ObInnerTableSchema::all_virtual_partition_item_schema, - ObInnerTableSchema::all_virtual_replica_task_schema, - ObInnerTableSchema::all_virtual_partition_location_schema, - ObInnerTableSchema::proc_schema, - ObInnerTableSchema::tenant_virtual_collation_schema, - ObInnerTableSchema::tenant_virtual_charset_schema, - ObInnerTableSchema::all_virtual_tenant_memstore_allocator_info_schema, - ObInnerTableSchema::all_virtual_table_mgr_schema, - ObInnerTableSchema::all_virtual_meta_table_schema, - ObInnerTableSchema::all_virtual_freeze_info_schema, - ObInnerTableSchema::parameters_schema, - ObInnerTableSchema::all_virtual_bad_block_table_schema, - ObInnerTableSchema::all_virtual_px_worker_stat_schema, - ObInnerTableSchema::all_virtual_trans_audit_schema, - ObInnerTableSchema::all_virtual_trans_sql_audit_schema, - ObInnerTableSchema::all_virtual_weak_read_stat_schema, - ObInnerTableSchema::all_virtual_partition_audit_schema, - ObInnerTableSchema::all_virtual_sequence_v2_schema, - ObInnerTableSchema::all_virtual_sequence_value_schema, - ObInnerTableSchema::all_virtual_cluster_schema, - ObInnerTableSchema::all_virtual_partition_table_store_stat_schema, - ObInnerTableSchema::all_virtual_ddl_operation_schema, - ObInnerTableSchema::all_virtual_outline_schema, - ObInnerTableSchema::all_virtual_outline_history_schema, - ObInnerTableSchema::all_virtual_synonym_schema, - ObInnerTableSchema::all_virtual_synonym_history_schema, - ObInnerTableSchema::all_virtual_database_privilege_schema, - ObInnerTableSchema::all_virtual_database_privilege_history_schema, - ObInnerTableSchema::all_virtual_table_privilege_schema, - ObInnerTableSchema::all_virtual_table_privilege_history_schema, - ObInnerTableSchema::all_virtual_database_schema, - ObInnerTableSchema::all_virtual_database_history_schema, - ObInnerTableSchema::all_virtual_tablegroup_schema, - ObInnerTableSchema::all_virtual_tablegroup_history_schema, - ObInnerTableSchema::all_virtual_table_schema, - ObInnerTableSchema::all_virtual_table_history_schema, - ObInnerTableSchema::all_virtual_column_schema, - ObInnerTableSchema::all_virtual_column_history_schema, - ObInnerTableSchema::all_virtual_part_schema, - ObInnerTableSchema::all_virtual_part_history_schema, - ObInnerTableSchema::all_virtual_part_info_schema, - ObInnerTableSchema::all_virtual_part_info_history_schema, - ObInnerTableSchema::all_virtual_def_sub_part_schema, - ObInnerTableSchema::all_virtual_def_sub_part_history_schema, - ObInnerTableSchema::all_virtual_sub_part_schema, - ObInnerTableSchema::all_virtual_sub_part_history_schema, - ObInnerTableSchema::all_virtual_constraint_schema, - ObInnerTableSchema::all_virtual_constraint_history_schema, - ObInnerTableSchema::all_virtual_foreign_key_schema, - ObInnerTableSchema::all_virtual_foreign_key_history_schema, - ObInnerTableSchema::all_virtual_foreign_key_column_schema, - ObInnerTableSchema::all_virtual_foreign_key_column_history_schema, - ObInnerTableSchema::all_virtual_temp_table_schema, - ObInnerTableSchema::all_virtual_ori_schema_version_schema, - ObInnerTableSchema::all_virtual_sys_stat_schema, - ObInnerTableSchema::all_virtual_user_schema, - ObInnerTableSchema::all_virtual_user_history_schema, - ObInnerTableSchema::all_virtual_sys_variable_schema, - ObInnerTableSchema::all_virtual_sys_variable_history_schema, - ObInnerTableSchema::all_virtual_func_schema, - ObInnerTableSchema::all_virtual_func_history_schema, - ObInnerTableSchema::all_virtual_package_schema, - ObInnerTableSchema::all_virtual_package_history_schema, - ObInnerTableSchema::all_virtual_routine_schema, - ObInnerTableSchema::all_virtual_routine_history_schema, - ObInnerTableSchema::all_virtual_routine_param_schema, - ObInnerTableSchema::all_virtual_routine_param_history_schema, - ObInnerTableSchema::all_virtual_type_schema, - ObInnerTableSchema::all_virtual_type_history_schema, - ObInnerTableSchema::all_virtual_type_attr_schema, - ObInnerTableSchema::all_virtual_type_attr_history_schema, - ObInnerTableSchema::all_virtual_coll_type_schema, - ObInnerTableSchema::all_virtual_coll_type_history_schema, - ObInnerTableSchema::all_virtual_column_stat_schema, - ObInnerTableSchema::all_virtual_table_stat_schema, - ObInnerTableSchema::all_virtual_histogram_stat_schema, - ObInnerTableSchema::all_virtual_column_statistic_schema, - ObInnerTableSchema::all_virtual_recyclebin_schema, - ObInnerTableSchema::all_virtual_tenant_gc_partition_info_schema, - ObInnerTableSchema::all_virtual_tenant_plan_baseline_schema, - ObInnerTableSchema::all_virtual_tenant_plan_baseline_history_schema, - ObInnerTableSchema::all_virtual_sequence_object_schema, - ObInnerTableSchema::all_virtual_sequence_object_history_schema, - ObInnerTableSchema::all_virtual_raid_stat_schema, - ObInnerTableSchema::all_virtual_server_log_meta_schema, - ObInnerTableSchema::all_virtual_dtl_channel_schema, - ObInnerTableSchema::all_virtual_dtl_memory_schema, - ObInnerTableSchema::all_virtual_dtl_first_cached_buffer_schema, - ObInnerTableSchema::all_virtual_dblink_schema, - ObInnerTableSchema::all_virtual_dblink_history_schema, - ObInnerTableSchema::all_virtual_tenant_partition_meta_table_schema, - ObInnerTableSchema::all_virtual_tenant_role_grantee_map_schema, - ObInnerTableSchema::all_virtual_tenant_role_grantee_map_history_schema, - ObInnerTableSchema::all_virtual_tenant_keystore_schema, - ObInnerTableSchema::all_virtual_tenant_keystore_history_schema, - ObInnerTableSchema::all_virtual_deadlock_stat_schema, - ObInnerTableSchema::all_virtual_tenant_tablespace_schema, - ObInnerTableSchema::all_virtual_tenant_tablespace_history_schema, - ObInnerTableSchema::all_virtual_information_columns_schema, - ObInnerTableSchema::all_virtual_pg_partition_info_schema, - ObInnerTableSchema::all_virtual_tenant_user_failed_login_stat_schema, - ObInnerTableSchema::all_virtual_tenant_profile_schema, - ObInnerTableSchema::all_virtual_tenant_profile_history_schema, - ObInnerTableSchema::all_virtual_security_audit_schema, - ObInnerTableSchema::all_virtual_security_audit_history_schema, - ObInnerTableSchema::all_virtual_trigger_schema, - ObInnerTableSchema::all_virtual_trigger_history_schema, - ObInnerTableSchema::all_virtual_cluster_stats_schema, - ObInnerTableSchema::all_virtual_sstable_column_checksum_schema, - ObInnerTableSchema::all_virtual_ps_stat_schema, - ObInnerTableSchema::all_virtual_ps_item_info_schema, - ObInnerTableSchema::all_virtual_sql_workarea_history_stat_schema, - ObInnerTableSchema::all_virtual_sql_workarea_active_schema, - ObInnerTableSchema::all_virtual_sql_workarea_histogram_schema, - ObInnerTableSchema::all_virtual_sql_workarea_memory_info_schema, - ObInnerTableSchema::all_virtual_security_audit_record_schema, - ObInnerTableSchema::all_virtual_sysauth_schema, - ObInnerTableSchema::all_virtual_sysauth_history_schema, - ObInnerTableSchema::all_virtual_objauth_schema, - ObInnerTableSchema::all_virtual_objauth_history_schema, - ObInnerTableSchema::all_virtual_backup_info_schema, - ObInnerTableSchema::all_virtual_backup_log_archive_status_schema, - ObInnerTableSchema::all_virtual_backup_task_schema, - ObInnerTableSchema::all_virtual_pg_backup_task_schema, - ObInnerTableSchema::all_virtual_pg_backup_log_archive_status_schema, - ObInnerTableSchema::all_virtual_server_backup_log_archive_status_schema, - ObInnerTableSchema::all_virtual_error_schema, - ObInnerTableSchema::all_virtual_timestamp_service_schema, - ObInnerTableSchema::referential_constraints_schema, - ObInnerTableSchema::all_virtual_table_modifications_schema, - ObInnerTableSchema::all_virtual_backup_clean_info_schema, - ObInnerTableSchema::all_virtual_restore_pg_info_schema, - ObInnerTableSchema::all_virtual_object_type_schema, - ObInnerTableSchema::all_virtual_trans_table_status_schema, - ObInnerTableSchema::all_virtual_pg_log_archive_stat_schema, - ObInnerTableSchema::all_virtual_sql_plan_monitor_schema, - ObInnerTableSchema::all_virtual_sql_monitor_statname_schema, - ObInnerTableSchema::all_virtual_open_cursor_schema, - ObInnerTableSchema::all_virtual_backup_validation_task_schema, - ObInnerTableSchema::all_virtual_pg_backup_validation_task_schema, - ObInnerTableSchema::all_virtual_time_zone_schema, - ObInnerTableSchema::all_virtual_time_zone_name_schema, - ObInnerTableSchema::all_virtual_time_zone_transition_schema, - ObInnerTableSchema::all_virtual_time_zone_transition_type_schema, - ObInnerTableSchema::all_virtual_constraint_column_schema, - ObInnerTableSchema::all_virtual_constraint_column_history_schema, - ObInnerTableSchema::all_virtual_files_schema, - ObInnerTableSchema::files_schema, - ObInnerTableSchema::all_virtual_dependency_schema, - ObInnerTableSchema::tenant_virtual_object_definition_schema, - ObInnerTableSchema::all_virtual_reserved_table_mgr_schema, - ObInnerTableSchema::all_virtual_backupset_history_mgr_schema, - ObInnerTableSchema::all_virtual_backup_backupset_task_schema, - ObInnerTableSchema::all_virtual_pg_backup_backupset_task_schema, - ObInnerTableSchema::all_virtual_backup_backup_log_archive_status_schema, - ObInnerTableSchema::all_virtual_global_transaction_schema, - ObInnerTableSchema::all_virtual_table_agent_schema, - ObInnerTableSchema::all_virtual_column_agent_schema, - ObInnerTableSchema::all_virtual_database_agent_schema, - ObInnerTableSchema::all_virtual_sequence_v2_agent_schema, - ObInnerTableSchema::all_virtual_part_agent_schema, - ObInnerTableSchema::all_virtual_sub_part_agent_schema, - ObInnerTableSchema::all_virtual_package_agent_schema, - ObInnerTableSchema::all_virtual_tenant_meta_table_agent_schema, - ObInnerTableSchema::all_virtual_sql_audit_ora_schema, - ObInnerTableSchema::all_virtual_plan_stat_ora_schema, - ObInnerTableSchema::all_virtual_sql_plan_statistics_agent_schema, - ObInnerTableSchema::all_virtual_plan_cache_plan_explain_ora_schema, - ObInnerTableSchema::all_virtual_sequence_value_agent_schema, - ObInnerTableSchema::all_virtual_sequence_object_agent_schema, - ObInnerTableSchema::all_virtual_user_agent_schema, - ObInnerTableSchema::all_virtual_synonym_agent_schema, - ObInnerTableSchema::all_virtual_foreign_key_agent_schema, - ObInnerTableSchema::all_virtual_column_stat_agent_schema, - ObInnerTableSchema::all_virtual_column_statistic_agent_schema, - ObInnerTableSchema::all_virtual_partition_table_agent_schema, - ObInnerTableSchema::all_virtual_table_stat_agent_schema, - ObInnerTableSchema::all_virtual_recyclebin_agent_schema, - ObInnerTableSchema::tenant_virtual_outline_agent_schema, - ObInnerTableSchema::all_virtual_routine_agent_schema, - ObInnerTableSchema::all_virtual_tablegroup_agent_schema, - ObInnerTableSchema::all_virtual_privilege_agent_schema, - ObInnerTableSchema::all_virtual_sys_parameter_stat_agent_schema, - ObInnerTableSchema::tenant_virtual_table_index_agent_schema, - ObInnerTableSchema::tenant_virtual_charset_agent_schema, - ObInnerTableSchema::tenant_virtual_all_table_agent_schema, - ObInnerTableSchema::tenant_virtual_collation_agent_schema, - ObInnerTableSchema::all_virtual_foreign_key_column_agent_schema, - ObInnerTableSchema::all_virtual_server_agent_schema, - ObInnerTableSchema::all_virtual_plan_cache_stat_ora_schema, - ObInnerTableSchema::all_virtual_processlist_ora_schema, - ObInnerTableSchema::all_virtual_session_wait_ora_schema, - ObInnerTableSchema::all_virtual_session_wait_history_ora_schema, - ObInnerTableSchema::all_virtual_memory_info_ora_schema, - ObInnerTableSchema::all_virtual_tenant_memstore_info_ora_schema, - ObInnerTableSchema::all_virtual_memstore_info_ora_schema, - ObInnerTableSchema::all_virtual_server_memory_info_agent_schema, - ObInnerTableSchema::all_virtual_sesstat_ora_schema, - ObInnerTableSchema::all_virtual_sysstat_ora_schema, - ObInnerTableSchema::all_virtual_system_event_ora_schema, - ObInnerTableSchema::all_virtual_tenant_memstore_allocator_info_agent_schema, - ObInnerTableSchema::tenant_virtual_session_variable_ora_schema, - ObInnerTableSchema::tenant_virtual_global_variable_ora_schema, - ObInnerTableSchema::tenant_virtual_show_create_table_ora_schema, - ObInnerTableSchema::tenant_virtual_show_create_procedure_ora_schema, - ObInnerTableSchema::tenant_virtual_show_create_tablegroup_ora_schema, - ObInnerTableSchema::tenant_virtual_privilege_grant_ora_schema, - ObInnerTableSchema::tenant_virtual_table_column_ora_schema, - ObInnerTableSchema::all_virtual_trace_log_ora_schema, - ObInnerTableSchema::tenant_virtual_concurrent_limit_sql_agent_schema, - ObInnerTableSchema::all_virtual_constraint_agent_schema, - ObInnerTableSchema::all_virtual_type_agent_schema, - ObInnerTableSchema::all_virtual_type_attr_agent_schema, - ObInnerTableSchema::all_virtual_coll_type_agent_schema, - ObInnerTableSchema::all_virtual_routine_param_agent_schema, - ObInnerTableSchema::all_virtual_data_type_ora_schema, - ObInnerTableSchema::all_virtual_table_sys_agent_schema, - ObInnerTableSchema::all_virtual_sstable_checksum_agent_schema, - ObInnerTableSchema::all_virtual_partition_info_agent_schema, - ObInnerTableSchema::all_virtual_tenant_partition_meta_table_agent_schema, - ObInnerTableSchema::all_virtual_tenant_keystore_agent_schema, - ObInnerTableSchema::all_virtual_tenant_tablespace_agent_schema, - ObInnerTableSchema::all_virtual_tenant_profile_agent_schema, - ObInnerTableSchema::all_virtual_tenant_role_grantee_map_agent_schema, - ObInnerTableSchema::all_virtual_table_privilege_agent_schema, - ObInnerTableSchema::all_virtual_security_audit_agent_schema, - ObInnerTableSchema::all_virtual_security_audit_history_agent_schema, - ObInnerTableSchema::all_virtual_trigger_agent_schema, - ObInnerTableSchema::all_virtual_px_worker_stat_ora_schema, - ObInnerTableSchema::all_virtual_ps_stat_ora_schema, - ObInnerTableSchema::all_virtual_ps_item_info_ora_schema, - ObInnerTableSchema::all_virtual_tenant_parameter_stat_ora_schema, - ObInnerTableSchema::all_virtual_sql_workarea_history_stat_agent_schema, - ObInnerTableSchema::all_virtual_sql_workarea_active_agent_schema, - ObInnerTableSchema::all_virtual_sql_workarea_histogram_agent_schema, - ObInnerTableSchema::all_virtual_sql_workarea_memory_info_agent_schema, - ObInnerTableSchema::all_virtual_security_audit_record_agent_schema, - ObInnerTableSchema::all_virtual_sysauth_agent_schema, - ObInnerTableSchema::all_virtual_sysauth_history_agent_schema, - ObInnerTableSchema::all_virtual_objauth_agent_schema, - ObInnerTableSchema::all_virtual_objauth_history_agent_schema, - ObInnerTableSchema::all_virtual_error_agent_schema, - ObInnerTableSchema::all_virtual_table_mgr_agent_schema, - ObInnerTableSchema::all_virtual_def_sub_part_agent_schema, - ObInnerTableSchema::all_virtual_object_type_agent_schema, - ObInnerTableSchema::all_virtual_server_schema_info_agent_schema, - ObInnerTableSchema::all_virtual_dblink_agent_schema, - ObInnerTableSchema::all_virtual_dblink_history_agent_schema, - ObInnerTableSchema::all_virtual_sql_plan_monitor_ora_schema, - ObInnerTableSchema::all_virtual_sql_monitor_statname_ora_schema, - ObInnerTableSchema::all_virtual_lock_wait_stat_ora_schema, - ObInnerTableSchema::all_virtual_open_cursor_ora_schema, - ObInnerTableSchema::all_virtual_constraint_column_agent_schema, - ObInnerTableSchema::all_virtual_dependency_agent_schema, - ObInnerTableSchema::all_virtual_tenant_time_zone_agent_schema, - ObInnerTableSchema::all_virtual_tenant_time_zone_name_agent_schema, - ObInnerTableSchema::all_virtual_tenant_time_zone_transition_agent_schema, - ObInnerTableSchema::all_virtual_tenant_time_zone_transition_type_agent_schema, - ObInnerTableSchema::tenant_virtual_object_definition_ora_schema, - ObInnerTableSchema::all_virtual_routine_param_sys_agent_schema, - ObInnerTableSchema::all_virtual_type_sys_agent_schema, - ObInnerTableSchema::all_virtual_type_attr_sys_agent_schema, - ObInnerTableSchema::all_virtual_coll_type_sys_agent_schema, - ObInnerTableSchema::all_virtual_package_sys_agent_schema, - ObInnerTableSchema::all_virtual_tenant_trigger_sys_agent_schema, - ObInnerTableSchema::all_virtual_routine_sys_agent_schema, - ObInnerTableSchema::all_virtual_tenant_global_transaction_agent_schema, - ObInnerTableSchema::all_virtual_acquired_snapshot_agent_schema, - ObInnerTableSchema::all_virtual_table_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_column_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_database_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_sequence_v2_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_part_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_sub_part_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_package_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_sequence_value_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_sequence_object_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_user_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_synonym_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_foreign_key_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_column_stat_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_column_statistic_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_table_stat_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_recyclebin_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_routine_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tablegroup_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_foreign_key_column_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_constraint_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_type_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_type_attr_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_coll_type_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_routine_param_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_partition_meta_table_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_keystore_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_tablespace_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_profile_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_role_grantee_map_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_table_privilege_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_security_audit_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_security_audit_history_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_trigger_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_security_audit_record_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_sysauth_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_sysauth_history_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_objauth_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_objauth_history_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_error_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_def_sub_part_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_object_type_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_dblink_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_dblink_history_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_constraint_column_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_dependency_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_meta_table_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_time_zone_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_time_zone_name_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_time_zone_transition_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_tenant_time_zone_transition_type_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_res_mgr_plan_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_res_mgr_directive_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_trans_lock_stat_ora_schema, - ObInnerTableSchema::all_virtual_res_mgr_mapping_rule_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_res_mgr_consumer_group_real_agent_ora_schema, - ObInnerTableSchema::all_virtual_plan_cache_stat_all_virtual_plan_cache_stat_i1_schema, - ObInnerTableSchema::all_virtual_session_event_all_virtual_session_event_i1_schema, - ObInnerTableSchema::all_virtual_session_wait_all_virtual_session_wait_i1_schema, - ObInnerTableSchema::all_virtual_session_wait_history_all_virtual_session_wait_history_i1_schema, - ObInnerTableSchema::all_virtual_system_event_all_virtual_system_event_i1_schema, - ObInnerTableSchema::all_virtual_sesstat_all_virtual_sesstat_i1_schema, - ObInnerTableSchema::all_virtual_sysstat_all_virtual_sysstat_i1_schema, - ObInnerTableSchema::all_virtual_sql_audit_all_virtual_sql_audit_i1_schema, - ObInnerTableSchema::all_virtual_replica_task_all_virtual_replica_task_i1_schema, - ObInnerTableSchema::all_virtual_sql_plan_monitor_all_virtual_sql_plan_monitor_i1_schema, - ObInnerTableSchema::all_virtual_sql_audit_ora_all_virtual_sql_audit_i1_schema, - ObInnerTableSchema::all_virtual_plan_cache_stat_ora_all_virtual_plan_cache_stat_i1_schema, - ObInnerTableSchema::all_virtual_session_wait_ora_all_virtual_session_wait_i1_schema, - ObInnerTableSchema::all_virtual_session_wait_history_ora_all_virtual_session_wait_history_i1_schema, - ObInnerTableSchema::all_virtual_sesstat_ora_all_virtual_sesstat_i1_schema, - ObInnerTableSchema::all_virtual_sysstat_ora_all_virtual_sysstat_i1_schema, - ObInnerTableSchema::all_virtual_system_event_ora_all_virtual_system_event_i1_schema, - ObInnerTableSchema::all_virtual_sql_plan_monitor_ora_all_virtual_sql_plan_monitor_i1_schema, - NULL, -}; +const schema_create_func virtual_table_schema_creators [] = { + ObInnerTableSchema::tenant_virtual_all_table_schema, + ObInnerTableSchema::tenant_virtual_table_column_schema, + ObInnerTableSchema::tenant_virtual_table_index_schema, + ObInnerTableSchema::tenant_virtual_show_create_database_schema, + ObInnerTableSchema::tenant_virtual_show_create_table_schema, + ObInnerTableSchema::tenant_virtual_session_variable_schema, + ObInnerTableSchema::tenant_virtual_privilege_grant_schema, + ObInnerTableSchema::all_virtual_processlist_schema, + ObInnerTableSchema::tenant_virtual_warning_schema, + ObInnerTableSchema::tenant_virtual_current_tenant_schema, + ObInnerTableSchema::tenant_virtual_database_status_schema, + ObInnerTableSchema::tenant_virtual_tenant_status_schema, + ObInnerTableSchema::tenant_virtual_interm_result_schema, + ObInnerTableSchema::tenant_virtual_partition_stat_schema, + ObInnerTableSchema::tenant_virtual_statname_schema, + ObInnerTableSchema::tenant_virtual_event_name_schema, + ObInnerTableSchema::tenant_virtual_global_variable_schema, + ObInnerTableSchema::tenant_virtual_show_tables_schema, + ObInnerTableSchema::tenant_virtual_show_create_procedure_schema, + ObInnerTableSchema::all_virtual_core_meta_table_schema, + ObInnerTableSchema::all_virtual_zone_stat_schema, + ObInnerTableSchema::all_virtual_plan_cache_stat_schema, + ObInnerTableSchema::all_virtual_plan_stat_schema, + ObInnerTableSchema::all_virtual_mem_leak_checker_info_schema, + ObInnerTableSchema::all_virtual_latch_schema, + ObInnerTableSchema::all_virtual_kvcache_info_schema, + ObInnerTableSchema::all_virtual_data_type_class_schema, + ObInnerTableSchema::all_virtual_data_type_schema, + ObInnerTableSchema::all_virtual_server_stat_schema, + ObInnerTableSchema::all_virtual_rebalance_task_stat_schema, + ObInnerTableSchema::all_virtual_session_event_schema, + ObInnerTableSchema::all_virtual_session_wait_schema, + ObInnerTableSchema::all_virtual_session_wait_history_schema, + ObInnerTableSchema::all_virtual_system_event_schema, + ObInnerTableSchema::all_virtual_tenant_memstore_info_schema, + ObInnerTableSchema::all_virtual_concurrency_object_pool_schema, + ObInnerTableSchema::all_virtual_sesstat_schema, + ObInnerTableSchema::all_virtual_sysstat_schema, + ObInnerTableSchema::all_virtual_storage_stat_schema, + ObInnerTableSchema::all_virtual_disk_stat_schema, + ObInnerTableSchema::all_virtual_memstore_info_schema, + ObInnerTableSchema::all_virtual_partition_info_schema, + ObInnerTableSchema::all_virtual_upgrade_inspection_schema, + ObInnerTableSchema::all_virtual_trans_stat_schema, + ObInnerTableSchema::all_virtual_trans_mgr_stat_schema, + ObInnerTableSchema::all_virtual_election_info_schema, + ObInnerTableSchema::all_virtual_election_mem_stat_schema, + ObInnerTableSchema::all_virtual_sql_audit_schema, + ObInnerTableSchema::all_virtual_trans_mem_stat_schema, + ObInnerTableSchema::all_virtual_partition_sstable_image_info_schema, + ObInnerTableSchema::all_virtual_core_root_table_schema, + ObInnerTableSchema::all_virtual_core_all_table_schema, + ObInnerTableSchema::all_virtual_core_column_table_schema, + ObInnerTableSchema::all_virtual_memory_info_schema, + ObInnerTableSchema::all_virtual_tenant_stat_schema, + ObInnerTableSchema::all_virtual_sys_parameter_stat_schema, + ObInnerTableSchema::all_virtual_partition_replay_status_schema, + ObInnerTableSchema::all_virtual_clog_stat_schema, + ObInnerTableSchema::all_virtual_trace_log_schema, + ObInnerTableSchema::all_virtual_engine_schema, + ObInnerTableSchema::all_virtual_proxy_server_stat_schema, + ObInnerTableSchema::all_virtual_proxy_sys_variable_schema, + ObInnerTableSchema::all_virtual_proxy_schema_schema, + ObInnerTableSchema::all_virtual_plan_cache_plan_explain_schema, + ObInnerTableSchema::all_virtual_obrpc_stat_schema, + ObInnerTableSchema::all_virtual_partition_sstable_merge_info_schema, + ObInnerTableSchema::all_virtual_sql_monitor_schema, + ObInnerTableSchema::tenant_virtual_outline_schema, + ObInnerTableSchema::tenant_virtual_concurrent_limit_sql_schema, + ObInnerTableSchema::all_virtual_sql_plan_statistics_schema, + ObInnerTableSchema::all_virtual_partition_sstable_macro_info_schema, + ObInnerTableSchema::all_virtual_proxy_partition_info_schema, + ObInnerTableSchema::all_virtual_proxy_partition_schema, + ObInnerTableSchema::all_virtual_proxy_sub_partition_schema, + ObInnerTableSchema::all_virtual_proxy_route_schema, + ObInnerTableSchema::all_virtual_rebalance_tenant_stat_schema, + ObInnerTableSchema::all_virtual_rebalance_unit_stat_schema, + ObInnerTableSchema::all_virtual_rebalance_replica_stat_schema, + ObInnerTableSchema::all_virtual_partition_amplification_stat_schema, + ObInnerTableSchema::all_virtual_election_event_history_schema, + ObInnerTableSchema::all_virtual_partition_store_info_schema, + ObInnerTableSchema::all_virtual_leader_stat_schema, + ObInnerTableSchema::all_virtual_partition_migration_status_schema, + ObInnerTableSchema::all_virtual_sys_task_status_schema, + ObInnerTableSchema::all_virtual_macro_block_marker_status_schema, + ObInnerTableSchema::all_virtual_server_clog_stat_schema, + ObInnerTableSchema::all_virtual_rootservice_stat_schema, + ObInnerTableSchema::all_virtual_election_priority_schema, + ObInnerTableSchema::all_virtual_tenant_disk_stat_schema, + ObInnerTableSchema::all_virtual_rebalance_map_stat_schema, + ObInnerTableSchema::all_virtual_rebalance_map_item_stat_schema, + ObInnerTableSchema::all_virtual_io_stat_schema, + ObInnerTableSchema::all_virtual_long_ops_status_schema, + ObInnerTableSchema::all_virtual_rebalance_unit_migrate_stat_schema, + ObInnerTableSchema::all_virtual_rebalance_unit_distribution_stat_schema, + ObInnerTableSchema::all_virtual_server_object_pool_schema, + ObInnerTableSchema::all_virtual_trans_lock_stat_schema, + ObInnerTableSchema::all_virtual_election_group_info_schema, + ObInnerTableSchema::tenant_virtual_show_create_tablegroup_schema, + ObInnerTableSchema::all_virtual_server_blacklist_schema, + ObInnerTableSchema::all_virtual_partition_split_info_schema, + ObInnerTableSchema::all_virtual_trans_result_info_stat_schema, + ObInnerTableSchema::all_virtual_duplicate_partition_mgr_stat_schema, + ObInnerTableSchema::all_virtual_tenant_parameter_stat_schema, + ObInnerTableSchema::all_virtual_server_schema_info_schema, + ObInnerTableSchema::all_virtual_memory_context_stat_schema, + ObInnerTableSchema::all_virtual_dump_tenant_info_schema, + ObInnerTableSchema::all_virtual_tenant_parameter_info_schema, + ObInnerTableSchema::all_virtual_dag_warning_history_schema, + ObInnerTableSchema::session_variables_schema, + ObInnerTableSchema::table_privileges_schema, + ObInnerTableSchema::user_privileges_schema, + ObInnerTableSchema::schema_privileges_schema, + ObInnerTableSchema::table_constraints_schema, + ObInnerTableSchema::global_status_schema, + ObInnerTableSchema::partitions_schema, + ObInnerTableSchema::session_status_schema, + ObInnerTableSchema::user_schema, + ObInnerTableSchema::db_schema, + ObInnerTableSchema::all_virtual_server_memory_info_schema, + ObInnerTableSchema::all_virtual_partition_table_schema, + ObInnerTableSchema::all_virtual_lock_wait_stat_schema, + ObInnerTableSchema::all_virtual_partition_item_schema, + ObInnerTableSchema::all_virtual_replica_task_schema, + ObInnerTableSchema::all_virtual_partition_location_schema, + ObInnerTableSchema::proc_schema, + ObInnerTableSchema::tenant_virtual_collation_schema, + ObInnerTableSchema::tenant_virtual_charset_schema, + ObInnerTableSchema::all_virtual_tenant_memstore_allocator_info_schema, + ObInnerTableSchema::all_virtual_table_mgr_schema, + ObInnerTableSchema::all_virtual_meta_table_schema, + ObInnerTableSchema::all_virtual_freeze_info_schema, + ObInnerTableSchema::parameters_schema, + ObInnerTableSchema::all_virtual_bad_block_table_schema, + ObInnerTableSchema::all_virtual_px_worker_stat_schema, + ObInnerTableSchema::all_virtual_trans_audit_schema, + ObInnerTableSchema::all_virtual_trans_sql_audit_schema, + ObInnerTableSchema::all_virtual_weak_read_stat_schema, + ObInnerTableSchema::all_virtual_partition_audit_schema, + ObInnerTableSchema::all_virtual_sequence_v2_schema, + ObInnerTableSchema::all_virtual_sequence_value_schema, + ObInnerTableSchema::all_virtual_cluster_schema, + ObInnerTableSchema::all_virtual_partition_table_store_stat_schema, + ObInnerTableSchema::all_virtual_ddl_operation_schema, + ObInnerTableSchema::all_virtual_outline_schema, + ObInnerTableSchema::all_virtual_outline_history_schema, + ObInnerTableSchema::all_virtual_synonym_schema, + ObInnerTableSchema::all_virtual_synonym_history_schema, + ObInnerTableSchema::all_virtual_database_privilege_schema, + ObInnerTableSchema::all_virtual_database_privilege_history_schema, + ObInnerTableSchema::all_virtual_table_privilege_schema, + ObInnerTableSchema::all_virtual_table_privilege_history_schema, + ObInnerTableSchema::all_virtual_database_schema, + ObInnerTableSchema::all_virtual_database_history_schema, + ObInnerTableSchema::all_virtual_tablegroup_schema, + ObInnerTableSchema::all_virtual_tablegroup_history_schema, + ObInnerTableSchema::all_virtual_table_schema, + ObInnerTableSchema::all_virtual_table_history_schema, + ObInnerTableSchema::all_virtual_column_schema, + ObInnerTableSchema::all_virtual_column_history_schema, + ObInnerTableSchema::all_virtual_part_schema, + ObInnerTableSchema::all_virtual_part_history_schema, + ObInnerTableSchema::all_virtual_part_info_schema, + ObInnerTableSchema::all_virtual_part_info_history_schema, + ObInnerTableSchema::all_virtual_def_sub_part_schema, + ObInnerTableSchema::all_virtual_def_sub_part_history_schema, + ObInnerTableSchema::all_virtual_sub_part_schema, + ObInnerTableSchema::all_virtual_sub_part_history_schema, + ObInnerTableSchema::all_virtual_constraint_schema, + ObInnerTableSchema::all_virtual_constraint_history_schema, + ObInnerTableSchema::all_virtual_foreign_key_schema, + ObInnerTableSchema::all_virtual_foreign_key_history_schema, + ObInnerTableSchema::all_virtual_foreign_key_column_schema, + ObInnerTableSchema::all_virtual_foreign_key_column_history_schema, + ObInnerTableSchema::all_virtual_temp_table_schema, + ObInnerTableSchema::all_virtual_ori_schema_version_schema, + ObInnerTableSchema::all_virtual_sys_stat_schema, + ObInnerTableSchema::all_virtual_user_schema, + ObInnerTableSchema::all_virtual_user_history_schema, + ObInnerTableSchema::all_virtual_sys_variable_schema, + ObInnerTableSchema::all_virtual_sys_variable_history_schema, + ObInnerTableSchema::all_virtual_func_schema, + ObInnerTableSchema::all_virtual_func_history_schema, + ObInnerTableSchema::all_virtual_package_schema, + ObInnerTableSchema::all_virtual_package_history_schema, + ObInnerTableSchema::all_virtual_routine_schema, + ObInnerTableSchema::all_virtual_routine_history_schema, + ObInnerTableSchema::all_virtual_routine_param_schema, + ObInnerTableSchema::all_virtual_routine_param_history_schema, + ObInnerTableSchema::all_virtual_type_schema, + ObInnerTableSchema::all_virtual_type_history_schema, + ObInnerTableSchema::all_virtual_type_attr_schema, + ObInnerTableSchema::all_virtual_type_attr_history_schema, + ObInnerTableSchema::all_virtual_coll_type_schema, + ObInnerTableSchema::all_virtual_coll_type_history_schema, + ObInnerTableSchema::all_virtual_column_stat_schema, + ObInnerTableSchema::all_virtual_table_stat_schema, + ObInnerTableSchema::all_virtual_histogram_stat_schema, + ObInnerTableSchema::all_virtual_column_statistic_schema, + ObInnerTableSchema::all_virtual_recyclebin_schema, + ObInnerTableSchema::all_virtual_tenant_gc_partition_info_schema, + ObInnerTableSchema::all_virtual_tenant_plan_baseline_schema, + ObInnerTableSchema::all_virtual_tenant_plan_baseline_history_schema, + ObInnerTableSchema::all_virtual_sequence_object_schema, + ObInnerTableSchema::all_virtual_sequence_object_history_schema, + ObInnerTableSchema::all_virtual_raid_stat_schema, + ObInnerTableSchema::all_virtual_server_log_meta_schema, + ObInnerTableSchema::all_virtual_dtl_channel_schema, + ObInnerTableSchema::all_virtual_dtl_memory_schema, + ObInnerTableSchema::all_virtual_dtl_first_cached_buffer_schema, + ObInnerTableSchema::all_virtual_dblink_schema, + ObInnerTableSchema::all_virtual_dblink_history_schema, + ObInnerTableSchema::all_virtual_tenant_partition_meta_table_schema, + ObInnerTableSchema::all_virtual_tenant_role_grantee_map_schema, + ObInnerTableSchema::all_virtual_tenant_role_grantee_map_history_schema, + ObInnerTableSchema::all_virtual_tenant_keystore_schema, + ObInnerTableSchema::all_virtual_tenant_keystore_history_schema, + ObInnerTableSchema::all_virtual_deadlock_stat_schema, + ObInnerTableSchema::all_virtual_tenant_tablespace_schema, + ObInnerTableSchema::all_virtual_tenant_tablespace_history_schema, + ObInnerTableSchema::all_virtual_information_columns_schema, + ObInnerTableSchema::all_virtual_pg_partition_info_schema, + ObInnerTableSchema::all_virtual_tenant_user_failed_login_stat_schema, + ObInnerTableSchema::all_virtual_tenant_profile_schema, + ObInnerTableSchema::all_virtual_tenant_profile_history_schema, + ObInnerTableSchema::all_virtual_security_audit_schema, + ObInnerTableSchema::all_virtual_security_audit_history_schema, + ObInnerTableSchema::all_virtual_trigger_schema, + ObInnerTableSchema::all_virtual_trigger_history_schema, + ObInnerTableSchema::all_virtual_cluster_stats_schema, + ObInnerTableSchema::all_virtual_sstable_column_checksum_schema, + ObInnerTableSchema::all_virtual_ps_stat_schema, + ObInnerTableSchema::all_virtual_ps_item_info_schema, + ObInnerTableSchema::all_virtual_sql_workarea_history_stat_schema, + ObInnerTableSchema::all_virtual_sql_workarea_active_schema, + ObInnerTableSchema::all_virtual_sql_workarea_histogram_schema, + ObInnerTableSchema::all_virtual_sql_workarea_memory_info_schema, + ObInnerTableSchema::all_virtual_security_audit_record_schema, + ObInnerTableSchema::all_virtual_sysauth_schema, + ObInnerTableSchema::all_virtual_sysauth_history_schema, + ObInnerTableSchema::all_virtual_objauth_schema, + ObInnerTableSchema::all_virtual_objauth_history_schema, + ObInnerTableSchema::all_virtual_backup_info_schema, + ObInnerTableSchema::all_virtual_backup_log_archive_status_schema, + ObInnerTableSchema::all_virtual_backup_task_schema, + ObInnerTableSchema::all_virtual_pg_backup_task_schema, + ObInnerTableSchema::all_virtual_pg_backup_log_archive_status_schema, + ObInnerTableSchema::all_virtual_server_backup_log_archive_status_schema, + ObInnerTableSchema::all_virtual_error_schema, + ObInnerTableSchema::all_virtual_timestamp_service_schema, + ObInnerTableSchema::referential_constraints_schema, + ObInnerTableSchema::all_virtual_table_modifications_schema, + ObInnerTableSchema::all_virtual_backup_clean_info_schema, + ObInnerTableSchema::all_virtual_restore_pg_info_schema, + ObInnerTableSchema::all_virtual_object_type_schema, + ObInnerTableSchema::all_virtual_trans_table_status_schema, + ObInnerTableSchema::all_virtual_pg_log_archive_stat_schema, + ObInnerTableSchema::all_virtual_sql_plan_monitor_schema, + ObInnerTableSchema::all_virtual_sql_monitor_statname_schema, + ObInnerTableSchema::all_virtual_open_cursor_schema, + ObInnerTableSchema::all_virtual_backup_validation_task_schema, + ObInnerTableSchema::all_virtual_pg_backup_validation_task_schema, + ObInnerTableSchema::all_virtual_time_zone_schema, + ObInnerTableSchema::all_virtual_time_zone_name_schema, + ObInnerTableSchema::all_virtual_time_zone_transition_schema, + ObInnerTableSchema::all_virtual_time_zone_transition_type_schema, + ObInnerTableSchema::all_virtual_constraint_column_schema, + ObInnerTableSchema::all_virtual_constraint_column_history_schema, + ObInnerTableSchema::all_virtual_files_schema, + ObInnerTableSchema::files_schema, + ObInnerTableSchema::all_virtual_dependency_schema, + ObInnerTableSchema::tenant_virtual_object_definition_schema, + ObInnerTableSchema::all_virtual_reserved_table_mgr_schema, + ObInnerTableSchema::all_virtual_backupset_history_mgr_schema, + ObInnerTableSchema::all_virtual_backup_backupset_task_schema, + ObInnerTableSchema::all_virtual_pg_backup_backupset_task_schema, + ObInnerTableSchema::all_virtual_backup_backup_log_archive_status_schema, + ObInnerTableSchema::all_virtual_global_transaction_schema, + ObInnerTableSchema::all_virtual_table_agent_schema, + ObInnerTableSchema::all_virtual_column_agent_schema, + ObInnerTableSchema::all_virtual_database_agent_schema, + ObInnerTableSchema::all_virtual_sequence_v2_agent_schema, + ObInnerTableSchema::all_virtual_part_agent_schema, + ObInnerTableSchema::all_virtual_sub_part_agent_schema, + ObInnerTableSchema::all_virtual_package_agent_schema, + ObInnerTableSchema::all_virtual_tenant_meta_table_agent_schema, + ObInnerTableSchema::all_virtual_sql_audit_ora_schema, + ObInnerTableSchema::all_virtual_plan_stat_ora_schema, + ObInnerTableSchema::all_virtual_sql_plan_statistics_agent_schema, + ObInnerTableSchema::all_virtual_plan_cache_plan_explain_ora_schema, + ObInnerTableSchema::all_virtual_sequence_value_agent_schema, + ObInnerTableSchema::all_virtual_sequence_object_agent_schema, + ObInnerTableSchema::all_virtual_user_agent_schema, + ObInnerTableSchema::all_virtual_synonym_agent_schema, + ObInnerTableSchema::all_virtual_foreign_key_agent_schema, + ObInnerTableSchema::all_virtual_column_stat_agent_schema, + ObInnerTableSchema::all_virtual_column_statistic_agent_schema, + ObInnerTableSchema::all_virtual_partition_table_agent_schema, + ObInnerTableSchema::all_virtual_table_stat_agent_schema, + ObInnerTableSchema::all_virtual_recyclebin_agent_schema, + ObInnerTableSchema::tenant_virtual_outline_agent_schema, + ObInnerTableSchema::all_virtual_routine_agent_schema, + ObInnerTableSchema::all_virtual_tablegroup_agent_schema, + ObInnerTableSchema::all_virtual_privilege_agent_schema, + ObInnerTableSchema::all_virtual_sys_parameter_stat_agent_schema, + ObInnerTableSchema::tenant_virtual_table_index_agent_schema, + ObInnerTableSchema::tenant_virtual_charset_agent_schema, + ObInnerTableSchema::tenant_virtual_all_table_agent_schema, + ObInnerTableSchema::tenant_virtual_collation_agent_schema, + ObInnerTableSchema::all_virtual_foreign_key_column_agent_schema, + ObInnerTableSchema::all_virtual_server_agent_schema, + ObInnerTableSchema::all_virtual_plan_cache_stat_ora_schema, + ObInnerTableSchema::all_virtual_processlist_ora_schema, + ObInnerTableSchema::all_virtual_session_wait_ora_schema, + ObInnerTableSchema::all_virtual_session_wait_history_ora_schema, + ObInnerTableSchema::all_virtual_memory_info_ora_schema, + ObInnerTableSchema::all_virtual_tenant_memstore_info_ora_schema, + ObInnerTableSchema::all_virtual_memstore_info_ora_schema, + ObInnerTableSchema::all_virtual_server_memory_info_agent_schema, + ObInnerTableSchema::all_virtual_sesstat_ora_schema, + ObInnerTableSchema::all_virtual_sysstat_ora_schema, + ObInnerTableSchema::all_virtual_system_event_ora_schema, + ObInnerTableSchema::all_virtual_tenant_memstore_allocator_info_agent_schema, + ObInnerTableSchema::tenant_virtual_session_variable_ora_schema, + ObInnerTableSchema::tenant_virtual_global_variable_ora_schema, + ObInnerTableSchema::tenant_virtual_show_create_table_ora_schema, + ObInnerTableSchema::tenant_virtual_show_create_procedure_ora_schema, + ObInnerTableSchema::tenant_virtual_show_create_tablegroup_ora_schema, + ObInnerTableSchema::tenant_virtual_privilege_grant_ora_schema, + ObInnerTableSchema::tenant_virtual_table_column_ora_schema, + ObInnerTableSchema::all_virtual_trace_log_ora_schema, + ObInnerTableSchema::tenant_virtual_concurrent_limit_sql_agent_schema, + ObInnerTableSchema::all_virtual_constraint_agent_schema, + ObInnerTableSchema::all_virtual_type_agent_schema, + ObInnerTableSchema::all_virtual_type_attr_agent_schema, + ObInnerTableSchema::all_virtual_coll_type_agent_schema, + ObInnerTableSchema::all_virtual_routine_param_agent_schema, + ObInnerTableSchema::all_virtual_data_type_ora_schema, + ObInnerTableSchema::all_virtual_table_sys_agent_schema, + ObInnerTableSchema::all_virtual_sstable_checksum_agent_schema, + ObInnerTableSchema::all_virtual_partition_info_agent_schema, + ObInnerTableSchema::all_virtual_tenant_partition_meta_table_agent_schema, + ObInnerTableSchema::all_virtual_tenant_keystore_agent_schema, + ObInnerTableSchema::all_virtual_tenant_tablespace_agent_schema, + ObInnerTableSchema::all_virtual_tenant_profile_agent_schema, + ObInnerTableSchema::all_virtual_tenant_role_grantee_map_agent_schema, + ObInnerTableSchema::all_virtual_table_privilege_agent_schema, + ObInnerTableSchema::all_virtual_security_audit_agent_schema, + ObInnerTableSchema::all_virtual_security_audit_history_agent_schema, + ObInnerTableSchema::all_virtual_trigger_agent_schema, + ObInnerTableSchema::all_virtual_px_worker_stat_ora_schema, + ObInnerTableSchema::all_virtual_ps_stat_ora_schema, + ObInnerTableSchema::all_virtual_ps_item_info_ora_schema, + ObInnerTableSchema::all_virtual_tenant_parameter_stat_ora_schema, + ObInnerTableSchema::all_virtual_sql_workarea_history_stat_agent_schema, + ObInnerTableSchema::all_virtual_sql_workarea_active_agent_schema, + ObInnerTableSchema::all_virtual_sql_workarea_histogram_agent_schema, + ObInnerTableSchema::all_virtual_sql_workarea_memory_info_agent_schema, + ObInnerTableSchema::all_virtual_security_audit_record_agent_schema, + ObInnerTableSchema::all_virtual_sysauth_agent_schema, + ObInnerTableSchema::all_virtual_sysauth_history_agent_schema, + ObInnerTableSchema::all_virtual_objauth_agent_schema, + ObInnerTableSchema::all_virtual_objauth_history_agent_schema, + ObInnerTableSchema::all_virtual_error_agent_schema, + ObInnerTableSchema::all_virtual_table_mgr_agent_schema, + ObInnerTableSchema::all_virtual_def_sub_part_agent_schema, + ObInnerTableSchema::all_virtual_object_type_agent_schema, + ObInnerTableSchema::all_virtual_server_schema_info_agent_schema, + ObInnerTableSchema::all_virtual_dblink_agent_schema, + ObInnerTableSchema::all_virtual_dblink_history_agent_schema, + ObInnerTableSchema::all_virtual_sql_plan_monitor_ora_schema, + ObInnerTableSchema::all_virtual_sql_monitor_statname_ora_schema, + ObInnerTableSchema::all_virtual_lock_wait_stat_ora_schema, + ObInnerTableSchema::all_virtual_open_cursor_ora_schema, + ObInnerTableSchema::all_virtual_constraint_column_agent_schema, + ObInnerTableSchema::all_virtual_dependency_agent_schema, + ObInnerTableSchema::all_virtual_tenant_time_zone_agent_schema, + ObInnerTableSchema::all_virtual_tenant_time_zone_name_agent_schema, + ObInnerTableSchema::all_virtual_tenant_time_zone_transition_agent_schema, + ObInnerTableSchema::all_virtual_tenant_time_zone_transition_type_agent_schema, + ObInnerTableSchema::tenant_virtual_object_definition_ora_schema, + ObInnerTableSchema::all_virtual_routine_param_sys_agent_schema, + ObInnerTableSchema::all_virtual_type_sys_agent_schema, + ObInnerTableSchema::all_virtual_type_attr_sys_agent_schema, + ObInnerTableSchema::all_virtual_coll_type_sys_agent_schema, + ObInnerTableSchema::all_virtual_package_sys_agent_schema, + ObInnerTableSchema::all_virtual_tenant_trigger_sys_agent_schema, + ObInnerTableSchema::all_virtual_routine_sys_agent_schema, + ObInnerTableSchema::all_virtual_tenant_global_transaction_agent_schema, + ObInnerTableSchema::all_virtual_acquired_snapshot_agent_schema, + ObInnerTableSchema::all_virtual_table_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_column_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_database_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_sequence_v2_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_part_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_sub_part_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_package_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_sequence_value_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_sequence_object_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_user_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_synonym_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_foreign_key_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_column_stat_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_column_statistic_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_table_stat_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_recyclebin_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_routine_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tablegroup_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_foreign_key_column_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_constraint_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_type_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_type_attr_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_coll_type_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_routine_param_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_partition_meta_table_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_keystore_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_tablespace_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_profile_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_role_grantee_map_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_table_privilege_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_security_audit_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_security_audit_history_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_trigger_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_security_audit_record_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_sysauth_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_sysauth_history_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_objauth_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_objauth_history_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_error_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_def_sub_part_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_object_type_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_dblink_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_dblink_history_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_constraint_column_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_dependency_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_meta_table_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_time_zone_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_time_zone_name_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_time_zone_transition_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_tenant_time_zone_transition_type_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_res_mgr_plan_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_res_mgr_directive_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_trans_lock_stat_ora_schema, + ObInnerTableSchema::all_virtual_res_mgr_mapping_rule_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_res_mgr_consumer_group_real_agent_ora_schema, + ObInnerTableSchema::all_virtual_plan_cache_stat_all_virtual_plan_cache_stat_i1_schema, + ObInnerTableSchema::all_virtual_session_event_all_virtual_session_event_i1_schema, + ObInnerTableSchema::all_virtual_session_wait_all_virtual_session_wait_i1_schema, + ObInnerTableSchema::all_virtual_session_wait_history_all_virtual_session_wait_history_i1_schema, + ObInnerTableSchema::all_virtual_system_event_all_virtual_system_event_i1_schema, + ObInnerTableSchema::all_virtual_sesstat_all_virtual_sesstat_i1_schema, + ObInnerTableSchema::all_virtual_sysstat_all_virtual_sysstat_i1_schema, + ObInnerTableSchema::all_virtual_sql_audit_all_virtual_sql_audit_i1_schema, + ObInnerTableSchema::all_virtual_replica_task_all_virtual_replica_task_i1_schema, + ObInnerTableSchema::all_virtual_sql_plan_monitor_all_virtual_sql_plan_monitor_i1_schema, + ObInnerTableSchema::all_virtual_sql_audit_ora_all_virtual_sql_audit_i1_schema, + ObInnerTableSchema::all_virtual_plan_cache_stat_ora_all_virtual_plan_cache_stat_i1_schema, + ObInnerTableSchema::all_virtual_session_wait_ora_all_virtual_session_wait_i1_schema, + ObInnerTableSchema::all_virtual_session_wait_history_ora_all_virtual_session_wait_history_i1_schema, + ObInnerTableSchema::all_virtual_sesstat_ora_all_virtual_sesstat_i1_schema, + ObInnerTableSchema::all_virtual_sysstat_ora_all_virtual_sysstat_i1_schema, + ObInnerTableSchema::all_virtual_system_event_ora_all_virtual_system_event_i1_schema, + ObInnerTableSchema::all_virtual_sql_plan_monitor_ora_all_virtual_sql_plan_monitor_i1_schema, + NULL,}; -const schema_create_func sys_view_schema_creators[] = { - ObInnerTableSchema::gv_plan_cache_stat_schema, - ObInnerTableSchema::gv_plan_cache_plan_stat_schema, - ObInnerTableSchema::schemata_schema, - ObInnerTableSchema::character_sets_schema, - ObInnerTableSchema::global_variables_schema, - ObInnerTableSchema::statistics_schema, - ObInnerTableSchema::views_schema, - ObInnerTableSchema::tables_schema, - ObInnerTableSchema::collations_schema, - ObInnerTableSchema::collation_character_set_applicability_schema, - ObInnerTableSchema::processlist_schema, - ObInnerTableSchema::key_column_usage_schema, - ObInnerTableSchema::dba_outlines_schema, - ObInnerTableSchema::engines_schema, - ObInnerTableSchema::routines_schema, - ObInnerTableSchema::gv_session_event_schema, - ObInnerTableSchema::gv_session_wait_schema, - ObInnerTableSchema::gv_session_wait_history_schema, - ObInnerTableSchema::gv_system_event_schema, - ObInnerTableSchema::gv_sesstat_schema, - ObInnerTableSchema::gv_sysstat_schema, - ObInnerTableSchema::v_statname_schema, - ObInnerTableSchema::v_event_name_schema, - ObInnerTableSchema::v_session_event_schema, - ObInnerTableSchema::v_session_wait_schema, - ObInnerTableSchema::v_session_wait_history_schema, - ObInnerTableSchema::v_sesstat_schema, - ObInnerTableSchema::v_sysstat_schema, - ObInnerTableSchema::v_system_event_schema, - ObInnerTableSchema::gv_sql_audit_schema, - ObInnerTableSchema::gv_latch_schema, - ObInnerTableSchema::gv_memory_schema, - ObInnerTableSchema::v_memory_schema, - ObInnerTableSchema::gv_memstore_schema, - ObInnerTableSchema::v_memstore_schema, - ObInnerTableSchema::gv_memstore_info_schema, - ObInnerTableSchema::v_memstore_info_schema, - ObInnerTableSchema::v_plan_cache_stat_schema, - ObInnerTableSchema::v_plan_cache_plan_stat_schema, - ObInnerTableSchema::gv_plan_cache_plan_explain_schema, - ObInnerTableSchema::v_plan_cache_plan_explain_schema, - ObInnerTableSchema::v_sql_audit_schema, - ObInnerTableSchema::v_latch_schema, - ObInnerTableSchema::gv_obrpc_outgoing_schema, - ObInnerTableSchema::v_obrpc_outgoing_schema, - ObInnerTableSchema::gv_obrpc_incoming_schema, - ObInnerTableSchema::v_obrpc_incoming_schema, - ObInnerTableSchema::gv_sql_schema, - ObInnerTableSchema::v_sql_schema, - ObInnerTableSchema::gv_sql_monitor_schema, - ObInnerTableSchema::v_sql_monitor_schema, - ObInnerTableSchema::gv_sql_plan_monitor_schema, - ObInnerTableSchema::v_sql_plan_monitor_schema, - ObInnerTableSchema::user_recyclebin_schema, - ObInnerTableSchema::gv_outline_schema, - ObInnerTableSchema::gv_concurrent_limit_sql_schema, - ObInnerTableSchema::gv_sql_plan_statistics_schema, - ObInnerTableSchema::v_sql_plan_statistics_schema, - ObInnerTableSchema::gv_server_memstore_schema, - ObInnerTableSchema::gv_unit_load_balance_event_history_schema, - ObInnerTableSchema::gv_tenant_schema, - ObInnerTableSchema::gv_database_schema, - ObInnerTableSchema::gv_table_schema, - ObInnerTableSchema::gv_unit_schema, - ObInnerTableSchema::v_unit_schema, - ObInnerTableSchema::gv_partition_schema, - ObInnerTableSchema::v_partition_schema, - ObInnerTableSchema::gv_lock_wait_stat_schema, - ObInnerTableSchema::v_lock_wait_stat_schema, - ObInnerTableSchema::time_zone_schema, - ObInnerTableSchema::time_zone_name_schema, - ObInnerTableSchema::time_zone_transition_schema, - ObInnerTableSchema::time_zone_transition_type_schema, - ObInnerTableSchema::gv_session_longops_schema, - ObInnerTableSchema::v_session_longops_schema, - ObInnerTableSchema::gv_tenant_memstore_allocator_info_schema, - ObInnerTableSchema::v_tenant_memstore_allocator_info_schema, - ObInnerTableSchema::gv_tenant_sequence_object_schema, - ObInnerTableSchema::columns_schema, - ObInnerTableSchema::gv_minor_merge_info_schema, - ObInnerTableSchema::gv_tenant_px_worker_stat_schema, - ObInnerTableSchema::v_tenant_px_worker_stat_schema, - ObInnerTableSchema::gv_partition_audit_schema, - ObInnerTableSchema::v_partition_audit_schema, - ObInnerTableSchema::v_ob_cluster_schema, - ObInnerTableSchema::gv_ps_stat_schema, - ObInnerTableSchema::v_ps_stat_schema, - ObInnerTableSchema::gv_ps_item_info_schema, - ObInnerTableSchema::v_ps_item_info_schema, - ObInnerTableSchema::gv_sql_workarea_schema, - ObInnerTableSchema::v_sql_workarea_schema, - ObInnerTableSchema::gv_sql_workarea_active_schema, - ObInnerTableSchema::v_sql_workarea_active_schema, - ObInnerTableSchema::gv_sql_workarea_histogram_schema, - ObInnerTableSchema::v_sql_workarea_histogram_schema, - ObInnerTableSchema::gv_ob_sql_workarea_memory_info_schema, - ObInnerTableSchema::v_ob_sql_workarea_memory_info_schema, - ObInnerTableSchema::gv_plan_cache_reference_info_schema, - ObInnerTableSchema::v_plan_cache_reference_info_schema, - ObInnerTableSchema::v_ob_timestamp_service_schema, - ObInnerTableSchema::gv_sstable_schema, - ObInnerTableSchema::v_sstable_schema, - ObInnerTableSchema::cdb_ob_backup_archivelog_summary_schema, - ObInnerTableSchema::cdb_ob_backup_job_details_schema, - ObInnerTableSchema::cdb_ob_backup_set_details_schema, - ObInnerTableSchema::cdb_ob_backup_set_expired_schema, - ObInnerTableSchema::cdb_ob_backup_progress_schema, - ObInnerTableSchema::cdb_ob_backup_archivelog_progress_schema, - ObInnerTableSchema::cdb_ob_backup_clean_history_schema, - ObInnerTableSchema::cdb_ob_backup_task_clean_history_schema, - ObInnerTableSchema::cdb_ob_restore_progress_schema, - ObInnerTableSchema::cdb_ob_restore_history_schema, - ObInnerTableSchema::gv_server_schema_info_schema, - ObInnerTableSchema::v_server_schema_info_schema, - ObInnerTableSchema::cdb_ckpt_history_schema, - ObInnerTableSchema::gv_ob_trans_table_status_schema, - ObInnerTableSchema::v_ob_trans_table_status_schema, - ObInnerTableSchema::v_sql_monitor_statname_schema, - ObInnerTableSchema::gv_merge_info_schema, - ObInnerTableSchema::v_merge_info_schema, - ObInnerTableSchema::gv_lock_schema, - ObInnerTableSchema::v_lock_schema, - ObInnerTableSchema::cdb_ob_backup_validation_job_schema, - ObInnerTableSchema::cdb_ob_backup_validation_job_history_schema, - ObInnerTableSchema::cdb_ob_tenant_backup_validation_task_schema, - ObInnerTableSchema::cdb_ob_backup_validation_task_history_schema, - ObInnerTableSchema::v_restore_point_schema, - ObInnerTableSchema::cdb_ob_backup_set_obsolete_schema, - ObInnerTableSchema::cdb_ob_backup_backupset_job_schema, - ObInnerTableSchema::cdb_ob_backup_backupset_job_history_schema, - ObInnerTableSchema::cdb_ob_backup_backupset_task_schema, - ObInnerTableSchema::cdb_ob_backup_backupset_task_history_schema, - ObInnerTableSchema::cdb_ob_backup_backup_archivelog_summary_schema, - ObInnerTableSchema::dba_synonyms_schema, - ObInnerTableSchema::dba_objects_schema, - ObInnerTableSchema::all_objects_schema, - ObInnerTableSchema::user_objects_schema, - ObInnerTableSchema::dba_sequences_schema, - ObInnerTableSchema::all_sequences_schema, - ObInnerTableSchema::user_sequences_schema, - ObInnerTableSchema::dba_users_schema, - ObInnerTableSchema::all_users_schema, - ObInnerTableSchema::all_synonyms_schema, - ObInnerTableSchema::user_synonyms_schema, - ObInnerTableSchema::dba_ind_columns_schema, - ObInnerTableSchema::all_ind_columns_schema, - ObInnerTableSchema::user_ind_columns_schema, - ObInnerTableSchema::dba_constraints_schema, - ObInnerTableSchema::all_constraints_schema, - ObInnerTableSchema::user_constraints_schema, - ObInnerTableSchema::all_tab_cols_v_schema, - ObInnerTableSchema::dba_tab_cols_v_schema, - ObInnerTableSchema::user_tab_cols_v_schema, - ObInnerTableSchema::all_tab_cols_schema, - ObInnerTableSchema::dba_tab_cols_schema, - ObInnerTableSchema::user_tab_cols_schema, - ObInnerTableSchema::all_tab_columns_schema, - ObInnerTableSchema::dba_tab_columns_schema, - ObInnerTableSchema::user_tab_columns_schema, - ObInnerTableSchema::all_tables_schema, - ObInnerTableSchema::dba_tables_schema, - ObInnerTableSchema::user_tables_schema, - ObInnerTableSchema::dba_tab_comments_schema, - ObInnerTableSchema::all_tab_comments_schema, - ObInnerTableSchema::user_tab_comments_schema, - ObInnerTableSchema::dba_col_comments_schema, - ObInnerTableSchema::all_col_comments_schema, - ObInnerTableSchema::user_col_comments_schema, - ObInnerTableSchema::dba_indexes_schema, - ObInnerTableSchema::all_indexes_schema, - ObInnerTableSchema::user_indexes_schema, - ObInnerTableSchema::dba_cons_columns_schema, - ObInnerTableSchema::all_cons_columns_schema, - ObInnerTableSchema::user_cons_columns_schema, - ObInnerTableSchema::user_segments_schema, - ObInnerTableSchema::dba_segments_schema, - ObInnerTableSchema::dba_types_schema, - ObInnerTableSchema::all_types_schema, - ObInnerTableSchema::user_types_schema, - ObInnerTableSchema::dba_type_attrs_schema, - ObInnerTableSchema::all_type_attrs_schema, - ObInnerTableSchema::user_type_attrs_schema, - ObInnerTableSchema::dba_coll_types_schema, - ObInnerTableSchema::all_coll_types_schema, - ObInnerTableSchema::user_coll_types_schema, - ObInnerTableSchema::dba_procedures_schema, - ObInnerTableSchema::dba_arguments_schema, - ObInnerTableSchema::dba_source_schema, - ObInnerTableSchema::all_procedures_schema, - ObInnerTableSchema::all_arguments_schema, - ObInnerTableSchema::all_source_schema, - ObInnerTableSchema::user_procedures_schema, - ObInnerTableSchema::user_arguments_schema, - ObInnerTableSchema::user_source_schema, - ObInnerTableSchema::dba_part_key_columns_schema, - ObInnerTableSchema::all_part_key_columns_schema, - ObInnerTableSchema::user_part_key_columns_schema, - ObInnerTableSchema::dba_subpart_key_columns_schema, - ObInnerTableSchema::all_subpart_key_columns_schema, - ObInnerTableSchema::user_subpart_key_columns_schema, - ObInnerTableSchema::dba_views_schema, - ObInnerTableSchema::all_views_schema, - ObInnerTableSchema::user_views_schema, - ObInnerTableSchema::all_tab_partitions_ora_schema, - ObInnerTableSchema::all_tab_subpartitions_ora_schema, - ObInnerTableSchema::all_part_tables_ora_schema, - ObInnerTableSchema::dba_part_tables_ora_schema, - ObInnerTableSchema::user_part_tables_ora_schema, - ObInnerTableSchema::dba_tab_partitions_ora_schema, - ObInnerTableSchema::user_tab_partitions_ora_schema, - ObInnerTableSchema::dba_tab_subpartitions_ora_schema, - ObInnerTableSchema::user_tab_subpartitions_ora_schema, - ObInnerTableSchema::dba_subpartition_templates_ora_schema, - ObInnerTableSchema::all_subpartition_templates_ora_schema, - ObInnerTableSchema::user_subpartition_templates_ora_schema, - ObInnerTableSchema::dba_part_indexes_schema, - ObInnerTableSchema::all_part_indexes_schema, - ObInnerTableSchema::user_part_indexes_schema, - ObInnerTableSchema::all_all_tables_ora_schema, - ObInnerTableSchema::dba_all_tables_ora_schema, - ObInnerTableSchema::user_all_tables_ora_schema, - ObInnerTableSchema::dba_profiles_ora_schema, - ObInnerTableSchema::user_profiles_ora_schema, - ObInnerTableSchema::all_profiles_ora_schema, - ObInnerTableSchema::all_mview_comments_ora_schema, - ObInnerTableSchema::user_mview_comments_ora_schema, - ObInnerTableSchema::dba_mview_comments_ora_schema, - ObInnerTableSchema::all_scheduler_program_args_ora_schema, - ObInnerTableSchema::dba_scheduler_program_args_ora_schema, - ObInnerTableSchema::user_scheduler_program_args_ora_schema, - ObInnerTableSchema::all_scheduler_job_args_ora_schema, - ObInnerTableSchema::dba_scheduler_job_args_ora_schema, - ObInnerTableSchema::user_scheduler_job_args_ora_schema, - ObInnerTableSchema::all_errors_ora_schema, - ObInnerTableSchema::dba_errors_ora_schema, - ObInnerTableSchema::user_errors_ora_schema, - ObInnerTableSchema::all_type_methods_ora_schema, - ObInnerTableSchema::dba_type_methods_ora_schema, - ObInnerTableSchema::user_type_methods_ora_schema, - ObInnerTableSchema::all_method_params_ora_schema, - ObInnerTableSchema::dba_method_params_ora_schema, - ObInnerTableSchema::user_method_params_ora_schema, - ObInnerTableSchema::dba_tablespaces_ora_schema, - ObInnerTableSchema::user_tablespaces_ora_schema, - ObInnerTableSchema::dba_ind_expressions_schema, - ObInnerTableSchema::user_ind_expressions_schema, - ObInnerTableSchema::all_ind_expressions_schema, - ObInnerTableSchema::all_ind_partitions_schema, - ObInnerTableSchema::user_ind_partitions_schema, - ObInnerTableSchema::dba_ind_partitions_schema, - ObInnerTableSchema::dba_ind_subpartitions_schema, - ObInnerTableSchema::all_ind_subpartitions_schema, - ObInnerTableSchema::user_ind_subpartitions_schema, - ObInnerTableSchema::dba_roles_schema, - ObInnerTableSchema::dba_role_privs_schema, - ObInnerTableSchema::user_role_privs_schema, - ObInnerTableSchema::dba_tab_privs_schema, - ObInnerTableSchema::all_tab_privs_schema, - ObInnerTableSchema::user_tab_privs_schema, - ObInnerTableSchema::dba_sys_privs_schema, - ObInnerTableSchema::user_sys_privs_schema, - ObInnerTableSchema::dba_col_privs_ora_schema, - ObInnerTableSchema::user_col_privs_ora_schema, - ObInnerTableSchema::all_col_privs_ora_schema, - ObInnerTableSchema::role_tab_privs_ora_schema, - ObInnerTableSchema::role_sys_privs_ora_schema, - ObInnerTableSchema::role_role_privs_ora_schema, - ObInnerTableSchema::dictionary_ora_schema, - ObInnerTableSchema::dict_ora_schema, - ObInnerTableSchema::all_triggers_schema, - ObInnerTableSchema::dba_triggers_schema, - ObInnerTableSchema::user_triggers_schema, - ObInnerTableSchema::all_dependencies_ora_schema, - ObInnerTableSchema::dba_dependencies_ora_schema, - ObInnerTableSchema::user_dependencies_ora_schema, - ObInnerTableSchema::dba_rsrc_plans_schema, - ObInnerTableSchema::dba_rsrc_plan_directives_schema, - ObInnerTableSchema::dba_rsrc_group_mappings_schema, - ObInnerTableSchema::dba_recyclebin_ora_schema, - ObInnerTableSchema::user_recyclebin_ora_schema, - ObInnerTableSchema::dba_rsrc_consumer_groups_schema, - ObInnerTableSchema::gv_outline_ora_schema, - ObInnerTableSchema::gv_sql_audit_ora_schema, - ObInnerTableSchema::v_sql_audit_ora_schema, - ObInnerTableSchema::gv_instance_schema, - ObInnerTableSchema::v_instance_schema, - ObInnerTableSchema::gv_plan_cache_plan_stat_ora_schema, - ObInnerTableSchema::v_plan_cache_plan_stat_ora_schema, - ObInnerTableSchema::gv_plan_cache_plan_explain_ora_schema, - ObInnerTableSchema::v_plan_cache_plan_explain_ora_schema, - ObInnerTableSchema::gv_session_wait_ora_schema, - ObInnerTableSchema::v_session_wait_ora_schema, - ObInnerTableSchema::gv_session_wait_history_ora_schema, - ObInnerTableSchema::v_session_wait_history_ora_schema, - ObInnerTableSchema::gv_memory_ora_schema, - ObInnerTableSchema::v_memory_ora_schema, - ObInnerTableSchema::gv_memstore_ora_schema, - ObInnerTableSchema::v_memstore_ora_schema, - ObInnerTableSchema::gv_memstore_info_ora_schema, - ObInnerTableSchema::v_memstore_info_ora_schema, - ObInnerTableSchema::gv_server_memstore_ora_schema, - ObInnerTableSchema::gv_sesstat_ora_schema, - ObInnerTableSchema::v_sesstat_ora_schema, - ObInnerTableSchema::gv_sysstat_ora_schema, - ObInnerTableSchema::v_sysstat_ora_schema, - ObInnerTableSchema::gv_system_event_ora_schema, - ObInnerTableSchema::v_system_event_ora_schema, - ObInnerTableSchema::gv_tenant_memstore_allocator_info_ora_schema, - ObInnerTableSchema::v_tenant_memstore_allocator_info_ora_schema, - ObInnerTableSchema::gv_plan_cache_stat_ora_schema, - ObInnerTableSchema::v_plan_cache_stat_ora_schema, - ObInnerTableSchema::gv_concurrent_limit_sql_ora_schema, - ObInnerTableSchema::nls_session_parameters_ora_schema, - ObInnerTableSchema::nls_instance_parameters_ora_schema, - ObInnerTableSchema::nls_database_parameters_ora_schema, - ObInnerTableSchema::v_nls_parameters_ora_schema, - ObInnerTableSchema::v_version_ora_schema, - ObInnerTableSchema::gv_tenant_px_worker_stat_ora_schema, - ObInnerTableSchema::v_tenant_px_worker_stat_ora_schema, - ObInnerTableSchema::gv_ps_stat_ora_schema, - ObInnerTableSchema::v_ps_stat_ora_schema, - ObInnerTableSchema::gv_ps_item_info_ora_schema, - ObInnerTableSchema::v_ps_item_info_ora_schema, - ObInnerTableSchema::gv_sql_workarea_active_ora_schema, - ObInnerTableSchema::v_sql_workarea_active_ora_schema, - ObInnerTableSchema::gv_sql_workarea_histogram_ora_schema, - ObInnerTableSchema::v_sql_workarea_histogram_ora_schema, - ObInnerTableSchema::gv_ob_sql_workarea_memory_info_ora_schema, - ObInnerTableSchema::v_ob_sql_workarea_memory_info_ora_schema, - ObInnerTableSchema::gv_plan_cache_reference_info_ora_schema, - ObInnerTableSchema::v_plan_cache_reference_info_ora_schema, - ObInnerTableSchema::gv_sql_workarea_ora_schema, - ObInnerTableSchema::v_sql_workarea_ora_schema, - ObInnerTableSchema::gv_sstable_ora_schema, - ObInnerTableSchema::v_sstable_ora_schema, - ObInnerTableSchema::gv_server_schema_info_ora_schema, - ObInnerTableSchema::v_server_schema_info_ora_schema, - ObInnerTableSchema::gv_sql_plan_monitor_ora_schema, - ObInnerTableSchema::v_sql_plan_monitor_ora_schema, - ObInnerTableSchema::v_sql_monitor_statname_ora_schema, - ObInnerTableSchema::gv_lock_ora_schema, - ObInnerTableSchema::v_lock_ora_schema, - ObInnerTableSchema::gv_open_cursor_ora_schema, - ObInnerTableSchema::v_open_cursor_ora_schema, - ObInnerTableSchema::v_timezone_names_ora_schema, - ObInnerTableSchema::gv_global_transaction_ora_schema, - ObInnerTableSchema::v_global_transaction_ora_schema, - ObInnerTableSchema::v_restore_point_ora_schema, - ObInnerTableSchema::v_rsrc_plan_ora_schema, - ObInnerTableSchema::triggers_schema, - NULL, -}; +const schema_create_func sys_view_schema_creators [] = { + ObInnerTableSchema::gv_plan_cache_stat_schema, + ObInnerTableSchema::gv_plan_cache_plan_stat_schema, + ObInnerTableSchema::schemata_schema, + ObInnerTableSchema::character_sets_schema, + ObInnerTableSchema::global_variables_schema, + ObInnerTableSchema::statistics_schema, + ObInnerTableSchema::views_schema, + ObInnerTableSchema::tables_schema, + ObInnerTableSchema::collations_schema, + ObInnerTableSchema::collation_character_set_applicability_schema, + ObInnerTableSchema::processlist_schema, + ObInnerTableSchema::key_column_usage_schema, + ObInnerTableSchema::dba_outlines_schema, + ObInnerTableSchema::engines_schema, + ObInnerTableSchema::routines_schema, + ObInnerTableSchema::gv_session_event_schema, + ObInnerTableSchema::gv_session_wait_schema, + ObInnerTableSchema::gv_session_wait_history_schema, + ObInnerTableSchema::gv_system_event_schema, + ObInnerTableSchema::gv_sesstat_schema, + ObInnerTableSchema::gv_sysstat_schema, + ObInnerTableSchema::v_statname_schema, + ObInnerTableSchema::v_event_name_schema, + ObInnerTableSchema::v_session_event_schema, + ObInnerTableSchema::v_session_wait_schema, + ObInnerTableSchema::v_session_wait_history_schema, + ObInnerTableSchema::v_sesstat_schema, + ObInnerTableSchema::v_sysstat_schema, + ObInnerTableSchema::v_system_event_schema, + ObInnerTableSchema::gv_sql_audit_schema, + ObInnerTableSchema::gv_latch_schema, + ObInnerTableSchema::gv_memory_schema, + ObInnerTableSchema::v_memory_schema, + ObInnerTableSchema::gv_memstore_schema, + ObInnerTableSchema::v_memstore_schema, + ObInnerTableSchema::gv_memstore_info_schema, + ObInnerTableSchema::v_memstore_info_schema, + ObInnerTableSchema::v_plan_cache_stat_schema, + ObInnerTableSchema::v_plan_cache_plan_stat_schema, + ObInnerTableSchema::gv_plan_cache_plan_explain_schema, + ObInnerTableSchema::v_plan_cache_plan_explain_schema, + ObInnerTableSchema::v_sql_audit_schema, + ObInnerTableSchema::v_latch_schema, + ObInnerTableSchema::gv_obrpc_outgoing_schema, + ObInnerTableSchema::v_obrpc_outgoing_schema, + ObInnerTableSchema::gv_obrpc_incoming_schema, + ObInnerTableSchema::v_obrpc_incoming_schema, + ObInnerTableSchema::gv_sql_schema, + ObInnerTableSchema::v_sql_schema, + ObInnerTableSchema::gv_sql_monitor_schema, + ObInnerTableSchema::v_sql_monitor_schema, + ObInnerTableSchema::gv_sql_plan_monitor_schema, + ObInnerTableSchema::v_sql_plan_monitor_schema, + ObInnerTableSchema::user_recyclebin_schema, + ObInnerTableSchema::gv_outline_schema, + ObInnerTableSchema::gv_concurrent_limit_sql_schema, + ObInnerTableSchema::gv_sql_plan_statistics_schema, + ObInnerTableSchema::v_sql_plan_statistics_schema, + ObInnerTableSchema::gv_server_memstore_schema, + ObInnerTableSchema::gv_unit_load_balance_event_history_schema, + ObInnerTableSchema::gv_tenant_schema, + ObInnerTableSchema::gv_database_schema, + ObInnerTableSchema::gv_table_schema, + ObInnerTableSchema::gv_unit_schema, + ObInnerTableSchema::v_unit_schema, + ObInnerTableSchema::gv_partition_schema, + ObInnerTableSchema::v_partition_schema, + ObInnerTableSchema::gv_lock_wait_stat_schema, + ObInnerTableSchema::v_lock_wait_stat_schema, + ObInnerTableSchema::time_zone_schema, + ObInnerTableSchema::time_zone_name_schema, + ObInnerTableSchema::time_zone_transition_schema, + ObInnerTableSchema::time_zone_transition_type_schema, + ObInnerTableSchema::gv_session_longops_schema, + ObInnerTableSchema::v_session_longops_schema, + ObInnerTableSchema::gv_tenant_memstore_allocator_info_schema, + ObInnerTableSchema::v_tenant_memstore_allocator_info_schema, + ObInnerTableSchema::gv_tenant_sequence_object_schema, + ObInnerTableSchema::columns_schema, + ObInnerTableSchema::gv_minor_merge_info_schema, + ObInnerTableSchema::gv_tenant_px_worker_stat_schema, + ObInnerTableSchema::v_tenant_px_worker_stat_schema, + ObInnerTableSchema::gv_partition_audit_schema, + ObInnerTableSchema::v_partition_audit_schema, + ObInnerTableSchema::v_ob_cluster_schema, + ObInnerTableSchema::gv_ps_stat_schema, + ObInnerTableSchema::v_ps_stat_schema, + ObInnerTableSchema::gv_ps_item_info_schema, + ObInnerTableSchema::v_ps_item_info_schema, + ObInnerTableSchema::gv_sql_workarea_schema, + ObInnerTableSchema::v_sql_workarea_schema, + ObInnerTableSchema::gv_sql_workarea_active_schema, + ObInnerTableSchema::v_sql_workarea_active_schema, + ObInnerTableSchema::gv_sql_workarea_histogram_schema, + ObInnerTableSchema::v_sql_workarea_histogram_schema, + ObInnerTableSchema::gv_ob_sql_workarea_memory_info_schema, + ObInnerTableSchema::v_ob_sql_workarea_memory_info_schema, + ObInnerTableSchema::gv_plan_cache_reference_info_schema, + ObInnerTableSchema::v_plan_cache_reference_info_schema, + ObInnerTableSchema::v_ob_timestamp_service_schema, + ObInnerTableSchema::gv_sstable_schema, + ObInnerTableSchema::v_sstable_schema, + ObInnerTableSchema::cdb_ob_backup_archivelog_summary_schema, + ObInnerTableSchema::cdb_ob_backup_job_details_schema, + ObInnerTableSchema::cdb_ob_backup_set_details_schema, + ObInnerTableSchema::cdb_ob_backup_set_expired_schema, + ObInnerTableSchema::cdb_ob_backup_progress_schema, + ObInnerTableSchema::cdb_ob_backup_archivelog_progress_schema, + ObInnerTableSchema::cdb_ob_backup_clean_history_schema, + ObInnerTableSchema::cdb_ob_backup_task_clean_history_schema, + ObInnerTableSchema::cdb_ob_restore_progress_schema, + ObInnerTableSchema::cdb_ob_restore_history_schema, + ObInnerTableSchema::gv_server_schema_info_schema, + ObInnerTableSchema::v_server_schema_info_schema, + ObInnerTableSchema::cdb_ckpt_history_schema, + ObInnerTableSchema::gv_ob_trans_table_status_schema, + ObInnerTableSchema::v_ob_trans_table_status_schema, + ObInnerTableSchema::v_sql_monitor_statname_schema, + ObInnerTableSchema::gv_merge_info_schema, + ObInnerTableSchema::v_merge_info_schema, + ObInnerTableSchema::gv_lock_schema, + ObInnerTableSchema::v_lock_schema, + ObInnerTableSchema::cdb_ob_backup_validation_job_schema, + ObInnerTableSchema::cdb_ob_backup_validation_job_history_schema, + ObInnerTableSchema::cdb_ob_tenant_backup_validation_task_schema, + ObInnerTableSchema::cdb_ob_backup_validation_task_history_schema, + ObInnerTableSchema::v_restore_point_schema, + ObInnerTableSchema::cdb_ob_backup_set_obsolete_schema, + ObInnerTableSchema::cdb_ob_backup_backupset_job_schema, + ObInnerTableSchema::cdb_ob_backup_backupset_job_history_schema, + ObInnerTableSchema::cdb_ob_backup_backupset_task_schema, + ObInnerTableSchema::cdb_ob_backup_backupset_task_history_schema, + ObInnerTableSchema::cdb_ob_backup_backup_archivelog_summary_schema, + ObInnerTableSchema::dba_synonyms_schema, + ObInnerTableSchema::dba_objects_schema, + ObInnerTableSchema::all_objects_schema, + ObInnerTableSchema::user_objects_schema, + ObInnerTableSchema::dba_sequences_schema, + ObInnerTableSchema::all_sequences_schema, + ObInnerTableSchema::user_sequences_schema, + ObInnerTableSchema::dba_users_schema, + ObInnerTableSchema::all_users_schema, + ObInnerTableSchema::all_synonyms_schema, + ObInnerTableSchema::user_synonyms_schema, + ObInnerTableSchema::dba_ind_columns_schema, + ObInnerTableSchema::all_ind_columns_schema, + ObInnerTableSchema::user_ind_columns_schema, + ObInnerTableSchema::dba_constraints_schema, + ObInnerTableSchema::all_constraints_schema, + ObInnerTableSchema::user_constraints_schema, + ObInnerTableSchema::all_tab_cols_v_schema, + ObInnerTableSchema::dba_tab_cols_v_schema, + ObInnerTableSchema::user_tab_cols_v_schema, + ObInnerTableSchema::all_tab_cols_schema, + ObInnerTableSchema::dba_tab_cols_schema, + ObInnerTableSchema::user_tab_cols_schema, + ObInnerTableSchema::all_tab_columns_schema, + ObInnerTableSchema::dba_tab_columns_schema, + ObInnerTableSchema::user_tab_columns_schema, + ObInnerTableSchema::all_tables_schema, + ObInnerTableSchema::dba_tables_schema, + ObInnerTableSchema::user_tables_schema, + ObInnerTableSchema::dba_tab_comments_schema, + ObInnerTableSchema::all_tab_comments_schema, + ObInnerTableSchema::user_tab_comments_schema, + ObInnerTableSchema::dba_col_comments_schema, + ObInnerTableSchema::all_col_comments_schema, + ObInnerTableSchema::user_col_comments_schema, + ObInnerTableSchema::dba_indexes_schema, + ObInnerTableSchema::all_indexes_schema, + ObInnerTableSchema::user_indexes_schema, + ObInnerTableSchema::dba_cons_columns_schema, + ObInnerTableSchema::all_cons_columns_schema, + ObInnerTableSchema::user_cons_columns_schema, + ObInnerTableSchema::user_segments_schema, + ObInnerTableSchema::dba_segments_schema, + ObInnerTableSchema::dba_types_schema, + ObInnerTableSchema::all_types_schema, + ObInnerTableSchema::user_types_schema, + ObInnerTableSchema::dba_type_attrs_schema, + ObInnerTableSchema::all_type_attrs_schema, + ObInnerTableSchema::user_type_attrs_schema, + ObInnerTableSchema::dba_coll_types_schema, + ObInnerTableSchema::all_coll_types_schema, + ObInnerTableSchema::user_coll_types_schema, + ObInnerTableSchema::dba_procedures_schema, + ObInnerTableSchema::dba_arguments_schema, + ObInnerTableSchema::dba_source_schema, + ObInnerTableSchema::all_procedures_schema, + ObInnerTableSchema::all_arguments_schema, + ObInnerTableSchema::all_source_schema, + ObInnerTableSchema::user_procedures_schema, + ObInnerTableSchema::user_arguments_schema, + ObInnerTableSchema::user_source_schema, + ObInnerTableSchema::dba_part_key_columns_schema, + ObInnerTableSchema::all_part_key_columns_schema, + ObInnerTableSchema::user_part_key_columns_schema, + ObInnerTableSchema::dba_subpart_key_columns_schema, + ObInnerTableSchema::all_subpart_key_columns_schema, + ObInnerTableSchema::user_subpart_key_columns_schema, + ObInnerTableSchema::dba_views_schema, + ObInnerTableSchema::all_views_schema, + ObInnerTableSchema::user_views_schema, + ObInnerTableSchema::all_tab_partitions_ora_schema, + ObInnerTableSchema::all_tab_subpartitions_ora_schema, + ObInnerTableSchema::all_part_tables_ora_schema, + ObInnerTableSchema::dba_part_tables_ora_schema, + ObInnerTableSchema::user_part_tables_ora_schema, + ObInnerTableSchema::dba_tab_partitions_ora_schema, + ObInnerTableSchema::user_tab_partitions_ora_schema, + ObInnerTableSchema::dba_tab_subpartitions_ora_schema, + ObInnerTableSchema::user_tab_subpartitions_ora_schema, + ObInnerTableSchema::dba_subpartition_templates_ora_schema, + ObInnerTableSchema::all_subpartition_templates_ora_schema, + ObInnerTableSchema::user_subpartition_templates_ora_schema, + ObInnerTableSchema::dba_part_indexes_schema, + ObInnerTableSchema::all_part_indexes_schema, + ObInnerTableSchema::user_part_indexes_schema, + ObInnerTableSchema::all_all_tables_ora_schema, + ObInnerTableSchema::dba_all_tables_ora_schema, + ObInnerTableSchema::user_all_tables_ora_schema, + ObInnerTableSchema::dba_profiles_ora_schema, + ObInnerTableSchema::user_profiles_ora_schema, + ObInnerTableSchema::all_profiles_ora_schema, + ObInnerTableSchema::all_mview_comments_ora_schema, + ObInnerTableSchema::user_mview_comments_ora_schema, + ObInnerTableSchema::dba_mview_comments_ora_schema, + ObInnerTableSchema::all_scheduler_program_args_ora_schema, + ObInnerTableSchema::dba_scheduler_program_args_ora_schema, + ObInnerTableSchema::user_scheduler_program_args_ora_schema, + ObInnerTableSchema::all_scheduler_job_args_ora_schema, + ObInnerTableSchema::dba_scheduler_job_args_ora_schema, + ObInnerTableSchema::user_scheduler_job_args_ora_schema, + ObInnerTableSchema::all_errors_ora_schema, + ObInnerTableSchema::dba_errors_ora_schema, + ObInnerTableSchema::user_errors_ora_schema, + ObInnerTableSchema::all_type_methods_ora_schema, + ObInnerTableSchema::dba_type_methods_ora_schema, + ObInnerTableSchema::user_type_methods_ora_schema, + ObInnerTableSchema::all_method_params_ora_schema, + ObInnerTableSchema::dba_method_params_ora_schema, + ObInnerTableSchema::user_method_params_ora_schema, + ObInnerTableSchema::dba_tablespaces_ora_schema, + ObInnerTableSchema::user_tablespaces_ora_schema, + ObInnerTableSchema::dba_ind_expressions_schema, + ObInnerTableSchema::user_ind_expressions_schema, + ObInnerTableSchema::all_ind_expressions_schema, + ObInnerTableSchema::all_ind_partitions_schema, + ObInnerTableSchema::user_ind_partitions_schema, + ObInnerTableSchema::dba_ind_partitions_schema, + ObInnerTableSchema::dba_ind_subpartitions_schema, + ObInnerTableSchema::all_ind_subpartitions_schema, + ObInnerTableSchema::user_ind_subpartitions_schema, + ObInnerTableSchema::dba_roles_schema, + ObInnerTableSchema::dba_role_privs_schema, + ObInnerTableSchema::user_role_privs_schema, + ObInnerTableSchema::dba_tab_privs_schema, + ObInnerTableSchema::all_tab_privs_schema, + ObInnerTableSchema::user_tab_privs_schema, + ObInnerTableSchema::dba_sys_privs_schema, + ObInnerTableSchema::user_sys_privs_schema, + ObInnerTableSchema::dba_col_privs_ora_schema, + ObInnerTableSchema::user_col_privs_ora_schema, + ObInnerTableSchema::all_col_privs_ora_schema, + ObInnerTableSchema::role_tab_privs_ora_schema, + ObInnerTableSchema::role_sys_privs_ora_schema, + ObInnerTableSchema::role_role_privs_ora_schema, + ObInnerTableSchema::dictionary_ora_schema, + ObInnerTableSchema::dict_ora_schema, + ObInnerTableSchema::all_triggers_schema, + ObInnerTableSchema::dba_triggers_schema, + ObInnerTableSchema::user_triggers_schema, + ObInnerTableSchema::all_dependencies_ora_schema, + ObInnerTableSchema::dba_dependencies_ora_schema, + ObInnerTableSchema::user_dependencies_ora_schema, + ObInnerTableSchema::dba_rsrc_plans_schema, + ObInnerTableSchema::dba_rsrc_plan_directives_schema, + ObInnerTableSchema::dba_rsrc_group_mappings_schema, + ObInnerTableSchema::dba_recyclebin_ora_schema, + ObInnerTableSchema::user_recyclebin_ora_schema, + ObInnerTableSchema::dba_rsrc_consumer_groups_schema, + ObInnerTableSchema::gv_outline_ora_schema, + ObInnerTableSchema::gv_sql_audit_ora_schema, + ObInnerTableSchema::v_sql_audit_ora_schema, + ObInnerTableSchema::gv_instance_schema, + ObInnerTableSchema::v_instance_schema, + ObInnerTableSchema::gv_plan_cache_plan_stat_ora_schema, + ObInnerTableSchema::v_plan_cache_plan_stat_ora_schema, + ObInnerTableSchema::gv_plan_cache_plan_explain_ora_schema, + ObInnerTableSchema::v_plan_cache_plan_explain_ora_schema, + ObInnerTableSchema::gv_session_wait_ora_schema, + ObInnerTableSchema::v_session_wait_ora_schema, + ObInnerTableSchema::gv_session_wait_history_ora_schema, + ObInnerTableSchema::v_session_wait_history_ora_schema, + ObInnerTableSchema::gv_memory_ora_schema, + ObInnerTableSchema::v_memory_ora_schema, + ObInnerTableSchema::gv_memstore_ora_schema, + ObInnerTableSchema::v_memstore_ora_schema, + ObInnerTableSchema::gv_memstore_info_ora_schema, + ObInnerTableSchema::v_memstore_info_ora_schema, + ObInnerTableSchema::gv_server_memstore_ora_schema, + ObInnerTableSchema::gv_sesstat_ora_schema, + ObInnerTableSchema::v_sesstat_ora_schema, + ObInnerTableSchema::gv_sysstat_ora_schema, + ObInnerTableSchema::v_sysstat_ora_schema, + ObInnerTableSchema::gv_system_event_ora_schema, + ObInnerTableSchema::v_system_event_ora_schema, + ObInnerTableSchema::gv_tenant_memstore_allocator_info_ora_schema, + ObInnerTableSchema::v_tenant_memstore_allocator_info_ora_schema, + ObInnerTableSchema::gv_plan_cache_stat_ora_schema, + ObInnerTableSchema::v_plan_cache_stat_ora_schema, + ObInnerTableSchema::gv_concurrent_limit_sql_ora_schema, + ObInnerTableSchema::nls_session_parameters_ora_schema, + ObInnerTableSchema::nls_instance_parameters_ora_schema, + ObInnerTableSchema::nls_database_parameters_ora_schema, + ObInnerTableSchema::v_nls_parameters_ora_schema, + ObInnerTableSchema::v_version_ora_schema, + ObInnerTableSchema::gv_tenant_px_worker_stat_ora_schema, + ObInnerTableSchema::v_tenant_px_worker_stat_ora_schema, + ObInnerTableSchema::gv_ps_stat_ora_schema, + ObInnerTableSchema::v_ps_stat_ora_schema, + ObInnerTableSchema::gv_ps_item_info_ora_schema, + ObInnerTableSchema::v_ps_item_info_ora_schema, + ObInnerTableSchema::gv_sql_workarea_active_ora_schema, + ObInnerTableSchema::v_sql_workarea_active_ora_schema, + ObInnerTableSchema::gv_sql_workarea_histogram_ora_schema, + ObInnerTableSchema::v_sql_workarea_histogram_ora_schema, + ObInnerTableSchema::gv_ob_sql_workarea_memory_info_ora_schema, + ObInnerTableSchema::v_ob_sql_workarea_memory_info_ora_schema, + ObInnerTableSchema::gv_plan_cache_reference_info_ora_schema, + ObInnerTableSchema::v_plan_cache_reference_info_ora_schema, + ObInnerTableSchema::gv_sql_workarea_ora_schema, + ObInnerTableSchema::v_sql_workarea_ora_schema, + ObInnerTableSchema::gv_sstable_ora_schema, + ObInnerTableSchema::v_sstable_ora_schema, + ObInnerTableSchema::gv_server_schema_info_ora_schema, + ObInnerTableSchema::v_server_schema_info_ora_schema, + ObInnerTableSchema::gv_sql_plan_monitor_ora_schema, + ObInnerTableSchema::v_sql_plan_monitor_ora_schema, + ObInnerTableSchema::v_sql_monitor_statname_ora_schema, + ObInnerTableSchema::gv_lock_ora_schema, + ObInnerTableSchema::v_lock_ora_schema, + ObInnerTableSchema::gv_open_cursor_ora_schema, + ObInnerTableSchema::v_open_cursor_ora_schema, + ObInnerTableSchema::v_timezone_names_ora_schema, + ObInnerTableSchema::gv_global_transaction_ora_schema, + ObInnerTableSchema::v_global_transaction_ora_schema, + ObInnerTableSchema::v_restore_point_ora_schema, + ObInnerTableSchema::v_rsrc_plan_ora_schema, + ObInnerTableSchema::triggers_schema, + NULL,}; const schema_create_func information_schema_table_schema_creators[] = { - NULL, -}; + NULL,}; const schema_create_func mysql_table_schema_creators[] = { - NULL, -}; + NULL,}; -const uint64_t tenant_space_tables[] = { - OB_ALL_TABLE_TID, - OB_ALL_COLUMN_TID, - OB_ALL_DDL_OPERATION_TID, - OB_ALL_TABLE_V2_TID, - OB_ALL_USER_TID, - OB_ALL_USER_HISTORY_TID, - OB_ALL_DATABASE_TID, - OB_ALL_DATABASE_HISTORY_TID, - OB_ALL_TABLEGROUP_TID, - OB_ALL_TABLEGROUP_HISTORY_TID, - OB_ALL_TABLE_PRIVILEGE_TID, - OB_ALL_TABLE_PRIVILEGE_HISTORY_TID, - OB_ALL_DATABASE_PRIVILEGE_TID, - OB_ALL_DATABASE_PRIVILEGE_HISTORY_TID, - OB_ALL_TABLE_HISTORY_TID, - OB_ALL_COLUMN_HISTORY_TID, - OB_TENANT_PARAMETER_TID, - OB_ALL_SYS_VARIABLE_TID, - OB_ALL_SYS_STAT_TID, - OB_ALL_COLUMN_STATISTIC_TID, - OB_ALL_DUMMY_TID, - OB_ALL_CLOG_HISTORY_INFO_V2_TID, - OB_ALL_OUTLINE_TID, - OB_ALL_OUTLINE_HISTORY_TID, - OB_ALL_RECYCLEBIN_TID, - OB_ALL_PART_TID, - OB_ALL_PART_HISTORY_TID, - OB_ALL_SUB_PART_TID, - OB_ALL_SUB_PART_HISTORY_TID, - OB_ALL_PART_INFO_TID, - OB_ALL_PART_INFO_HISTORY_TID, - OB_ALL_DEF_SUB_PART_TID, - OB_ALL_DEF_SUB_PART_HISTORY_TID, - OB_ALL_SYS_VARIABLE_HISTORY_TID, - OB_ALL_DDL_ID_TID, - OB_ALL_FOREIGN_KEY_TID, - OB_ALL_FOREIGN_KEY_HISTORY_TID, - OB_ALL_FOREIGN_KEY_COLUMN_TID, - OB_ALL_FOREIGN_KEY_COLUMN_HISTORY_TID, - OB_ALL_SYNONYM_TID, - OB_ALL_SYNONYM_HISTORY_TID, - OB_ALL_SEQUENCE_V2_TID, - OB_ALL_TENANT_META_TABLE_TID, - OB_ALL_ROUTINE_TID, - OB_ALL_ROUTINE_HISTORY_TID, - OB_ALL_ROUTINE_PARAM_TID, - OB_ALL_ROUTINE_PARAM_HISTORY_TID, - OB_ALL_TABLE_STAT_TID, - OB_ALL_COLUMN_STAT_TID, - OB_ALL_HISTOGRAM_STAT_TID, - OB_ALL_PACKAGE_TID, - OB_ALL_PACKAGE_HISTORY_TID, - OB_ALL_TENANT_GC_PARTITION_INFO_TID, - OB_ALL_CONSTRAINT_TID, - OB_ALL_CONSTRAINT_HISTORY_TID, - OB_ALL_ORI_SCHEMA_VERSION_TID, - OB_ALL_FUNC_TID, - OB_ALL_FUNC_HISTORY_TID, - OB_ALL_TEMP_TABLE_TID, - OB_ALL_SEQUENCE_OBJECT_TID, - OB_ALL_SEQUENCE_OBJECT_HISTORY_TID, - OB_ALL_SEQUENCE_VALUE_TID, - OB_ALL_TENANT_PLAN_BASELINE_TID, - OB_ALL_TENANT_PLAN_BASELINE_HISTORY_TID, - OB_ALL_TYPE_TID, - OB_ALL_TYPE_HISTORY_TID, - OB_ALL_TYPE_ATTR_TID, - OB_ALL_TYPE_ATTR_HISTORY_TID, - OB_ALL_COLL_TYPE_TID, - OB_ALL_COLL_TYPE_HISTORY_TID, - OB_ALL_WEAK_READ_SERVICE_TID, - OB_ALL_DBLINK_TID, - OB_ALL_DBLINK_HISTORY_TID, - OB_ALL_TENANT_PARTITION_META_TABLE_TID, - OB_ALL_TENANT_ROLE_GRANTEE_MAP_TID, - OB_ALL_TENANT_ROLE_GRANTEE_MAP_HISTORY_TID, - OB_ALL_TENANT_KEYSTORE_TID, - OB_ALL_TENANT_KEYSTORE_HISTORY_TID, - OB_ALL_TENANT_TABLESPACE_TID, - OB_ALL_TENANT_TABLESPACE_HISTORY_TID, - OB_ALL_TENANT_USER_FAILED_LOGIN_STAT_TID, - OB_ALL_TENANT_PROFILE_TID, - OB_ALL_TENANT_PROFILE_HISTORY_TID, - OB_ALL_TENANT_SECURITY_AUDIT_TID, - OB_ALL_TENANT_SECURITY_AUDIT_HISTORY_TID, - OB_ALL_TENANT_TRIGGER_TID, - OB_ALL_TENANT_TRIGGER_HISTORY_TID, - OB_ALL_TENANT_SSTABLE_COLUMN_CHECKSUM_TID, - OB_ALL_TENANT_SECURITY_AUDIT_RECORD_TID, - OB_ALL_TENANT_SYSAUTH_TID, - OB_ALL_TENANT_SYSAUTH_HISTORY_TID, - OB_ALL_TENANT_OBJAUTH_TID, - OB_ALL_TENANT_OBJAUTH_HISTORY_TID, - OB_ALL_TENANT_BACKUP_INFO_TID, - OB_ALL_TENANT_BACKUP_LOG_ARCHIVE_STATUS_TID, - OB_ALL_TENANT_BACKUP_TASK_TID, - OB_ALL_TENANT_PG_BACKUP_TASK_TID, - OB_ALL_TENANT_ERROR_TID, - OB_ALL_TENANT_BACKUP_CLEAN_INFO_TID, - OB_ALL_TENANT_RESTORE_PG_INFO_TID, - OB_ALL_TABLE_V2_HISTORY_TID, - OB_ALL_TENANT_OBJECT_TYPE_TID, - OB_ALL_TENANT_OBJECT_TYPE_HISTORY_TID, - OB_ALL_TENANT_BACKUP_VALIDATION_TASK_TID, - OB_ALL_TENANT_PG_BACKUP_VALIDATION_TASK_TID, - OB_ALL_TENANT_TIME_ZONE_TID, - OB_ALL_TENANT_TIME_ZONE_NAME_TID, - OB_ALL_TENANT_TIME_ZONE_TRANSITION_TID, - OB_ALL_TENANT_TIME_ZONE_TRANSITION_TYPE_TID, - OB_ALL_TENANT_CONSTRAINT_COLUMN_TID, - OB_ALL_TENANT_CONSTRAINT_COLUMN_HISTORY_TID, - OB_ALL_TENANT_GLOBAL_TRANSACTION_TID, - OB_ALL_TENANT_DEPENDENCY_TID, - OB_ALL_TENANT_BACKUP_BACKUPSET_TASK_TID, - OB_ALL_TENANT_PG_BACKUP_BACKUPSET_TASK_TID, - OB_ALL_TENANT_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TID, - OB_ALL_RES_MGR_PLAN_TID, - OB_ALL_RES_MGR_DIRECTIVE_TID, - OB_ALL_RES_MGR_MAPPING_RULE_TID, - OB_ALL_RES_MGR_CONSUMER_GROUP_TID, - OB_ALL_TABLE_V2_HISTORY_IDX_DATA_TABLE_ID_TID, - OB_ALL_TABLE_HISTORY_IDX_DATA_TABLE_ID_TID, - OB_TENANT_VIRTUAL_ALL_TABLE_TID, - OB_TENANT_VIRTUAL_TABLE_COLUMN_TID, - OB_TENANT_VIRTUAL_TABLE_INDEX_TID, - OB_TENANT_VIRTUAL_SHOW_CREATE_DATABASE_TID, - OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_TID, - OB_TENANT_VIRTUAL_SESSION_VARIABLE_TID, - OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_TID, - OB_TENANT_VIRTUAL_WARNING_TID, - OB_TENANT_VIRTUAL_CURRENT_TENANT_TID, - OB_TENANT_VIRTUAL_DATABASE_STATUS_TID, - OB_TENANT_VIRTUAL_TENANT_STATUS_TID, - OB_TENANT_VIRTUAL_INTERM_RESULT_TID, - OB_TENANT_VIRTUAL_PARTITION_STAT_TID, - OB_TENANT_VIRTUAL_STATNAME_TID, - OB_TENANT_VIRTUAL_EVENT_NAME_TID, - OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_TID, - OB_TENANT_VIRTUAL_SHOW_TABLES_TID, - OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_TID, - OB_ALL_VIRTUAL_DATA_TYPE_CLASS_TID, - OB_ALL_VIRTUAL_DATA_TYPE_TID, - OB_ALL_VIRTUAL_CORE_ALL_TABLE_TID, - OB_ALL_VIRTUAL_CORE_COLUMN_TABLE_TID, - OB_ALL_VIRTUAL_TRACE_LOG_TID, - OB_ALL_VIRTUAL_ENGINE_TID, - OB_TENANT_VIRTUAL_OUTLINE_TID, - OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_TID, - OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_TID, - OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_TID, - OB_SESSION_VARIABLES_TID, - OB_TABLE_PRIVILEGES_TID, - OB_USER_PRIVILEGES_TID, - OB_SCHEMA_PRIVILEGES_TID, - OB_TABLE_CONSTRAINTS_TID, - OB_GLOBAL_STATUS_TID, - OB_PARTITIONS_TID, - OB_SESSION_STATUS_TID, - OB_USER_TID, - OB_DB_TID, - OB_PROC_TID, - OB_TENANT_VIRTUAL_COLLATION_TID, - OB_TENANT_VIRTUAL_CHARSET_TID, - OB_PARAMETERS_TID, - OB_ALL_VIRTUAL_WEAK_READ_STAT_TID, - OB_ALL_VIRTUAL_INFORMATION_COLUMNS_TID, - OB_REFERENTIAL_CONSTRAINTS_TID, - OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_TID, - OB_ALL_VIRTUAL_OPEN_CURSOR_TID, - OB_ALL_VIRTUAL_FILES_TID, - OB_FILES_TID, - OB_TENANT_VIRTUAL_OBJECT_DEFINITION_TID, - OB_ALL_VIRTUAL_TABLE_AGENT_TID, - OB_ALL_VIRTUAL_COLUMN_AGENT_TID, - OB_ALL_VIRTUAL_DATABASE_AGENT_TID, - OB_ALL_VIRTUAL_SEQUENCE_V2_AGENT_TID, - OB_ALL_VIRTUAL_PART_AGENT_TID, - OB_ALL_VIRTUAL_SUB_PART_AGENT_TID, - OB_ALL_VIRTUAL_PACKAGE_AGENT_TID, - OB_ALL_VIRTUAL_TENANT_META_TABLE_AGENT_TID, - OB_ALL_VIRTUAL_SQL_AUDIT_ORA_TID, - OB_ALL_VIRTUAL_SQL_AUDIT_ORA_ALL_VIRTUAL_SQL_AUDIT_I1_TID, - OB_ALL_VIRTUAL_PLAN_STAT_ORA_TID, - OB_ALL_VIRTUAL_SQL_PLAN_STATISTICS_AGENT_TID, - OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_ORA_TID, - OB_ALL_VIRTUAL_SEQUENCE_VALUE_AGENT_TID, - OB_ALL_VIRTUAL_SEQUENCE_OBJECT_AGENT_TID, - OB_ALL_VIRTUAL_USER_AGENT_TID, - OB_ALL_VIRTUAL_SYNONYM_AGENT_TID, - OB_ALL_VIRTUAL_FOREIGN_KEY_AGENT_TID, - OB_ALL_VIRTUAL_COLUMN_STAT_AGENT_TID, - OB_ALL_VIRTUAL_COLUMN_STATISTIC_AGENT_TID, - OB_ALL_VIRTUAL_PARTITION_TABLE_AGENT_TID, - OB_ALL_VIRTUAL_TABLE_STAT_AGENT_TID, - OB_ALL_VIRTUAL_RECYCLEBIN_AGENT_TID, - OB_TENANT_VIRTUAL_OUTLINE_AGENT_TID, - OB_ALL_VIRTUAL_ROUTINE_AGENT_TID, - OB_ALL_VIRTUAL_TABLEGROUP_AGENT_TID, - OB_ALL_VIRTUAL_PRIVILEGE_AGENT_TID, - OB_ALL_VIRTUAL_SYS_PARAMETER_STAT_AGENT_TID, - OB_TENANT_VIRTUAL_TABLE_INDEX_AGENT_TID, - OB_TENANT_VIRTUAL_CHARSET_AGENT_TID, - OB_TENANT_VIRTUAL_ALL_TABLE_AGENT_TID, - OB_TENANT_VIRTUAL_COLLATION_AGENT_TID, - OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_AGENT_TID, - OB_ALL_VIRTUAL_SERVER_AGENT_TID, - OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_TID, - OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TID, - OB_ALL_VIRTUAL_PROCESSLIST_ORA_TID, - OB_ALL_VIRTUAL_SESSION_WAIT_ORA_TID, - OB_ALL_VIRTUAL_SESSION_WAIT_ORA_ALL_VIRTUAL_SESSION_WAIT_I1_TID, - OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_TID, - OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TID, - OB_ALL_VIRTUAL_MEMORY_INFO_ORA_TID, - OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_ORA_TID, - OB_ALL_VIRTUAL_MEMSTORE_INFO_ORA_TID, - OB_ALL_VIRTUAL_SERVER_MEMORY_INFO_AGENT_TID, - OB_ALL_VIRTUAL_SESSTAT_ORA_TID, - OB_ALL_VIRTUAL_SESSTAT_ORA_ALL_VIRTUAL_SESSTAT_I1_TID, - OB_ALL_VIRTUAL_SYSSTAT_ORA_TID, - OB_ALL_VIRTUAL_SYSSTAT_ORA_ALL_VIRTUAL_SYSSTAT_I1_TID, - OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_TID, - OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_ALL_VIRTUAL_SYSTEM_EVENT_I1_TID, - OB_ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_AGENT_TID, - OB_TENANT_VIRTUAL_SESSION_VARIABLE_ORA_TID, - OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_ORA_TID, - OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_ORA_TID, - OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_ORA_TID, - OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_ORA_TID, - OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_ORA_TID, - OB_TENANT_VIRTUAL_TABLE_COLUMN_ORA_TID, - OB_ALL_VIRTUAL_TRACE_LOG_ORA_TID, - OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_AGENT_TID, - OB_ALL_VIRTUAL_CONSTRAINT_AGENT_TID, - OB_ALL_VIRTUAL_TYPE_AGENT_TID, - OB_ALL_VIRTUAL_TYPE_ATTR_AGENT_TID, - OB_ALL_VIRTUAL_COLL_TYPE_AGENT_TID, - OB_ALL_VIRTUAL_ROUTINE_PARAM_AGENT_TID, - OB_ALL_VIRTUAL_DATA_TYPE_ORA_TID, - OB_ALL_VIRTUAL_TABLE_SYS_AGENT_TID, - OB_ALL_VIRTUAL_SSTABLE_CHECKSUM_AGENT_TID, - OB_ALL_VIRTUAL_PARTITION_INFO_AGENT_TID, - OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_AGENT_TID, - OB_ALL_VIRTUAL_TENANT_KEYSTORE_AGENT_TID, - OB_ALL_VIRTUAL_TENANT_TABLESPACE_AGENT_TID, - OB_ALL_VIRTUAL_TENANT_PROFILE_AGENT_TID, - OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT_TID, - OB_ALL_VIRTUAL_TABLE_PRIVILEGE_AGENT_TID, - OB_ALL_VIRTUAL_SECURITY_AUDIT_AGENT_TID, - OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_AGENT_TID, - OB_ALL_VIRTUAL_TRIGGER_AGENT_TID, - OB_ALL_VIRTUAL_PX_WORKER_STAT_ORA_TID, - OB_ALL_VIRTUAL_PS_STAT_ORA_TID, - OB_ALL_VIRTUAL_PS_ITEM_INFO_ORA_TID, - OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_ORA_TID, - OB_ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT_TID, - OB_ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT_TID, - OB_ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT_TID, - OB_ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT_TID, - OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_AGENT_TID, - OB_ALL_VIRTUAL_SYSAUTH_AGENT_TID, - OB_ALL_VIRTUAL_SYSAUTH_HISTORY_AGENT_TID, - OB_ALL_VIRTUAL_OBJAUTH_AGENT_TID, - OB_ALL_VIRTUAL_OBJAUTH_HISTORY_AGENT_TID, - OB_ALL_VIRTUAL_ERROR_AGENT_TID, - OB_ALL_VIRTUAL_TABLE_MGR_AGENT_TID, - OB_ALL_VIRTUAL_DEF_SUB_PART_AGENT_TID, - OB_ALL_VIRTUAL_OBJECT_TYPE_AGENT_TID, - OB_ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT_TID, - OB_ALL_VIRTUAL_DBLINK_AGENT_TID, - OB_ALL_VIRTUAL_DBLINK_HISTORY_AGENT_TID, - OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_TID, - OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TID, - OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_ORA_TID, - OB_ALL_VIRTUAL_LOCK_WAIT_STAT_ORA_TID, - OB_ALL_VIRTUAL_OPEN_CURSOR_ORA_TID, - OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_AGENT_TID, - OB_ALL_VIRTUAL_DEPENDENCY_AGENT_TID, - OB_ALL_VIRTUAL_TENANT_TIME_ZONE_AGENT_TID, - OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_AGENT_TID, - OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_AGENT_TID, - OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_AGENT_TID, - OB_TENANT_VIRTUAL_OBJECT_DEFINITION_ORA_TID, - OB_ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT_TID, - OB_ALL_VIRTUAL_TYPE_SYS_AGENT_TID, - OB_ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT_TID, - OB_ALL_VIRTUAL_COLL_TYPE_SYS_AGENT_TID, - OB_ALL_VIRTUAL_PACKAGE_SYS_AGENT_TID, - OB_ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT_TID, - OB_ALL_VIRTUAL_ROUTINE_SYS_AGENT_TID, - OB_ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT_TID, - OB_ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT_TID, - OB_ALL_VIRTUAL_TABLE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_COLUMN_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_DATABASE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_SEQUENCE_V2_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_PART_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_SUB_PART_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_PACKAGE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_USER_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_SYNONYM_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_COLUMN_STAT_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_COLUMN_STATISTIC_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TABLE_STAT_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_ROUTINE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TABLEGROUP_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_CONSTRAINT_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TYPE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_COLL_TYPE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_KEYSTORE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TABLE_PRIVILEGE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_HISTORY_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_RECORD_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_SYSAUTH_HISTORY_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_OBJAUTH_HISTORY_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_OBJECT_TYPE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_DBLINK_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_DBLINK_HISTORY_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_CONSTRAINT_COLUMN_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_DEPENDENCY_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_TIME_ZONE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_RES_MGR_PLAN_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_RES_MGR_DIRECTIVE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_TRANS_LOCK_STAT_ORA_TID, - OB_ALL_VIRTUAL_RES_MGR_MAPPING_RULE_REAL_AGENT_ORA_TID, - OB_ALL_VIRTUAL_RES_MGR_CONSUMER_GROUP_REAL_AGENT_ORA_TID, - OB_GV_PLAN_CACHE_STAT_TID, - OB_GV_PLAN_CACHE_PLAN_STAT_TID, - OB_SCHEMATA_TID, - OB_CHARACTER_SETS_TID, - OB_GLOBAL_VARIABLES_TID, - OB_STATISTICS_TID, - OB_VIEWS_TID, - OB_TABLES_TID, - OB_COLLATIONS_TID, - OB_COLLATION_CHARACTER_SET_APPLICABILITY_TID, - OB_PROCESSLIST_TID, - OB_KEY_COLUMN_USAGE_TID, - OB_DBA_OUTLINES_TID, - OB_ENGINES_TID, - OB_ROUTINES_TID, - OB_GV_SESSION_EVENT_TID, - OB_GV_SESSION_WAIT_TID, - OB_GV_SESSION_WAIT_HISTORY_TID, - OB_GV_SYSTEM_EVENT_TID, - OB_GV_SESSTAT_TID, - OB_GV_SYSSTAT_TID, - OB_V_STATNAME_TID, - OB_V_EVENT_NAME_TID, - OB_V_SESSION_EVENT_TID, - OB_V_SESSION_WAIT_TID, - OB_V_SESSION_WAIT_HISTORY_TID, - OB_V_SESSTAT_TID, - OB_V_SYSSTAT_TID, - OB_V_SYSTEM_EVENT_TID, - OB_GV_SQL_AUDIT_TID, - OB_GV_LATCH_TID, - OB_GV_MEMORY_TID, - OB_V_MEMORY_TID, - OB_GV_MEMSTORE_TID, - OB_V_MEMSTORE_TID, - OB_GV_MEMSTORE_INFO_TID, - OB_V_MEMSTORE_INFO_TID, - OB_V_PLAN_CACHE_STAT_TID, - OB_V_PLAN_CACHE_PLAN_STAT_TID, - OB_GV_PLAN_CACHE_PLAN_EXPLAIN_TID, - OB_V_PLAN_CACHE_PLAN_EXPLAIN_TID, - OB_V_SQL_AUDIT_TID, - OB_V_LATCH_TID, - OB_GV_OBRPC_OUTGOING_TID, - OB_V_OBRPC_OUTGOING_TID, - OB_GV_OBRPC_INCOMING_TID, - OB_V_OBRPC_INCOMING_TID, - OB_GV_SQL_TID, - OB_V_SQL_TID, - OB_GV_SQL_MONITOR_TID, - OB_V_SQL_MONITOR_TID, - OB_GV_SQL_PLAN_MONITOR_TID, - OB_V_SQL_PLAN_MONITOR_TID, - OB_USER_RECYCLEBIN_TID, - OB_GV_OUTLINE_TID, - OB_GV_CONCURRENT_LIMIT_SQL_TID, - OB_GV_SQL_PLAN_STATISTICS_TID, - OB_V_SQL_PLAN_STATISTICS_TID, - OB_GV_SERVER_MEMSTORE_TID, - OB_GV_UNIT_LOAD_BALANCE_EVENT_HISTORY_TID, - OB_GV_TENANT_TID, - OB_GV_DATABASE_TID, - OB_GV_TABLE_TID, - OB_GV_UNIT_TID, - OB_V_UNIT_TID, - OB_GV_PARTITION_TID, - OB_V_PARTITION_TID, - OB_GV_LOCK_WAIT_STAT_TID, - OB_V_LOCK_WAIT_STAT_TID, - OB_TIME_ZONE_TID, - OB_TIME_ZONE_NAME_TID, - OB_TIME_ZONE_TRANSITION_TID, - OB_TIME_ZONE_TRANSITION_TYPE_TID, - OB_GV_SESSION_LONGOPS_TID, - OB_V_SESSION_LONGOPS_TID, - OB_GV_TENANT_MEMSTORE_ALLOCATOR_INFO_TID, - OB_V_TENANT_MEMSTORE_ALLOCATOR_INFO_TID, - OB_GV_TENANT_SEQUENCE_OBJECT_TID, - OB_COLUMNS_TID, - OB_GV_MINOR_MERGE_INFO_TID, - OB_GV_TENANT_PX_WORKER_STAT_TID, - OB_V_TENANT_PX_WORKER_STAT_TID, - OB_GV_PARTITION_AUDIT_TID, - OB_V_PARTITION_AUDIT_TID, - OB_GV_PS_STAT_TID, - OB_V_PS_STAT_TID, - OB_GV_PS_ITEM_INFO_TID, - OB_V_PS_ITEM_INFO_TID, - OB_GV_SQL_WORKAREA_TID, - OB_V_SQL_WORKAREA_TID, - OB_GV_SQL_WORKAREA_ACTIVE_TID, - OB_V_SQL_WORKAREA_ACTIVE_TID, - OB_GV_SQL_WORKAREA_HISTOGRAM_TID, - OB_V_SQL_WORKAREA_HISTOGRAM_TID, - OB_GV_OB_SQL_WORKAREA_MEMORY_INFO_TID, - OB_V_OB_SQL_WORKAREA_MEMORY_INFO_TID, - OB_GV_PLAN_CACHE_REFERENCE_INFO_TID, - OB_V_PLAN_CACHE_REFERENCE_INFO_TID, - OB_V_OB_TIMESTAMP_SERVICE_TID, - OB_GV_SSTABLE_TID, - OB_V_SSTABLE_TID, - OB_CDB_OB_BACKUP_ARCHIVELOG_SUMMARY_TID, - OB_CDB_OB_BACKUP_JOB_DETAILS_TID, - OB_CDB_OB_BACKUP_SET_DETAILS_TID, - OB_CDB_OB_BACKUP_SET_EXPIRED_TID, - OB_CDB_OB_BACKUP_PROGRESS_TID, - OB_CDB_OB_BACKUP_ARCHIVELOG_PROGRESS_TID, - OB_CDB_OB_BACKUP_CLEAN_HISTORY_TID, - OB_CDB_OB_BACKUP_TASK_CLEAN_HISTORY_TID, - OB_GV_SERVER_SCHEMA_INFO_TID, - OB_V_SERVER_SCHEMA_INFO_TID, - OB_CDB_CKPT_HISTORY_TID, - OB_GV_OB_TRANS_TABLE_STATUS_TID, - OB_V_OB_TRANS_TABLE_STATUS_TID, - OB_V_SQL_MONITOR_STATNAME_TID, - OB_GV_MERGE_INFO_TID, - OB_V_MERGE_INFO_TID, - OB_GV_LOCK_TID, - OB_V_LOCK_TID, - OB_CDB_OB_TENANT_BACKUP_VALIDATION_TASK_TID, - OB_V_RESTORE_POINT_TID, - OB_CDB_OB_BACKUP_SET_OBSOLETE_TID, - OB_DBA_SYNONYMS_TID, - OB_DBA_OBJECTS_TID, - OB_ALL_OBJECTS_TID, - OB_USER_OBJECTS_TID, - OB_DBA_SEQUENCES_TID, - OB_ALL_SEQUENCES_TID, - OB_USER_SEQUENCES_TID, - OB_DBA_USERS_TID, - OB_ALL_USERS_TID, - OB_ALL_SYNONYMS_TID, - OB_USER_SYNONYMS_TID, - OB_DBA_IND_COLUMNS_TID, - OB_ALL_IND_COLUMNS_TID, - OB_USER_IND_COLUMNS_TID, - OB_DBA_CONSTRAINTS_TID, - OB_ALL_CONSTRAINTS_TID, - OB_USER_CONSTRAINTS_TID, - OB_ALL_TAB_COLS_V_TID, - OB_DBA_TAB_COLS_V_TID, - OB_USER_TAB_COLS_V_TID, - OB_ALL_TAB_COLS_TID, - OB_DBA_TAB_COLS_TID, - OB_USER_TAB_COLS_TID, - OB_ALL_TAB_COLUMNS_TID, - OB_DBA_TAB_COLUMNS_TID, - OB_USER_TAB_COLUMNS_TID, - OB_ALL_TABLES_TID, - OB_DBA_TABLES_TID, - OB_USER_TABLES_TID, - OB_DBA_TAB_COMMENTS_TID, - OB_ALL_TAB_COMMENTS_TID, - OB_USER_TAB_COMMENTS_TID, - OB_DBA_COL_COMMENTS_TID, - OB_ALL_COL_COMMENTS_TID, - OB_USER_COL_COMMENTS_TID, - OB_DBA_INDEXES_TID, - OB_ALL_INDEXES_TID, - OB_USER_INDEXES_TID, - OB_DBA_CONS_COLUMNS_TID, - OB_ALL_CONS_COLUMNS_TID, - OB_USER_CONS_COLUMNS_TID, - OB_USER_SEGMENTS_TID, - OB_DBA_SEGMENTS_TID, - OB_DBA_TYPES_TID, - OB_ALL_TYPES_TID, - OB_USER_TYPES_TID, - OB_DBA_TYPE_ATTRS_TID, - OB_ALL_TYPE_ATTRS_TID, - OB_USER_TYPE_ATTRS_TID, - OB_DBA_COLL_TYPES_TID, - OB_ALL_COLL_TYPES_TID, - OB_USER_COLL_TYPES_TID, - OB_DBA_PROCEDURES_TID, - OB_DBA_ARGUMENTS_TID, - OB_DBA_SOURCE_TID, - OB_ALL_PROCEDURES_TID, - OB_ALL_ARGUMENTS_TID, - OB_ALL_SOURCE_TID, - OB_USER_PROCEDURES_TID, - OB_USER_ARGUMENTS_TID, - OB_USER_SOURCE_TID, - OB_DBA_PART_KEY_COLUMNS_TID, - OB_ALL_PART_KEY_COLUMNS_TID, - OB_USER_PART_KEY_COLUMNS_TID, - OB_DBA_SUBPART_KEY_COLUMNS_TID, - OB_ALL_SUBPART_KEY_COLUMNS_TID, - OB_USER_SUBPART_KEY_COLUMNS_TID, - OB_DBA_VIEWS_TID, - OB_ALL_VIEWS_TID, - OB_USER_VIEWS_TID, - OB_ALL_TAB_PARTITIONS_ORA_TID, - OB_ALL_TAB_SUBPARTITIONS_ORA_TID, - OB_ALL_PART_TABLES_ORA_TID, - OB_DBA_PART_TABLES_ORA_TID, - OB_USER_PART_TABLES_ORA_TID, - OB_DBA_TAB_PARTITIONS_ORA_TID, - OB_USER_TAB_PARTITIONS_ORA_TID, - OB_DBA_TAB_SUBPARTITIONS_ORA_TID, - OB_USER_TAB_SUBPARTITIONS_ORA_TID, - OB_DBA_SUBPARTITION_TEMPLATES_ORA_TID, - OB_ALL_SUBPARTITION_TEMPLATES_ORA_TID, - OB_USER_SUBPARTITION_TEMPLATES_ORA_TID, - OB_DBA_PART_INDEXES_TID, - OB_ALL_PART_INDEXES_TID, - OB_USER_PART_INDEXES_TID, - OB_ALL_ALL_TABLES_ORA_TID, - OB_DBA_ALL_TABLES_ORA_TID, - OB_USER_ALL_TABLES_ORA_TID, - OB_DBA_PROFILES_ORA_TID, - OB_USER_PROFILES_ORA_TID, - OB_ALL_PROFILES_ORA_TID, - OB_ALL_MVIEW_COMMENTS_ORA_TID, - OB_USER_MVIEW_COMMENTS_ORA_TID, - OB_DBA_MVIEW_COMMENTS_ORA_TID, - OB_ALL_SCHEDULER_PROGRAM_ARGS_ORA_TID, - OB_DBA_SCHEDULER_PROGRAM_ARGS_ORA_TID, - OB_USER_SCHEDULER_PROGRAM_ARGS_ORA_TID, - OB_ALL_SCHEDULER_JOB_ARGS_ORA_TID, - OB_DBA_SCHEDULER_JOB_ARGS_ORA_TID, - OB_USER_SCHEDULER_JOB_ARGS_ORA_TID, - OB_ALL_ERRORS_ORA_TID, - OB_DBA_ERRORS_ORA_TID, - OB_USER_ERRORS_ORA_TID, - OB_ALL_TYPE_METHODS_ORA_TID, - OB_DBA_TYPE_METHODS_ORA_TID, - OB_USER_TYPE_METHODS_ORA_TID, - OB_ALL_METHOD_PARAMS_ORA_TID, - OB_DBA_METHOD_PARAMS_ORA_TID, - OB_USER_METHOD_PARAMS_ORA_TID, - OB_DBA_TABLESPACES_ORA_TID, - OB_USER_TABLESPACES_ORA_TID, - OB_DBA_IND_EXPRESSIONS_TID, - OB_USER_IND_EXPRESSIONS_TID, - OB_ALL_IND_EXPRESSIONS_TID, - OB_ALL_IND_PARTITIONS_TID, - OB_USER_IND_PARTITIONS_TID, - OB_DBA_IND_PARTITIONS_TID, - OB_DBA_IND_SUBPARTITIONS_TID, - OB_ALL_IND_SUBPARTITIONS_TID, - OB_USER_IND_SUBPARTITIONS_TID, - OB_DBA_ROLES_TID, - OB_DBA_ROLE_PRIVS_TID, - OB_USER_ROLE_PRIVS_TID, - OB_DBA_TAB_PRIVS_TID, - OB_ALL_TAB_PRIVS_TID, - OB_USER_TAB_PRIVS_TID, - OB_DBA_SYS_PRIVS_TID, - OB_USER_SYS_PRIVS_TID, - OB_DBA_COL_PRIVS_ORA_TID, - OB_USER_COL_PRIVS_ORA_TID, - OB_ALL_COL_PRIVS_ORA_TID, - OB_ROLE_TAB_PRIVS_ORA_TID, - OB_ROLE_SYS_PRIVS_ORA_TID, - OB_ROLE_ROLE_PRIVS_ORA_TID, - OB_DICTIONARY_ORA_TID, - OB_DICT_ORA_TID, - OB_ALL_TRIGGERS_TID, - OB_DBA_TRIGGERS_TID, - OB_USER_TRIGGERS_TID, - OB_ALL_DEPENDENCIES_ORA_TID, - OB_DBA_DEPENDENCIES_ORA_TID, - OB_USER_DEPENDENCIES_ORA_TID, - OB_DBA_RSRC_PLANS_TID, - OB_DBA_RSRC_PLAN_DIRECTIVES_TID, - OB_DBA_RSRC_GROUP_MAPPINGS_TID, - OB_DBA_RECYCLEBIN_ORA_TID, - OB_USER_RECYCLEBIN_ORA_TID, - OB_DBA_RSRC_CONSUMER_GROUPS_TID, - OB_GV_OUTLINE_ORA_TID, - OB_GV_SQL_AUDIT_ORA_TID, - OB_V_SQL_AUDIT_ORA_TID, - OB_GV_INSTANCE_TID, - OB_V_INSTANCE_TID, - OB_GV_PLAN_CACHE_PLAN_STAT_ORA_TID, - OB_V_PLAN_CACHE_PLAN_STAT_ORA_TID, - OB_GV_PLAN_CACHE_PLAN_EXPLAIN_ORA_TID, - OB_V_PLAN_CACHE_PLAN_EXPLAIN_ORA_TID, - OB_GV_SESSION_WAIT_ORA_TID, - OB_V_SESSION_WAIT_ORA_TID, - OB_GV_SESSION_WAIT_HISTORY_ORA_TID, - OB_V_SESSION_WAIT_HISTORY_ORA_TID, - OB_GV_MEMORY_ORA_TID, - OB_V_MEMORY_ORA_TID, - OB_GV_MEMSTORE_ORA_TID, - OB_V_MEMSTORE_ORA_TID, - OB_GV_MEMSTORE_INFO_ORA_TID, - OB_V_MEMSTORE_INFO_ORA_TID, - OB_GV_SERVER_MEMSTORE_ORA_TID, - OB_GV_SESSTAT_ORA_TID, - OB_V_SESSTAT_ORA_TID, - OB_GV_SYSSTAT_ORA_TID, - OB_V_SYSSTAT_ORA_TID, - OB_GV_SYSTEM_EVENT_ORA_TID, - OB_V_SYSTEM_EVENT_ORA_TID, - OB_GV_TENANT_MEMSTORE_ALLOCATOR_INFO_ORA_TID, - OB_V_TENANT_MEMSTORE_ALLOCATOR_INFO_ORA_TID, - OB_GV_PLAN_CACHE_STAT_ORA_TID, - OB_V_PLAN_CACHE_STAT_ORA_TID, - OB_GV_CONCURRENT_LIMIT_SQL_ORA_TID, - OB_NLS_SESSION_PARAMETERS_ORA_TID, - OB_NLS_INSTANCE_PARAMETERS_ORA_TID, - OB_NLS_DATABASE_PARAMETERS_ORA_TID, - OB_V_NLS_PARAMETERS_ORA_TID, - OB_V_VERSION_ORA_TID, - OB_GV_TENANT_PX_WORKER_STAT_ORA_TID, - OB_V_TENANT_PX_WORKER_STAT_ORA_TID, - OB_GV_PS_STAT_ORA_TID, - OB_V_PS_STAT_ORA_TID, - OB_GV_PS_ITEM_INFO_ORA_TID, - OB_V_PS_ITEM_INFO_ORA_TID, - OB_GV_SQL_WORKAREA_ACTIVE_ORA_TID, - OB_V_SQL_WORKAREA_ACTIVE_ORA_TID, - OB_GV_SQL_WORKAREA_HISTOGRAM_ORA_TID, - OB_V_SQL_WORKAREA_HISTOGRAM_ORA_TID, - OB_GV_OB_SQL_WORKAREA_MEMORY_INFO_ORA_TID, - OB_V_OB_SQL_WORKAREA_MEMORY_INFO_ORA_TID, - OB_GV_PLAN_CACHE_REFERENCE_INFO_ORA_TID, - OB_V_PLAN_CACHE_REFERENCE_INFO_ORA_TID, - OB_GV_SQL_WORKAREA_ORA_TID, - OB_V_SQL_WORKAREA_ORA_TID, - OB_GV_SSTABLE_ORA_TID, - OB_V_SSTABLE_ORA_TID, - OB_GV_SERVER_SCHEMA_INFO_ORA_TID, - OB_V_SERVER_SCHEMA_INFO_ORA_TID, - OB_GV_SQL_PLAN_MONITOR_ORA_TID, - OB_V_SQL_PLAN_MONITOR_ORA_TID, - OB_V_SQL_MONITOR_STATNAME_ORA_TID, - OB_GV_LOCK_ORA_TID, - OB_V_LOCK_ORA_TID, - OB_GV_OPEN_CURSOR_ORA_TID, - OB_V_OPEN_CURSOR_ORA_TID, - OB_V_TIMEZONE_NAMES_ORA_TID, - OB_GV_GLOBAL_TRANSACTION_ORA_TID, - OB_V_GLOBAL_TRANSACTION_ORA_TID, - OB_V_RESTORE_POINT_ORA_TID, - OB_V_RSRC_PLAN_ORA_TID, -}; +const uint64_t tenant_space_tables [] = { + OB_ALL_TABLE_TID, + OB_ALL_COLUMN_TID, + OB_ALL_DDL_OPERATION_TID, + OB_ALL_TABLE_V2_TID, + OB_ALL_USER_TID, + OB_ALL_USER_HISTORY_TID, + OB_ALL_DATABASE_TID, + OB_ALL_DATABASE_HISTORY_TID, + OB_ALL_TABLEGROUP_TID, + OB_ALL_TABLEGROUP_HISTORY_TID, + OB_ALL_TABLE_PRIVILEGE_TID, + OB_ALL_TABLE_PRIVILEGE_HISTORY_TID, + OB_ALL_DATABASE_PRIVILEGE_TID, + OB_ALL_DATABASE_PRIVILEGE_HISTORY_TID, + OB_ALL_TABLE_HISTORY_TID, + OB_ALL_COLUMN_HISTORY_TID, + OB_TENANT_PARAMETER_TID, + OB_ALL_SYS_VARIABLE_TID, + OB_ALL_SYS_STAT_TID, + OB_ALL_COLUMN_STATISTIC_TID, + OB_ALL_DUMMY_TID, + OB_ALL_CLOG_HISTORY_INFO_V2_TID, + OB_ALL_OUTLINE_TID, + OB_ALL_OUTLINE_HISTORY_TID, + OB_ALL_RECYCLEBIN_TID, + OB_ALL_PART_TID, + OB_ALL_PART_HISTORY_TID, + OB_ALL_SUB_PART_TID, + OB_ALL_SUB_PART_HISTORY_TID, + OB_ALL_PART_INFO_TID, + OB_ALL_PART_INFO_HISTORY_TID, + OB_ALL_DEF_SUB_PART_TID, + OB_ALL_DEF_SUB_PART_HISTORY_TID, + OB_ALL_SYS_VARIABLE_HISTORY_TID, + OB_ALL_DDL_ID_TID, + OB_ALL_FOREIGN_KEY_TID, + OB_ALL_FOREIGN_KEY_HISTORY_TID, + OB_ALL_FOREIGN_KEY_COLUMN_TID, + OB_ALL_FOREIGN_KEY_COLUMN_HISTORY_TID, + OB_ALL_SYNONYM_TID, + OB_ALL_SYNONYM_HISTORY_TID, + OB_ALL_SEQUENCE_V2_TID, + OB_ALL_TENANT_META_TABLE_TID, + OB_ALL_ROUTINE_TID, + OB_ALL_ROUTINE_HISTORY_TID, + OB_ALL_ROUTINE_PARAM_TID, + OB_ALL_ROUTINE_PARAM_HISTORY_TID, + OB_ALL_TABLE_STAT_TID, + OB_ALL_COLUMN_STAT_TID, + OB_ALL_HISTOGRAM_STAT_TID, + OB_ALL_PACKAGE_TID, + OB_ALL_PACKAGE_HISTORY_TID, + OB_ALL_TENANT_GC_PARTITION_INFO_TID, + OB_ALL_CONSTRAINT_TID, + OB_ALL_CONSTRAINT_HISTORY_TID, + OB_ALL_ORI_SCHEMA_VERSION_TID, + OB_ALL_FUNC_TID, + OB_ALL_FUNC_HISTORY_TID, + OB_ALL_TEMP_TABLE_TID, + OB_ALL_SEQUENCE_OBJECT_TID, + OB_ALL_SEQUENCE_OBJECT_HISTORY_TID, + OB_ALL_SEQUENCE_VALUE_TID, + OB_ALL_TENANT_PLAN_BASELINE_TID, + OB_ALL_TENANT_PLAN_BASELINE_HISTORY_TID, + OB_ALL_TYPE_TID, + OB_ALL_TYPE_HISTORY_TID, + OB_ALL_TYPE_ATTR_TID, + OB_ALL_TYPE_ATTR_HISTORY_TID, + OB_ALL_COLL_TYPE_TID, + OB_ALL_COLL_TYPE_HISTORY_TID, + OB_ALL_WEAK_READ_SERVICE_TID, + OB_ALL_DBLINK_TID, + OB_ALL_DBLINK_HISTORY_TID, + OB_ALL_TENANT_PARTITION_META_TABLE_TID, + OB_ALL_TENANT_ROLE_GRANTEE_MAP_TID, + OB_ALL_TENANT_ROLE_GRANTEE_MAP_HISTORY_TID, + OB_ALL_TENANT_KEYSTORE_TID, + OB_ALL_TENANT_KEYSTORE_HISTORY_TID, + OB_ALL_TENANT_TABLESPACE_TID, + OB_ALL_TENANT_TABLESPACE_HISTORY_TID, + OB_ALL_TENANT_USER_FAILED_LOGIN_STAT_TID, + OB_ALL_TENANT_PROFILE_TID, + OB_ALL_TENANT_PROFILE_HISTORY_TID, + OB_ALL_TENANT_SECURITY_AUDIT_TID, + OB_ALL_TENANT_SECURITY_AUDIT_HISTORY_TID, + OB_ALL_TENANT_TRIGGER_TID, + OB_ALL_TENANT_TRIGGER_HISTORY_TID, + OB_ALL_TENANT_SSTABLE_COLUMN_CHECKSUM_TID, + OB_ALL_TENANT_SECURITY_AUDIT_RECORD_TID, + OB_ALL_TENANT_SYSAUTH_TID, + OB_ALL_TENANT_SYSAUTH_HISTORY_TID, + OB_ALL_TENANT_OBJAUTH_TID, + OB_ALL_TENANT_OBJAUTH_HISTORY_TID, + OB_ALL_TENANT_BACKUP_INFO_TID, + OB_ALL_TENANT_BACKUP_LOG_ARCHIVE_STATUS_TID, + OB_ALL_TENANT_BACKUP_TASK_TID, + OB_ALL_TENANT_PG_BACKUP_TASK_TID, + OB_ALL_TENANT_ERROR_TID, + OB_ALL_TENANT_BACKUP_CLEAN_INFO_TID, + OB_ALL_TENANT_RESTORE_PG_INFO_TID, + OB_ALL_TABLE_V2_HISTORY_TID, + OB_ALL_TENANT_OBJECT_TYPE_TID, + OB_ALL_TENANT_OBJECT_TYPE_HISTORY_TID, + OB_ALL_TENANT_BACKUP_VALIDATION_TASK_TID, + OB_ALL_TENANT_PG_BACKUP_VALIDATION_TASK_TID, + OB_ALL_TENANT_TIME_ZONE_TID, + OB_ALL_TENANT_TIME_ZONE_NAME_TID, + OB_ALL_TENANT_TIME_ZONE_TRANSITION_TID, + OB_ALL_TENANT_TIME_ZONE_TRANSITION_TYPE_TID, + OB_ALL_TENANT_CONSTRAINT_COLUMN_TID, + OB_ALL_TENANT_CONSTRAINT_COLUMN_HISTORY_TID, + OB_ALL_TENANT_GLOBAL_TRANSACTION_TID, + OB_ALL_TENANT_DEPENDENCY_TID, + OB_ALL_TENANT_BACKUP_BACKUPSET_TASK_TID, + OB_ALL_TENANT_PG_BACKUP_BACKUPSET_TASK_TID, + OB_ALL_TENANT_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TID, + OB_ALL_RES_MGR_PLAN_TID, + OB_ALL_RES_MGR_DIRECTIVE_TID, + OB_ALL_RES_MGR_MAPPING_RULE_TID, + OB_ALL_RES_MGR_CONSUMER_GROUP_TID, + OB_ALL_TABLE_V2_HISTORY_IDX_DATA_TABLE_ID_TID, + OB_ALL_TABLE_HISTORY_IDX_DATA_TABLE_ID_TID, + OB_TENANT_VIRTUAL_ALL_TABLE_TID, + OB_TENANT_VIRTUAL_TABLE_COLUMN_TID, + OB_TENANT_VIRTUAL_TABLE_INDEX_TID, + OB_TENANT_VIRTUAL_SHOW_CREATE_DATABASE_TID, + OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_TID, + OB_TENANT_VIRTUAL_SESSION_VARIABLE_TID, + OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_TID, + OB_TENANT_VIRTUAL_WARNING_TID, + OB_TENANT_VIRTUAL_CURRENT_TENANT_TID, + OB_TENANT_VIRTUAL_DATABASE_STATUS_TID, + OB_TENANT_VIRTUAL_TENANT_STATUS_TID, + OB_TENANT_VIRTUAL_INTERM_RESULT_TID, + OB_TENANT_VIRTUAL_PARTITION_STAT_TID, + OB_TENANT_VIRTUAL_STATNAME_TID, + OB_TENANT_VIRTUAL_EVENT_NAME_TID, + OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_TID, + OB_TENANT_VIRTUAL_SHOW_TABLES_TID, + OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_TID, + OB_ALL_VIRTUAL_DATA_TYPE_CLASS_TID, + OB_ALL_VIRTUAL_DATA_TYPE_TID, + OB_ALL_VIRTUAL_CORE_ALL_TABLE_TID, + OB_ALL_VIRTUAL_CORE_COLUMN_TABLE_TID, + OB_ALL_VIRTUAL_TRACE_LOG_TID, + OB_ALL_VIRTUAL_ENGINE_TID, + OB_TENANT_VIRTUAL_OUTLINE_TID, + OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_TID, + OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_TID, + OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_TID, + OB_SESSION_VARIABLES_TID, + OB_TABLE_PRIVILEGES_TID, + OB_USER_PRIVILEGES_TID, + OB_SCHEMA_PRIVILEGES_TID, + OB_TABLE_CONSTRAINTS_TID, + OB_GLOBAL_STATUS_TID, + OB_PARTITIONS_TID, + OB_SESSION_STATUS_TID, + OB_USER_TID, + OB_DB_TID, + OB_PROC_TID, + OB_TENANT_VIRTUAL_COLLATION_TID, + OB_TENANT_VIRTUAL_CHARSET_TID, + OB_PARAMETERS_TID, + OB_ALL_VIRTUAL_WEAK_READ_STAT_TID, + OB_ALL_VIRTUAL_INFORMATION_COLUMNS_TID, + OB_REFERENTIAL_CONSTRAINTS_TID, + OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_TID, + OB_ALL_VIRTUAL_OPEN_CURSOR_TID, + OB_ALL_VIRTUAL_FILES_TID, + OB_FILES_TID, + OB_TENANT_VIRTUAL_OBJECT_DEFINITION_TID, + OB_ALL_VIRTUAL_TABLE_AGENT_TID, + OB_ALL_VIRTUAL_COLUMN_AGENT_TID, + OB_ALL_VIRTUAL_DATABASE_AGENT_TID, + OB_ALL_VIRTUAL_SEQUENCE_V2_AGENT_TID, + OB_ALL_VIRTUAL_PART_AGENT_TID, + OB_ALL_VIRTUAL_SUB_PART_AGENT_TID, + OB_ALL_VIRTUAL_PACKAGE_AGENT_TID, + OB_ALL_VIRTUAL_TENANT_META_TABLE_AGENT_TID, + OB_ALL_VIRTUAL_SQL_AUDIT_ORA_TID, + OB_ALL_VIRTUAL_SQL_AUDIT_ORA_ALL_VIRTUAL_SQL_AUDIT_I1_TID, + OB_ALL_VIRTUAL_PLAN_STAT_ORA_TID, + OB_ALL_VIRTUAL_SQL_PLAN_STATISTICS_AGENT_TID, + OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_ORA_TID, + OB_ALL_VIRTUAL_SEQUENCE_VALUE_AGENT_TID, + OB_ALL_VIRTUAL_SEQUENCE_OBJECT_AGENT_TID, + OB_ALL_VIRTUAL_USER_AGENT_TID, + OB_ALL_VIRTUAL_SYNONYM_AGENT_TID, + OB_ALL_VIRTUAL_FOREIGN_KEY_AGENT_TID, + OB_ALL_VIRTUAL_COLUMN_STAT_AGENT_TID, + OB_ALL_VIRTUAL_COLUMN_STATISTIC_AGENT_TID, + OB_ALL_VIRTUAL_PARTITION_TABLE_AGENT_TID, + OB_ALL_VIRTUAL_TABLE_STAT_AGENT_TID, + OB_ALL_VIRTUAL_RECYCLEBIN_AGENT_TID, + OB_TENANT_VIRTUAL_OUTLINE_AGENT_TID, + OB_ALL_VIRTUAL_ROUTINE_AGENT_TID, + OB_ALL_VIRTUAL_TABLEGROUP_AGENT_TID, + OB_ALL_VIRTUAL_PRIVILEGE_AGENT_TID, + OB_ALL_VIRTUAL_SYS_PARAMETER_STAT_AGENT_TID, + OB_TENANT_VIRTUAL_TABLE_INDEX_AGENT_TID, + OB_TENANT_VIRTUAL_CHARSET_AGENT_TID, + OB_TENANT_VIRTUAL_ALL_TABLE_AGENT_TID, + OB_TENANT_VIRTUAL_COLLATION_AGENT_TID, + OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_AGENT_TID, + OB_ALL_VIRTUAL_SERVER_AGENT_TID, + OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_TID, + OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TID, + OB_ALL_VIRTUAL_PROCESSLIST_ORA_TID, + OB_ALL_VIRTUAL_SESSION_WAIT_ORA_TID, + OB_ALL_VIRTUAL_SESSION_WAIT_ORA_ALL_VIRTUAL_SESSION_WAIT_I1_TID, + OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_TID, + OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TID, + OB_ALL_VIRTUAL_MEMORY_INFO_ORA_TID, + OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_ORA_TID, + OB_ALL_VIRTUAL_MEMSTORE_INFO_ORA_TID, + OB_ALL_VIRTUAL_SERVER_MEMORY_INFO_AGENT_TID, + OB_ALL_VIRTUAL_SESSTAT_ORA_TID, + OB_ALL_VIRTUAL_SESSTAT_ORA_ALL_VIRTUAL_SESSTAT_I1_TID, + OB_ALL_VIRTUAL_SYSSTAT_ORA_TID, + OB_ALL_VIRTUAL_SYSSTAT_ORA_ALL_VIRTUAL_SYSSTAT_I1_TID, + OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_TID, + OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_ALL_VIRTUAL_SYSTEM_EVENT_I1_TID, + OB_ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_AGENT_TID, + OB_TENANT_VIRTUAL_SESSION_VARIABLE_ORA_TID, + OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_ORA_TID, + OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_ORA_TID, + OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_ORA_TID, + OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_ORA_TID, + OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_ORA_TID, + OB_TENANT_VIRTUAL_TABLE_COLUMN_ORA_TID, + OB_ALL_VIRTUAL_TRACE_LOG_ORA_TID, + OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_AGENT_TID, + OB_ALL_VIRTUAL_CONSTRAINT_AGENT_TID, + OB_ALL_VIRTUAL_TYPE_AGENT_TID, + OB_ALL_VIRTUAL_TYPE_ATTR_AGENT_TID, + OB_ALL_VIRTUAL_COLL_TYPE_AGENT_TID, + OB_ALL_VIRTUAL_ROUTINE_PARAM_AGENT_TID, + OB_ALL_VIRTUAL_DATA_TYPE_ORA_TID, + OB_ALL_VIRTUAL_TABLE_SYS_AGENT_TID, + OB_ALL_VIRTUAL_SSTABLE_CHECKSUM_AGENT_TID, + OB_ALL_VIRTUAL_PARTITION_INFO_AGENT_TID, + OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_AGENT_TID, + OB_ALL_VIRTUAL_TENANT_KEYSTORE_AGENT_TID, + OB_ALL_VIRTUAL_TENANT_TABLESPACE_AGENT_TID, + OB_ALL_VIRTUAL_TENANT_PROFILE_AGENT_TID, + OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT_TID, + OB_ALL_VIRTUAL_TABLE_PRIVILEGE_AGENT_TID, + OB_ALL_VIRTUAL_SECURITY_AUDIT_AGENT_TID, + OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_AGENT_TID, + OB_ALL_VIRTUAL_TRIGGER_AGENT_TID, + OB_ALL_VIRTUAL_PX_WORKER_STAT_ORA_TID, + OB_ALL_VIRTUAL_PS_STAT_ORA_TID, + OB_ALL_VIRTUAL_PS_ITEM_INFO_ORA_TID, + OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_ORA_TID, + OB_ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT_TID, + OB_ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT_TID, + OB_ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT_TID, + OB_ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT_TID, + OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_AGENT_TID, + OB_ALL_VIRTUAL_SYSAUTH_AGENT_TID, + OB_ALL_VIRTUAL_SYSAUTH_HISTORY_AGENT_TID, + OB_ALL_VIRTUAL_OBJAUTH_AGENT_TID, + OB_ALL_VIRTUAL_OBJAUTH_HISTORY_AGENT_TID, + OB_ALL_VIRTUAL_ERROR_AGENT_TID, + OB_ALL_VIRTUAL_TABLE_MGR_AGENT_TID, + OB_ALL_VIRTUAL_DEF_SUB_PART_AGENT_TID, + OB_ALL_VIRTUAL_OBJECT_TYPE_AGENT_TID, + OB_ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT_TID, + OB_ALL_VIRTUAL_DBLINK_AGENT_TID, + OB_ALL_VIRTUAL_DBLINK_HISTORY_AGENT_TID, + OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_TID, + OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TID, + OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_ORA_TID, + OB_ALL_VIRTUAL_LOCK_WAIT_STAT_ORA_TID, + OB_ALL_VIRTUAL_OPEN_CURSOR_ORA_TID, + OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_AGENT_TID, + OB_ALL_VIRTUAL_DEPENDENCY_AGENT_TID, + OB_ALL_VIRTUAL_TENANT_TIME_ZONE_AGENT_TID, + OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_AGENT_TID, + OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_AGENT_TID, + OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_AGENT_TID, + OB_TENANT_VIRTUAL_OBJECT_DEFINITION_ORA_TID, + OB_ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT_TID, + OB_ALL_VIRTUAL_TYPE_SYS_AGENT_TID, + OB_ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT_TID, + OB_ALL_VIRTUAL_COLL_TYPE_SYS_AGENT_TID, + OB_ALL_VIRTUAL_PACKAGE_SYS_AGENT_TID, + OB_ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT_TID, + OB_ALL_VIRTUAL_ROUTINE_SYS_AGENT_TID, + OB_ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT_TID, + OB_ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT_TID, + OB_ALL_VIRTUAL_TABLE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_COLUMN_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_DATABASE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_SEQUENCE_V2_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_PART_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_SUB_PART_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_PACKAGE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_USER_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_SYNONYM_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_COLUMN_STAT_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_COLUMN_STATISTIC_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TABLE_STAT_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_ROUTINE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TABLEGROUP_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_CONSTRAINT_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TYPE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_COLL_TYPE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_KEYSTORE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TABLE_PRIVILEGE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_HISTORY_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_RECORD_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_SYSAUTH_HISTORY_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_OBJAUTH_HISTORY_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_OBJECT_TYPE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_DBLINK_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_DBLINK_HISTORY_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_CONSTRAINT_COLUMN_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_DEPENDENCY_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_TIME_ZONE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_RES_MGR_PLAN_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_RES_MGR_DIRECTIVE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_TRANS_LOCK_STAT_ORA_TID, + OB_ALL_VIRTUAL_RES_MGR_MAPPING_RULE_REAL_AGENT_ORA_TID, + OB_ALL_VIRTUAL_RES_MGR_CONSUMER_GROUP_REAL_AGENT_ORA_TID, + OB_GV_PLAN_CACHE_STAT_TID, + OB_GV_PLAN_CACHE_PLAN_STAT_TID, + OB_SCHEMATA_TID, + OB_CHARACTER_SETS_TID, + OB_GLOBAL_VARIABLES_TID, + OB_STATISTICS_TID, + OB_VIEWS_TID, + OB_TABLES_TID, + OB_COLLATIONS_TID, + OB_COLLATION_CHARACTER_SET_APPLICABILITY_TID, + OB_PROCESSLIST_TID, + OB_KEY_COLUMN_USAGE_TID, + OB_DBA_OUTLINES_TID, + OB_ENGINES_TID, + OB_ROUTINES_TID, + OB_GV_SESSION_EVENT_TID, + OB_GV_SESSION_WAIT_TID, + OB_GV_SESSION_WAIT_HISTORY_TID, + OB_GV_SYSTEM_EVENT_TID, + OB_GV_SESSTAT_TID, + OB_GV_SYSSTAT_TID, + OB_V_STATNAME_TID, + OB_V_EVENT_NAME_TID, + OB_V_SESSION_EVENT_TID, + OB_V_SESSION_WAIT_TID, + OB_V_SESSION_WAIT_HISTORY_TID, + OB_V_SESSTAT_TID, + OB_V_SYSSTAT_TID, + OB_V_SYSTEM_EVENT_TID, + OB_GV_SQL_AUDIT_TID, + OB_GV_LATCH_TID, + OB_GV_MEMORY_TID, + OB_V_MEMORY_TID, + OB_GV_MEMSTORE_TID, + OB_V_MEMSTORE_TID, + OB_GV_MEMSTORE_INFO_TID, + OB_V_MEMSTORE_INFO_TID, + OB_V_PLAN_CACHE_STAT_TID, + OB_V_PLAN_CACHE_PLAN_STAT_TID, + OB_GV_PLAN_CACHE_PLAN_EXPLAIN_TID, + OB_V_PLAN_CACHE_PLAN_EXPLAIN_TID, + OB_V_SQL_AUDIT_TID, + OB_V_LATCH_TID, + OB_GV_OBRPC_OUTGOING_TID, + OB_V_OBRPC_OUTGOING_TID, + OB_GV_OBRPC_INCOMING_TID, + OB_V_OBRPC_INCOMING_TID, + OB_GV_SQL_TID, + OB_V_SQL_TID, + OB_GV_SQL_MONITOR_TID, + OB_V_SQL_MONITOR_TID, + OB_GV_SQL_PLAN_MONITOR_TID, + OB_V_SQL_PLAN_MONITOR_TID, + OB_USER_RECYCLEBIN_TID, + OB_GV_OUTLINE_TID, + OB_GV_CONCURRENT_LIMIT_SQL_TID, + OB_GV_SQL_PLAN_STATISTICS_TID, + OB_V_SQL_PLAN_STATISTICS_TID, + OB_GV_SERVER_MEMSTORE_TID, + OB_GV_UNIT_LOAD_BALANCE_EVENT_HISTORY_TID, + OB_GV_TENANT_TID, + OB_GV_DATABASE_TID, + OB_GV_TABLE_TID, + OB_GV_UNIT_TID, + OB_V_UNIT_TID, + OB_GV_PARTITION_TID, + OB_V_PARTITION_TID, + OB_GV_LOCK_WAIT_STAT_TID, + OB_V_LOCK_WAIT_STAT_TID, + OB_TIME_ZONE_TID, + OB_TIME_ZONE_NAME_TID, + OB_TIME_ZONE_TRANSITION_TID, + OB_TIME_ZONE_TRANSITION_TYPE_TID, + OB_GV_SESSION_LONGOPS_TID, + OB_V_SESSION_LONGOPS_TID, + OB_GV_TENANT_MEMSTORE_ALLOCATOR_INFO_TID, + OB_V_TENANT_MEMSTORE_ALLOCATOR_INFO_TID, + OB_GV_TENANT_SEQUENCE_OBJECT_TID, + OB_COLUMNS_TID, + OB_GV_MINOR_MERGE_INFO_TID, + OB_GV_TENANT_PX_WORKER_STAT_TID, + OB_V_TENANT_PX_WORKER_STAT_TID, + OB_GV_PARTITION_AUDIT_TID, + OB_V_PARTITION_AUDIT_TID, + OB_GV_PS_STAT_TID, + OB_V_PS_STAT_TID, + OB_GV_PS_ITEM_INFO_TID, + OB_V_PS_ITEM_INFO_TID, + OB_GV_SQL_WORKAREA_TID, + OB_V_SQL_WORKAREA_TID, + OB_GV_SQL_WORKAREA_ACTIVE_TID, + OB_V_SQL_WORKAREA_ACTIVE_TID, + OB_GV_SQL_WORKAREA_HISTOGRAM_TID, + OB_V_SQL_WORKAREA_HISTOGRAM_TID, + OB_GV_OB_SQL_WORKAREA_MEMORY_INFO_TID, + OB_V_OB_SQL_WORKAREA_MEMORY_INFO_TID, + OB_GV_PLAN_CACHE_REFERENCE_INFO_TID, + OB_V_PLAN_CACHE_REFERENCE_INFO_TID, + OB_V_OB_TIMESTAMP_SERVICE_TID, + OB_GV_SSTABLE_TID, + OB_V_SSTABLE_TID, + OB_CDB_OB_BACKUP_ARCHIVELOG_SUMMARY_TID, + OB_CDB_OB_BACKUP_JOB_DETAILS_TID, + OB_CDB_OB_BACKUP_SET_DETAILS_TID, + OB_CDB_OB_BACKUP_SET_EXPIRED_TID, + OB_CDB_OB_BACKUP_PROGRESS_TID, + OB_CDB_OB_BACKUP_ARCHIVELOG_PROGRESS_TID, + OB_CDB_OB_BACKUP_CLEAN_HISTORY_TID, + OB_CDB_OB_BACKUP_TASK_CLEAN_HISTORY_TID, + OB_GV_SERVER_SCHEMA_INFO_TID, + OB_V_SERVER_SCHEMA_INFO_TID, + OB_CDB_CKPT_HISTORY_TID, + OB_GV_OB_TRANS_TABLE_STATUS_TID, + OB_V_OB_TRANS_TABLE_STATUS_TID, + OB_V_SQL_MONITOR_STATNAME_TID, + OB_GV_MERGE_INFO_TID, + OB_V_MERGE_INFO_TID, + OB_GV_LOCK_TID, + OB_V_LOCK_TID, + OB_CDB_OB_TENANT_BACKUP_VALIDATION_TASK_TID, + OB_V_RESTORE_POINT_TID, + OB_CDB_OB_BACKUP_SET_OBSOLETE_TID, + OB_DBA_SYNONYMS_TID, + OB_DBA_OBJECTS_TID, + OB_ALL_OBJECTS_TID, + OB_USER_OBJECTS_TID, + OB_DBA_SEQUENCES_TID, + OB_ALL_SEQUENCES_TID, + OB_USER_SEQUENCES_TID, + OB_DBA_USERS_TID, + OB_ALL_USERS_TID, + OB_ALL_SYNONYMS_TID, + OB_USER_SYNONYMS_TID, + OB_DBA_IND_COLUMNS_TID, + OB_ALL_IND_COLUMNS_TID, + OB_USER_IND_COLUMNS_TID, + OB_DBA_CONSTRAINTS_TID, + OB_ALL_CONSTRAINTS_TID, + OB_USER_CONSTRAINTS_TID, + OB_ALL_TAB_COLS_V_TID, + OB_DBA_TAB_COLS_V_TID, + OB_USER_TAB_COLS_V_TID, + OB_ALL_TAB_COLS_TID, + OB_DBA_TAB_COLS_TID, + OB_USER_TAB_COLS_TID, + OB_ALL_TAB_COLUMNS_TID, + OB_DBA_TAB_COLUMNS_TID, + OB_USER_TAB_COLUMNS_TID, + OB_ALL_TABLES_TID, + OB_DBA_TABLES_TID, + OB_USER_TABLES_TID, + OB_DBA_TAB_COMMENTS_TID, + OB_ALL_TAB_COMMENTS_TID, + OB_USER_TAB_COMMENTS_TID, + OB_DBA_COL_COMMENTS_TID, + OB_ALL_COL_COMMENTS_TID, + OB_USER_COL_COMMENTS_TID, + OB_DBA_INDEXES_TID, + OB_ALL_INDEXES_TID, + OB_USER_INDEXES_TID, + OB_DBA_CONS_COLUMNS_TID, + OB_ALL_CONS_COLUMNS_TID, + OB_USER_CONS_COLUMNS_TID, + OB_USER_SEGMENTS_TID, + OB_DBA_SEGMENTS_TID, + OB_DBA_TYPES_TID, + OB_ALL_TYPES_TID, + OB_USER_TYPES_TID, + OB_DBA_TYPE_ATTRS_TID, + OB_ALL_TYPE_ATTRS_TID, + OB_USER_TYPE_ATTRS_TID, + OB_DBA_COLL_TYPES_TID, + OB_ALL_COLL_TYPES_TID, + OB_USER_COLL_TYPES_TID, + OB_DBA_PROCEDURES_TID, + OB_DBA_ARGUMENTS_TID, + OB_DBA_SOURCE_TID, + OB_ALL_PROCEDURES_TID, + OB_ALL_ARGUMENTS_TID, + OB_ALL_SOURCE_TID, + OB_USER_PROCEDURES_TID, + OB_USER_ARGUMENTS_TID, + OB_USER_SOURCE_TID, + OB_DBA_PART_KEY_COLUMNS_TID, + OB_ALL_PART_KEY_COLUMNS_TID, + OB_USER_PART_KEY_COLUMNS_TID, + OB_DBA_SUBPART_KEY_COLUMNS_TID, + OB_ALL_SUBPART_KEY_COLUMNS_TID, + OB_USER_SUBPART_KEY_COLUMNS_TID, + OB_DBA_VIEWS_TID, + OB_ALL_VIEWS_TID, + OB_USER_VIEWS_TID, + OB_ALL_TAB_PARTITIONS_ORA_TID, + OB_ALL_TAB_SUBPARTITIONS_ORA_TID, + OB_ALL_PART_TABLES_ORA_TID, + OB_DBA_PART_TABLES_ORA_TID, + OB_USER_PART_TABLES_ORA_TID, + OB_DBA_TAB_PARTITIONS_ORA_TID, + OB_USER_TAB_PARTITIONS_ORA_TID, + OB_DBA_TAB_SUBPARTITIONS_ORA_TID, + OB_USER_TAB_SUBPARTITIONS_ORA_TID, + OB_DBA_SUBPARTITION_TEMPLATES_ORA_TID, + OB_ALL_SUBPARTITION_TEMPLATES_ORA_TID, + OB_USER_SUBPARTITION_TEMPLATES_ORA_TID, + OB_DBA_PART_INDEXES_TID, + OB_ALL_PART_INDEXES_TID, + OB_USER_PART_INDEXES_TID, + OB_ALL_ALL_TABLES_ORA_TID, + OB_DBA_ALL_TABLES_ORA_TID, + OB_USER_ALL_TABLES_ORA_TID, + OB_DBA_PROFILES_ORA_TID, + OB_USER_PROFILES_ORA_TID, + OB_ALL_PROFILES_ORA_TID, + OB_ALL_MVIEW_COMMENTS_ORA_TID, + OB_USER_MVIEW_COMMENTS_ORA_TID, + OB_DBA_MVIEW_COMMENTS_ORA_TID, + OB_ALL_SCHEDULER_PROGRAM_ARGS_ORA_TID, + OB_DBA_SCHEDULER_PROGRAM_ARGS_ORA_TID, + OB_USER_SCHEDULER_PROGRAM_ARGS_ORA_TID, + OB_ALL_SCHEDULER_JOB_ARGS_ORA_TID, + OB_DBA_SCHEDULER_JOB_ARGS_ORA_TID, + OB_USER_SCHEDULER_JOB_ARGS_ORA_TID, + OB_ALL_ERRORS_ORA_TID, + OB_DBA_ERRORS_ORA_TID, + OB_USER_ERRORS_ORA_TID, + OB_ALL_TYPE_METHODS_ORA_TID, + OB_DBA_TYPE_METHODS_ORA_TID, + OB_USER_TYPE_METHODS_ORA_TID, + OB_ALL_METHOD_PARAMS_ORA_TID, + OB_DBA_METHOD_PARAMS_ORA_TID, + OB_USER_METHOD_PARAMS_ORA_TID, + OB_DBA_TABLESPACES_ORA_TID, + OB_USER_TABLESPACES_ORA_TID, + OB_DBA_IND_EXPRESSIONS_TID, + OB_USER_IND_EXPRESSIONS_TID, + OB_ALL_IND_EXPRESSIONS_TID, + OB_ALL_IND_PARTITIONS_TID, + OB_USER_IND_PARTITIONS_TID, + OB_DBA_IND_PARTITIONS_TID, + OB_DBA_IND_SUBPARTITIONS_TID, + OB_ALL_IND_SUBPARTITIONS_TID, + OB_USER_IND_SUBPARTITIONS_TID, + OB_DBA_ROLES_TID, + OB_DBA_ROLE_PRIVS_TID, + OB_USER_ROLE_PRIVS_TID, + OB_DBA_TAB_PRIVS_TID, + OB_ALL_TAB_PRIVS_TID, + OB_USER_TAB_PRIVS_TID, + OB_DBA_SYS_PRIVS_TID, + OB_USER_SYS_PRIVS_TID, + OB_DBA_COL_PRIVS_ORA_TID, + OB_USER_COL_PRIVS_ORA_TID, + OB_ALL_COL_PRIVS_ORA_TID, + OB_ROLE_TAB_PRIVS_ORA_TID, + OB_ROLE_SYS_PRIVS_ORA_TID, + OB_ROLE_ROLE_PRIVS_ORA_TID, + OB_DICTIONARY_ORA_TID, + OB_DICT_ORA_TID, + OB_ALL_TRIGGERS_TID, + OB_DBA_TRIGGERS_TID, + OB_USER_TRIGGERS_TID, + OB_ALL_DEPENDENCIES_ORA_TID, + OB_DBA_DEPENDENCIES_ORA_TID, + OB_USER_DEPENDENCIES_ORA_TID, + OB_DBA_RSRC_PLANS_TID, + OB_DBA_RSRC_PLAN_DIRECTIVES_TID, + OB_DBA_RSRC_GROUP_MAPPINGS_TID, + OB_DBA_RECYCLEBIN_ORA_TID, + OB_USER_RECYCLEBIN_ORA_TID, + OB_DBA_RSRC_CONSUMER_GROUPS_TID, + OB_GV_OUTLINE_ORA_TID, + OB_GV_SQL_AUDIT_ORA_TID, + OB_V_SQL_AUDIT_ORA_TID, + OB_GV_INSTANCE_TID, + OB_V_INSTANCE_TID, + OB_GV_PLAN_CACHE_PLAN_STAT_ORA_TID, + OB_V_PLAN_CACHE_PLAN_STAT_ORA_TID, + OB_GV_PLAN_CACHE_PLAN_EXPLAIN_ORA_TID, + OB_V_PLAN_CACHE_PLAN_EXPLAIN_ORA_TID, + OB_GV_SESSION_WAIT_ORA_TID, + OB_V_SESSION_WAIT_ORA_TID, + OB_GV_SESSION_WAIT_HISTORY_ORA_TID, + OB_V_SESSION_WAIT_HISTORY_ORA_TID, + OB_GV_MEMORY_ORA_TID, + OB_V_MEMORY_ORA_TID, + OB_GV_MEMSTORE_ORA_TID, + OB_V_MEMSTORE_ORA_TID, + OB_GV_MEMSTORE_INFO_ORA_TID, + OB_V_MEMSTORE_INFO_ORA_TID, + OB_GV_SERVER_MEMSTORE_ORA_TID, + OB_GV_SESSTAT_ORA_TID, + OB_V_SESSTAT_ORA_TID, + OB_GV_SYSSTAT_ORA_TID, + OB_V_SYSSTAT_ORA_TID, + OB_GV_SYSTEM_EVENT_ORA_TID, + OB_V_SYSTEM_EVENT_ORA_TID, + OB_GV_TENANT_MEMSTORE_ALLOCATOR_INFO_ORA_TID, + OB_V_TENANT_MEMSTORE_ALLOCATOR_INFO_ORA_TID, + OB_GV_PLAN_CACHE_STAT_ORA_TID, + OB_V_PLAN_CACHE_STAT_ORA_TID, + OB_GV_CONCURRENT_LIMIT_SQL_ORA_TID, + OB_NLS_SESSION_PARAMETERS_ORA_TID, + OB_NLS_INSTANCE_PARAMETERS_ORA_TID, + OB_NLS_DATABASE_PARAMETERS_ORA_TID, + OB_V_NLS_PARAMETERS_ORA_TID, + OB_V_VERSION_ORA_TID, + OB_GV_TENANT_PX_WORKER_STAT_ORA_TID, + OB_V_TENANT_PX_WORKER_STAT_ORA_TID, + OB_GV_PS_STAT_ORA_TID, + OB_V_PS_STAT_ORA_TID, + OB_GV_PS_ITEM_INFO_ORA_TID, + OB_V_PS_ITEM_INFO_ORA_TID, + OB_GV_SQL_WORKAREA_ACTIVE_ORA_TID, + OB_V_SQL_WORKAREA_ACTIVE_ORA_TID, + OB_GV_SQL_WORKAREA_HISTOGRAM_ORA_TID, + OB_V_SQL_WORKAREA_HISTOGRAM_ORA_TID, + OB_GV_OB_SQL_WORKAREA_MEMORY_INFO_ORA_TID, + OB_V_OB_SQL_WORKAREA_MEMORY_INFO_ORA_TID, + OB_GV_PLAN_CACHE_REFERENCE_INFO_ORA_TID, + OB_V_PLAN_CACHE_REFERENCE_INFO_ORA_TID, + OB_GV_SQL_WORKAREA_ORA_TID, + OB_V_SQL_WORKAREA_ORA_TID, + OB_GV_SSTABLE_ORA_TID, + OB_V_SSTABLE_ORA_TID, + OB_GV_SERVER_SCHEMA_INFO_ORA_TID, + OB_V_SERVER_SCHEMA_INFO_ORA_TID, + OB_GV_SQL_PLAN_MONITOR_ORA_TID, + OB_V_SQL_PLAN_MONITOR_ORA_TID, + OB_V_SQL_MONITOR_STATNAME_ORA_TID, + OB_GV_LOCK_ORA_TID, + OB_V_LOCK_ORA_TID, + OB_GV_OPEN_CURSOR_ORA_TID, + OB_V_OPEN_CURSOR_ORA_TID, + OB_V_TIMEZONE_NAMES_ORA_TID, + OB_GV_GLOBAL_TRANSACTION_ORA_TID, + OB_V_GLOBAL_TRANSACTION_ORA_TID, + OB_V_RESTORE_POINT_ORA_TID, + OB_V_RSRC_PLAN_ORA_TID, }; -const uint64_t all_ora_mapping_virtual_table_org_tables[] = { - OB_ALL_VIRTUAL_SQL_AUDIT_TID, - OB_ALL_VIRTUAL_PLAN_STAT_TID, - OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_TID, - OB_ALL_VIRTUAL_PLAN_CACHE_STAT_TID, - OB_ALL_VIRTUAL_PROCESSLIST_TID, - OB_ALL_VIRTUAL_SESSION_WAIT_TID, - OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_TID, - OB_ALL_VIRTUAL_MEMORY_INFO_TID, - OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_TID, - OB_ALL_VIRTUAL_MEMSTORE_INFO_TID, - OB_ALL_VIRTUAL_SESSTAT_TID, - OB_ALL_VIRTUAL_SYSSTAT_TID, - OB_ALL_VIRTUAL_SYSTEM_EVENT_TID, - OB_TENANT_VIRTUAL_SESSION_VARIABLE_TID, - OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_TID, - OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_TID, - OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_TID, - OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_TID, - OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_TID, - OB_TENANT_VIRTUAL_TABLE_COLUMN_TID, - OB_ALL_VIRTUAL_TRACE_LOG_TID, - OB_ALL_VIRTUAL_DATA_TYPE_TID, - OB_ALL_VIRTUAL_PX_WORKER_STAT_TID, - OB_ALL_VIRTUAL_PS_STAT_TID, - OB_ALL_VIRTUAL_PS_ITEM_INFO_TID, - OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_TID, - OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_TID, - OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_TID, - OB_ALL_VIRTUAL_LOCK_WAIT_STAT_TID, - OB_ALL_VIRTUAL_OPEN_CURSOR_TID, - OB_TENANT_VIRTUAL_OBJECT_DEFINITION_TID, - OB_ALL_VIRTUAL_TRANS_LOCK_STAT_TID, -}; +const uint64_t all_ora_mapping_virtual_table_org_tables [] = { + OB_ALL_VIRTUAL_SQL_AUDIT_TID, + OB_ALL_VIRTUAL_PLAN_STAT_TID, + OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_TID, + OB_ALL_VIRTUAL_PLAN_CACHE_STAT_TID, + OB_ALL_VIRTUAL_PROCESSLIST_TID, + OB_ALL_VIRTUAL_SESSION_WAIT_TID, + OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_TID, + OB_ALL_VIRTUAL_MEMORY_INFO_TID, + OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_TID, + OB_ALL_VIRTUAL_MEMSTORE_INFO_TID, + OB_ALL_VIRTUAL_SESSTAT_TID, + OB_ALL_VIRTUAL_SYSSTAT_TID, + OB_ALL_VIRTUAL_SYSTEM_EVENT_TID, + OB_TENANT_VIRTUAL_SESSION_VARIABLE_TID, + OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_TID, + OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_TID, + OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_TID, + OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_TID, + OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_TID, + OB_TENANT_VIRTUAL_TABLE_COLUMN_TID, + OB_ALL_VIRTUAL_TRACE_LOG_TID, + OB_ALL_VIRTUAL_DATA_TYPE_TID, + OB_ALL_VIRTUAL_PX_WORKER_STAT_TID, + OB_ALL_VIRTUAL_PS_STAT_TID, + OB_ALL_VIRTUAL_PS_ITEM_INFO_TID, + OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_TID, + OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_TID, + OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_TID, + OB_ALL_VIRTUAL_LOCK_WAIT_STAT_TID, + OB_ALL_VIRTUAL_OPEN_CURSOR_TID, + OB_TENANT_VIRTUAL_OBJECT_DEFINITION_TID, + OB_ALL_VIRTUAL_TRANS_LOCK_STAT_TID, }; -const uint64_t all_ora_mapping_virtual_tables[] = { - OB_ALL_VIRTUAL_SQL_AUDIT_ORA_TID, - OB_ALL_VIRTUAL_PLAN_STAT_ORA_TID, - OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_ORA_TID, - OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_TID, - OB_ALL_VIRTUAL_PROCESSLIST_ORA_TID, - OB_ALL_VIRTUAL_SESSION_WAIT_ORA_TID, - OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_TID, - OB_ALL_VIRTUAL_MEMORY_INFO_ORA_TID, - OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_ORA_TID, - OB_ALL_VIRTUAL_MEMSTORE_INFO_ORA_TID, - OB_ALL_VIRTUAL_SESSTAT_ORA_TID, - OB_ALL_VIRTUAL_SYSSTAT_ORA_TID, - OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_TID, - OB_TENANT_VIRTUAL_SESSION_VARIABLE_ORA_TID, - OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_ORA_TID, - OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_ORA_TID, - OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_ORA_TID, - OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_ORA_TID, - OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_ORA_TID, - OB_TENANT_VIRTUAL_TABLE_COLUMN_ORA_TID, - OB_ALL_VIRTUAL_TRACE_LOG_ORA_TID, - OB_ALL_VIRTUAL_DATA_TYPE_ORA_TID, - OB_ALL_VIRTUAL_PX_WORKER_STAT_ORA_TID, - OB_ALL_VIRTUAL_PS_STAT_ORA_TID, - OB_ALL_VIRTUAL_PS_ITEM_INFO_ORA_TID, - OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_ORA_TID, - OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_TID, - OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_ORA_TID, - OB_ALL_VIRTUAL_LOCK_WAIT_STAT_ORA_TID, - OB_ALL_VIRTUAL_OPEN_CURSOR_ORA_TID, - OB_TENANT_VIRTUAL_OBJECT_DEFINITION_ORA_TID, - OB_ALL_VIRTUAL_TRANS_LOCK_STAT_ORA_TID, -}; +const uint64_t all_ora_mapping_virtual_tables [] = { OB_ALL_VIRTUAL_SQL_AUDIT_ORA_TID +, OB_ALL_VIRTUAL_PLAN_STAT_ORA_TID +, OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_ORA_TID +, OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_TID +, OB_ALL_VIRTUAL_PROCESSLIST_ORA_TID +, OB_ALL_VIRTUAL_SESSION_WAIT_ORA_TID +, OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_TID +, OB_ALL_VIRTUAL_MEMORY_INFO_ORA_TID +, OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_ORA_TID +, OB_ALL_VIRTUAL_MEMSTORE_INFO_ORA_TID +, OB_ALL_VIRTUAL_SESSTAT_ORA_TID +, OB_ALL_VIRTUAL_SYSSTAT_ORA_TID +, OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_TID +, OB_TENANT_VIRTUAL_SESSION_VARIABLE_ORA_TID +, OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_ORA_TID +, OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_ORA_TID +, OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_ORA_TID +, OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_ORA_TID +, OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_ORA_TID +, OB_TENANT_VIRTUAL_TABLE_COLUMN_ORA_TID +, OB_ALL_VIRTUAL_TRACE_LOG_ORA_TID +, OB_ALL_VIRTUAL_DATA_TYPE_ORA_TID +, OB_ALL_VIRTUAL_PX_WORKER_STAT_ORA_TID +, OB_ALL_VIRTUAL_PS_STAT_ORA_TID +, OB_ALL_VIRTUAL_PS_ITEM_INFO_ORA_TID +, OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_ORA_TID +, OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_TID +, OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_ORA_TID +, OB_ALL_VIRTUAL_LOCK_WAIT_STAT_ORA_TID +, OB_ALL_VIRTUAL_OPEN_CURSOR_ORA_TID +, OB_TENANT_VIRTUAL_OBJECT_DEFINITION_ORA_TID +, OB_ALL_VIRTUAL_TRANS_LOCK_STAT_ORA_TID +, }; /* start/end_pos is start/end postition for column with tenant id */ -struct VTMapping { - uint64_t mapping_tid_; - bool is_real_vt_; - int64_t start_pos_; - int64_t end_pos_; - bool use_real_tenant_id_; +struct VTMapping +{ + uint64_t mapping_tid_; + bool is_real_vt_; + int64_t start_pos_; + int64_t end_pos_; + bool use_real_tenant_id_; }; // define all columns with tenant id const char* const with_tenant_id_columns[] = { - "COLL_TYPE_ID", - "ELEM_TYPE_ID", - "PACKAGE_ID", - "TABLE_ID", - "TABLE_ID", - "TABLE_ID", - "TABLE_ID", - "DATABASE_ID", - "DEFAULT_TABLEGROUP_ID", - "DBLINK_ID", - "OWNER_ID", - "DBLINK_ID", - "OWNER_ID", - "TABLE_ID", - "TABLESPACE_ID", - "FOREIGN_KEY_ID", - "FOREIGN_KEY_ID", - "CHILD_TABLE_ID", - "PARENT_TABLE_ID", - "PACKAGE_ID", - "DATABASE_ID", - "OWNER_ID", - "TABLE_ID", - "TABLESPACE_ID", - "DATABASE_ID", - "TABLE_ID", - "TABLEGROUP_ID", - "ROUTINE_ID", - "TYPE_OWNER", - "ROUTINE_ID", - "PACKAGE_ID", - "DATABASE_ID", - "OWNER_ID", - "SEQUENCE_ID", - "DATABASE_ID", - "SEQUENCE_KEY", - "SEQUENCE_ID", - "TABLE_ID", - "TABLESPACE_ID", - "SYNONYM_ID", - "DATABASE_ID", - "OBJECT_DATABASE_ID", - "TABLEGROUP_ID", - "USER_ID", - "TABLE_ID", - "DATABASE_ID", - "DATA_TABLE_ID", - "TABLEGROUP_ID", - "TABLESPACE_ID", - "TABLE_ID", - "TABLE_ID", - "DEP_OBJ_ID", - "REF_OBJ_ID", - "DEP_OBJ_OWNER_ID", - "OBJ_ID", - "KEYSTORE_ID", - "MASTER_KEY_ID", - "OBJ_ID", - "GRANTOR_ID", - "GRANTEE_ID", - "OBJ_ID", - "GRANTOR_ID", - "GRANTEE_ID", - "DATABASE_ID", - "OWNER_ID", - "OBJECT_TYPE_ID", - "PROFILE_ID", - "GRANTEE_ID", - "ROLE_ID", - "AUDIT_ID", - "OWNER_ID", - "AUDIT_ID", - "OWNER_ID", - "USER_ID", - "EFFECTIVE_USER_ID", - "DB_ID", - "CUR_DB_ID", - "AUDIT_ID", - "GRANTEE_ID", - "GRANTEE_ID", - "TABLESPACE_ID", - "MASTER_KEY_ID", - "TRIGGER_ID", - "DATABASE_ID", - "OWNER_ID", - "BASE_OBJECT_ID", - "TYPE_ID", - "TYPE_ATTR_ID", - "TYPE_ID", - "DATABASE_ID", - "SUPERTYPEID", - "PACKAGE_ID", - "USER_ID", - "PROFILE_ID", + "COLL_TYPE_ID", + "ELEM_TYPE_ID", + "PACKAGE_ID", + "TABLE_ID", + "TABLE_ID", + "TABLE_ID", + "TABLE_ID", + "DATABASE_ID", + "DEFAULT_TABLEGROUP_ID", + "DBLINK_ID", + "OWNER_ID", + "DBLINK_ID", + "OWNER_ID", + "TABLE_ID", + "TABLESPACE_ID", + "FOREIGN_KEY_ID", + "FOREIGN_KEY_ID", + "CHILD_TABLE_ID", + "PARENT_TABLE_ID", + "PACKAGE_ID", + "DATABASE_ID", + "OWNER_ID", + "TABLE_ID", + "TABLESPACE_ID", + "DATABASE_ID", + "TABLE_ID", + "TABLEGROUP_ID", + "ROUTINE_ID", + "TYPE_OWNER", + "ROUTINE_ID", + "PACKAGE_ID", + "DATABASE_ID", + "OWNER_ID", + "SEQUENCE_ID", + "DATABASE_ID", + "SEQUENCE_KEY", + "SEQUENCE_ID", + "TABLE_ID", + "TABLESPACE_ID", + "SYNONYM_ID", + "DATABASE_ID", + "OBJECT_DATABASE_ID", + "TABLEGROUP_ID", + "USER_ID", + "TABLE_ID", + "DATABASE_ID", + "DATA_TABLE_ID", + "TABLEGROUP_ID", + "TABLESPACE_ID", + "TABLE_ID", + "TABLE_ID", + "DEP_OBJ_ID", + "REF_OBJ_ID", + "DEP_OBJ_OWNER_ID", + "OBJ_ID", + "KEYSTORE_ID", + "MASTER_KEY_ID", + "OBJ_ID", + "GRANTOR_ID", + "GRANTEE_ID", + "OBJ_ID", + "GRANTOR_ID", + "GRANTEE_ID", + "DATABASE_ID", + "OWNER_ID", + "OBJECT_TYPE_ID", + "PROFILE_ID", + "GRANTEE_ID", + "ROLE_ID", + "AUDIT_ID", + "OWNER_ID", + "AUDIT_ID", + "OWNER_ID", + "USER_ID", + "EFFECTIVE_USER_ID", + "DB_ID", + "CUR_DB_ID", + "AUDIT_ID", + "GRANTEE_ID", + "GRANTEE_ID", + "TABLESPACE_ID", + "MASTER_KEY_ID", + "TRIGGER_ID", + "DATABASE_ID", + "OWNER_ID", + "BASE_OBJECT_ID", + "TYPE_ID", + "TYPE_ATTR_ID", + "TYPE_ID", + "DATABASE_ID", + "SUPERTYPEID", + "PACKAGE_ID", + "USER_ID", + "PROFILE_ID", }; extern VTMapping vt_mappings[5000]; -const char* const tenant_space_table_names[] = { - OB_ALL_TABLE_TNAME, - OB_ALL_COLUMN_TNAME, - OB_ALL_DDL_OPERATION_TNAME, - OB_ALL_TABLE_V2_TNAME, - OB_ALL_USER_TNAME, - OB_ALL_USER_HISTORY_TNAME, - OB_ALL_DATABASE_TNAME, - OB_ALL_DATABASE_HISTORY_TNAME, - OB_ALL_TABLEGROUP_TNAME, - OB_ALL_TABLEGROUP_HISTORY_TNAME, - OB_ALL_TABLE_PRIVILEGE_TNAME, - OB_ALL_TABLE_PRIVILEGE_HISTORY_TNAME, - OB_ALL_DATABASE_PRIVILEGE_TNAME, - OB_ALL_DATABASE_PRIVILEGE_HISTORY_TNAME, - OB_ALL_TABLE_HISTORY_TNAME, - OB_ALL_COLUMN_HISTORY_TNAME, - OB_TENANT_PARAMETER_TNAME, - OB_ALL_SYS_VARIABLE_TNAME, - OB_ALL_SYS_STAT_TNAME, - OB_ALL_COLUMN_STATISTIC_TNAME, - OB_ALL_DUMMY_TNAME, - OB_ALL_CLOG_HISTORY_INFO_V2_TNAME, - OB_ALL_OUTLINE_TNAME, - OB_ALL_OUTLINE_HISTORY_TNAME, - OB_ALL_RECYCLEBIN_TNAME, - OB_ALL_PART_TNAME, - OB_ALL_PART_HISTORY_TNAME, - OB_ALL_SUB_PART_TNAME, - OB_ALL_SUB_PART_HISTORY_TNAME, - OB_ALL_PART_INFO_TNAME, - OB_ALL_PART_INFO_HISTORY_TNAME, - OB_ALL_DEF_SUB_PART_TNAME, - OB_ALL_DEF_SUB_PART_HISTORY_TNAME, - OB_ALL_SYS_VARIABLE_HISTORY_TNAME, - OB_ALL_DDL_ID_TNAME, - OB_ALL_FOREIGN_KEY_TNAME, - OB_ALL_FOREIGN_KEY_HISTORY_TNAME, - OB_ALL_FOREIGN_KEY_COLUMN_TNAME, - OB_ALL_FOREIGN_KEY_COLUMN_HISTORY_TNAME, - OB_ALL_SYNONYM_TNAME, - OB_ALL_SYNONYM_HISTORY_TNAME, - OB_ALL_SEQUENCE_V2_TNAME, - OB_ALL_TENANT_META_TABLE_TNAME, - OB_ALL_ROUTINE_TNAME, - OB_ALL_ROUTINE_HISTORY_TNAME, - OB_ALL_ROUTINE_PARAM_TNAME, - OB_ALL_ROUTINE_PARAM_HISTORY_TNAME, - OB_ALL_TABLE_STAT_TNAME, - OB_ALL_COLUMN_STAT_TNAME, - OB_ALL_HISTOGRAM_STAT_TNAME, - OB_ALL_PACKAGE_TNAME, - OB_ALL_PACKAGE_HISTORY_TNAME, - OB_ALL_TENANT_GC_PARTITION_INFO_TNAME, - OB_ALL_CONSTRAINT_TNAME, - OB_ALL_CONSTRAINT_HISTORY_TNAME, - OB_ALL_ORI_SCHEMA_VERSION_TNAME, - OB_ALL_FUNC_TNAME, - OB_ALL_FUNC_HISTORY_TNAME, - OB_ALL_TEMP_TABLE_TNAME, - OB_ALL_SEQUENCE_OBJECT_TNAME, - OB_ALL_SEQUENCE_OBJECT_HISTORY_TNAME, - OB_ALL_SEQUENCE_VALUE_TNAME, - OB_ALL_TENANT_PLAN_BASELINE_TNAME, - OB_ALL_TENANT_PLAN_BASELINE_HISTORY_TNAME, - OB_ALL_TYPE_TNAME, - OB_ALL_TYPE_HISTORY_TNAME, - OB_ALL_TYPE_ATTR_TNAME, - OB_ALL_TYPE_ATTR_HISTORY_TNAME, - OB_ALL_COLL_TYPE_TNAME, - OB_ALL_COLL_TYPE_HISTORY_TNAME, - OB_ALL_WEAK_READ_SERVICE_TNAME, - OB_ALL_DBLINK_TNAME, - OB_ALL_DBLINK_HISTORY_TNAME, - OB_ALL_TENANT_PARTITION_META_TABLE_TNAME, - OB_ALL_TENANT_ROLE_GRANTEE_MAP_TNAME, - OB_ALL_TENANT_ROLE_GRANTEE_MAP_HISTORY_TNAME, - OB_ALL_TENANT_KEYSTORE_TNAME, - OB_ALL_TENANT_KEYSTORE_HISTORY_TNAME, - OB_ALL_TENANT_TABLESPACE_TNAME, - OB_ALL_TENANT_TABLESPACE_HISTORY_TNAME, - OB_ALL_TENANT_USER_FAILED_LOGIN_STAT_TNAME, - OB_ALL_TENANT_PROFILE_TNAME, - OB_ALL_TENANT_PROFILE_HISTORY_TNAME, - OB_ALL_TENANT_SECURITY_AUDIT_TNAME, - OB_ALL_TENANT_SECURITY_AUDIT_HISTORY_TNAME, - OB_ALL_TENANT_TRIGGER_TNAME, - OB_ALL_TENANT_TRIGGER_HISTORY_TNAME, - OB_ALL_TENANT_SSTABLE_COLUMN_CHECKSUM_TNAME, - OB_ALL_TENANT_SECURITY_AUDIT_RECORD_TNAME, - OB_ALL_TENANT_SYSAUTH_TNAME, - OB_ALL_TENANT_SYSAUTH_HISTORY_TNAME, - OB_ALL_TENANT_OBJAUTH_TNAME, - OB_ALL_TENANT_OBJAUTH_HISTORY_TNAME, - OB_ALL_TENANT_BACKUP_INFO_TNAME, - OB_ALL_TENANT_BACKUP_LOG_ARCHIVE_STATUS_TNAME, - OB_ALL_TENANT_BACKUP_TASK_TNAME, - OB_ALL_TENANT_PG_BACKUP_TASK_TNAME, - OB_ALL_TENANT_ERROR_TNAME, - OB_ALL_TENANT_BACKUP_CLEAN_INFO_TNAME, - OB_ALL_TENANT_RESTORE_PG_INFO_TNAME, - OB_ALL_TABLE_V2_HISTORY_TNAME, - OB_ALL_TENANT_OBJECT_TYPE_TNAME, - OB_ALL_TENANT_OBJECT_TYPE_HISTORY_TNAME, - OB_ALL_TENANT_BACKUP_VALIDATION_TASK_TNAME, - OB_ALL_TENANT_PG_BACKUP_VALIDATION_TASK_TNAME, - OB_ALL_TENANT_TIME_ZONE_TNAME, - OB_ALL_TENANT_TIME_ZONE_NAME_TNAME, - OB_ALL_TENANT_TIME_ZONE_TRANSITION_TNAME, - OB_ALL_TENANT_TIME_ZONE_TRANSITION_TYPE_TNAME, - OB_ALL_TENANT_CONSTRAINT_COLUMN_TNAME, - OB_ALL_TENANT_CONSTRAINT_COLUMN_HISTORY_TNAME, - OB_ALL_TENANT_GLOBAL_TRANSACTION_TNAME, - OB_ALL_TENANT_DEPENDENCY_TNAME, - OB_ALL_TENANT_BACKUP_BACKUPSET_TASK_TNAME, - OB_ALL_TENANT_PG_BACKUP_BACKUPSET_TASK_TNAME, - OB_ALL_TENANT_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TNAME, - OB_ALL_RES_MGR_PLAN_TNAME, - OB_ALL_RES_MGR_DIRECTIVE_TNAME, - OB_ALL_RES_MGR_MAPPING_RULE_TNAME, - OB_ALL_RES_MGR_CONSUMER_GROUP_TNAME, - OB_ALL_TABLE_V2_HISTORY_IDX_DATA_TABLE_ID_TNAME, - OB_ALL_TABLE_HISTORY_IDX_DATA_TABLE_ID_TNAME, - OB_TENANT_VIRTUAL_ALL_TABLE_TNAME, - OB_TENANT_VIRTUAL_TABLE_COLUMN_TNAME, - OB_TENANT_VIRTUAL_TABLE_INDEX_TNAME, - OB_TENANT_VIRTUAL_SHOW_CREATE_DATABASE_TNAME, - OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_TNAME, - OB_TENANT_VIRTUAL_SESSION_VARIABLE_TNAME, - OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_TNAME, - OB_TENANT_VIRTUAL_WARNING_TNAME, - OB_TENANT_VIRTUAL_CURRENT_TENANT_TNAME, - OB_TENANT_VIRTUAL_DATABASE_STATUS_TNAME, - OB_TENANT_VIRTUAL_TENANT_STATUS_TNAME, - OB_TENANT_VIRTUAL_INTERM_RESULT_TNAME, - OB_TENANT_VIRTUAL_PARTITION_STAT_TNAME, - OB_TENANT_VIRTUAL_STATNAME_TNAME, - OB_TENANT_VIRTUAL_EVENT_NAME_TNAME, - OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_TNAME, - OB_TENANT_VIRTUAL_SHOW_TABLES_TNAME, - OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_TNAME, - OB_ALL_VIRTUAL_DATA_TYPE_CLASS_TNAME, - OB_ALL_VIRTUAL_DATA_TYPE_TNAME, - OB_ALL_VIRTUAL_CORE_ALL_TABLE_TNAME, - OB_ALL_VIRTUAL_CORE_COLUMN_TABLE_TNAME, - OB_ALL_VIRTUAL_TRACE_LOG_TNAME, - OB_ALL_VIRTUAL_ENGINE_TNAME, - OB_TENANT_VIRTUAL_OUTLINE_TNAME, - OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_TNAME, - OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_TNAME, - OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_TNAME, - OB_SESSION_VARIABLES_TNAME, - OB_TABLE_PRIVILEGES_TNAME, - OB_USER_PRIVILEGES_TNAME, - OB_SCHEMA_PRIVILEGES_TNAME, - OB_TABLE_CONSTRAINTS_TNAME, - OB_GLOBAL_STATUS_TNAME, - OB_PARTITIONS_TNAME, - OB_SESSION_STATUS_TNAME, - OB_USER_TNAME, - OB_DB_TNAME, - OB_PROC_TNAME, - OB_TENANT_VIRTUAL_COLLATION_TNAME, - OB_TENANT_VIRTUAL_CHARSET_TNAME, - OB_PARAMETERS_TNAME, - OB_ALL_VIRTUAL_WEAK_READ_STAT_TNAME, - OB_ALL_VIRTUAL_INFORMATION_COLUMNS_TNAME, - OB_REFERENTIAL_CONSTRAINTS_TNAME, - OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_TNAME, - OB_ALL_VIRTUAL_OPEN_CURSOR_TNAME, - OB_ALL_VIRTUAL_FILES_TNAME, - OB_FILES_TNAME, - OB_TENANT_VIRTUAL_OBJECT_DEFINITION_TNAME, - OB_ALL_VIRTUAL_TABLE_AGENT_TNAME, - OB_ALL_VIRTUAL_COLUMN_AGENT_TNAME, - OB_ALL_VIRTUAL_DATABASE_AGENT_TNAME, - OB_ALL_VIRTUAL_SEQUENCE_V2_AGENT_TNAME, - OB_ALL_VIRTUAL_PART_AGENT_TNAME, - OB_ALL_VIRTUAL_SUB_PART_AGENT_TNAME, - OB_ALL_VIRTUAL_PACKAGE_AGENT_TNAME, - OB_ALL_VIRTUAL_TENANT_META_TABLE_AGENT_TNAME, - OB_ALL_VIRTUAL_SQL_AUDIT_ORA_TNAME, - OB_ALL_VIRTUAL_SQL_AUDIT_ORA_ALL_VIRTUAL_SQL_AUDIT_I1_TNAME, - OB_ALL_VIRTUAL_PLAN_STAT_ORA_TNAME, - OB_ALL_VIRTUAL_SQL_PLAN_STATISTICS_AGENT_TNAME, - OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_ORA_TNAME, - OB_ALL_VIRTUAL_SEQUENCE_VALUE_AGENT_TNAME, - OB_ALL_VIRTUAL_SEQUENCE_OBJECT_AGENT_TNAME, - OB_ALL_VIRTUAL_USER_AGENT_TNAME, - OB_ALL_VIRTUAL_SYNONYM_AGENT_TNAME, - OB_ALL_VIRTUAL_FOREIGN_KEY_AGENT_TNAME, - OB_ALL_VIRTUAL_COLUMN_STAT_AGENT_TNAME, - OB_ALL_VIRTUAL_COLUMN_STATISTIC_AGENT_TNAME, - OB_ALL_VIRTUAL_PARTITION_TABLE_AGENT_TNAME, - OB_ALL_VIRTUAL_TABLE_STAT_AGENT_TNAME, - OB_ALL_VIRTUAL_RECYCLEBIN_AGENT_TNAME, - OB_TENANT_VIRTUAL_OUTLINE_AGENT_TNAME, - OB_ALL_VIRTUAL_ROUTINE_AGENT_TNAME, - OB_ALL_VIRTUAL_TABLEGROUP_AGENT_TNAME, - OB_ALL_VIRTUAL_PRIVILEGE_AGENT_TNAME, - OB_ALL_VIRTUAL_SYS_PARAMETER_STAT_AGENT_TNAME, - OB_TENANT_VIRTUAL_TABLE_INDEX_AGENT_TNAME, - OB_TENANT_VIRTUAL_CHARSET_AGENT_TNAME, - OB_TENANT_VIRTUAL_ALL_TABLE_AGENT_TNAME, - OB_TENANT_VIRTUAL_COLLATION_AGENT_TNAME, - OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_AGENT_TNAME, - OB_ALL_VIRTUAL_SERVER_AGENT_TNAME, - OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_TNAME, - OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TNAME, - OB_ALL_VIRTUAL_PROCESSLIST_ORA_TNAME, - OB_ALL_VIRTUAL_SESSION_WAIT_ORA_TNAME, - OB_ALL_VIRTUAL_SESSION_WAIT_ORA_ALL_VIRTUAL_SESSION_WAIT_I1_TNAME, - OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_TNAME, - OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TNAME, - OB_ALL_VIRTUAL_MEMORY_INFO_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_ORA_TNAME, - OB_ALL_VIRTUAL_MEMSTORE_INFO_ORA_TNAME, - OB_ALL_VIRTUAL_SERVER_MEMORY_INFO_AGENT_TNAME, - OB_ALL_VIRTUAL_SESSTAT_ORA_TNAME, - OB_ALL_VIRTUAL_SESSTAT_ORA_ALL_VIRTUAL_SESSTAT_I1_TNAME, - OB_ALL_VIRTUAL_SYSSTAT_ORA_TNAME, - OB_ALL_VIRTUAL_SYSSTAT_ORA_ALL_VIRTUAL_SYSSTAT_I1_TNAME, - OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_TNAME, - OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_ALL_VIRTUAL_SYSTEM_EVENT_I1_TNAME, - OB_ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_AGENT_TNAME, - OB_TENANT_VIRTUAL_SESSION_VARIABLE_ORA_TNAME, - OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_ORA_TNAME, - OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_ORA_TNAME, - OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_ORA_TNAME, - OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_ORA_TNAME, - OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_ORA_TNAME, - OB_TENANT_VIRTUAL_TABLE_COLUMN_ORA_TNAME, - OB_ALL_VIRTUAL_TRACE_LOG_ORA_TNAME, - OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_AGENT_TNAME, - OB_ALL_VIRTUAL_CONSTRAINT_AGENT_TNAME, - OB_ALL_VIRTUAL_TYPE_AGENT_TNAME, - OB_ALL_VIRTUAL_TYPE_ATTR_AGENT_TNAME, - OB_ALL_VIRTUAL_COLL_TYPE_AGENT_TNAME, - OB_ALL_VIRTUAL_ROUTINE_PARAM_AGENT_TNAME, - OB_ALL_VIRTUAL_DATA_TYPE_ORA_TNAME, - OB_ALL_VIRTUAL_TABLE_SYS_AGENT_TNAME, - OB_ALL_VIRTUAL_SSTABLE_CHECKSUM_AGENT_TNAME, - OB_ALL_VIRTUAL_PARTITION_INFO_AGENT_TNAME, - OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_AGENT_TNAME, - OB_ALL_VIRTUAL_TENANT_KEYSTORE_AGENT_TNAME, - OB_ALL_VIRTUAL_TENANT_TABLESPACE_AGENT_TNAME, - OB_ALL_VIRTUAL_TENANT_PROFILE_AGENT_TNAME, - OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT_TNAME, - OB_ALL_VIRTUAL_TABLE_PRIVILEGE_AGENT_TNAME, - OB_ALL_VIRTUAL_SECURITY_AUDIT_AGENT_TNAME, - OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_AGENT_TNAME, - OB_ALL_VIRTUAL_TRIGGER_AGENT_TNAME, - OB_ALL_VIRTUAL_PX_WORKER_STAT_ORA_TNAME, - OB_ALL_VIRTUAL_PS_STAT_ORA_TNAME, - OB_ALL_VIRTUAL_PS_ITEM_INFO_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_ORA_TNAME, - OB_ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT_TNAME, - OB_ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT_TNAME, - OB_ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT_TNAME, - OB_ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT_TNAME, - OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_AGENT_TNAME, - OB_ALL_VIRTUAL_SYSAUTH_AGENT_TNAME, - OB_ALL_VIRTUAL_SYSAUTH_HISTORY_AGENT_TNAME, - OB_ALL_VIRTUAL_OBJAUTH_AGENT_TNAME, - OB_ALL_VIRTUAL_OBJAUTH_HISTORY_AGENT_TNAME, - OB_ALL_VIRTUAL_ERROR_AGENT_TNAME, - OB_ALL_VIRTUAL_TABLE_MGR_AGENT_TNAME, - OB_ALL_VIRTUAL_DEF_SUB_PART_AGENT_TNAME, - OB_ALL_VIRTUAL_OBJECT_TYPE_AGENT_TNAME, - OB_ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT_TNAME, - OB_ALL_VIRTUAL_DBLINK_AGENT_TNAME, - OB_ALL_VIRTUAL_DBLINK_HISTORY_AGENT_TNAME, - OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_TNAME, - OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TNAME, - OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_ORA_TNAME, - OB_ALL_VIRTUAL_LOCK_WAIT_STAT_ORA_TNAME, - OB_ALL_VIRTUAL_OPEN_CURSOR_ORA_TNAME, - OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_AGENT_TNAME, - OB_ALL_VIRTUAL_DEPENDENCY_AGENT_TNAME, - OB_ALL_VIRTUAL_TENANT_TIME_ZONE_AGENT_TNAME, - OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_AGENT_TNAME, - OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_AGENT_TNAME, - OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_AGENT_TNAME, - OB_TENANT_VIRTUAL_OBJECT_DEFINITION_ORA_TNAME, - OB_ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT_TNAME, - OB_ALL_VIRTUAL_TYPE_SYS_AGENT_TNAME, - OB_ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT_TNAME, - OB_ALL_VIRTUAL_COLL_TYPE_SYS_AGENT_TNAME, - OB_ALL_VIRTUAL_PACKAGE_SYS_AGENT_TNAME, - OB_ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT_TNAME, - OB_ALL_VIRTUAL_ROUTINE_SYS_AGENT_TNAME, - OB_ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT_TNAME, - OB_ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT_TNAME, - OB_ALL_VIRTUAL_TABLE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_COLUMN_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_DATABASE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_SEQUENCE_V2_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_PART_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_SUB_PART_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_PACKAGE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_USER_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_SYNONYM_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_COLUMN_STAT_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_COLUMN_STATISTIC_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TABLE_STAT_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_ROUTINE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TABLEGROUP_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_CONSTRAINT_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TYPE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_COLL_TYPE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_KEYSTORE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TABLE_PRIVILEGE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_HISTORY_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_RECORD_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_SYSAUTH_HISTORY_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_OBJAUTH_HISTORY_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_OBJECT_TYPE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_DBLINK_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_DBLINK_HISTORY_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_CONSTRAINT_COLUMN_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_DEPENDENCY_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_TIME_ZONE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_RES_MGR_PLAN_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_RES_MGR_DIRECTIVE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_TRANS_LOCK_STAT_ORA_TNAME, - OB_ALL_VIRTUAL_RES_MGR_MAPPING_RULE_REAL_AGENT_ORA_TNAME, - OB_ALL_VIRTUAL_RES_MGR_CONSUMER_GROUP_REAL_AGENT_ORA_TNAME, - OB_GV_PLAN_CACHE_STAT_TNAME, - OB_GV_PLAN_CACHE_PLAN_STAT_TNAME, - OB_SCHEMATA_TNAME, - OB_CHARACTER_SETS_TNAME, - OB_GLOBAL_VARIABLES_TNAME, - OB_STATISTICS_TNAME, - OB_VIEWS_TNAME, - OB_TABLES_TNAME, - OB_COLLATIONS_TNAME, - OB_COLLATION_CHARACTER_SET_APPLICABILITY_TNAME, - OB_PROCESSLIST_TNAME, - OB_KEY_COLUMN_USAGE_TNAME, - OB_DBA_OUTLINES_TNAME, - OB_ENGINES_TNAME, - OB_ROUTINES_TNAME, - OB_GV_SESSION_EVENT_TNAME, - OB_GV_SESSION_WAIT_TNAME, - OB_GV_SESSION_WAIT_HISTORY_TNAME, - OB_GV_SYSTEM_EVENT_TNAME, - OB_GV_SESSTAT_TNAME, - OB_GV_SYSSTAT_TNAME, - OB_V_STATNAME_TNAME, - OB_V_EVENT_NAME_TNAME, - OB_V_SESSION_EVENT_TNAME, - OB_V_SESSION_WAIT_TNAME, - OB_V_SESSION_WAIT_HISTORY_TNAME, - OB_V_SESSTAT_TNAME, - OB_V_SYSSTAT_TNAME, - OB_V_SYSTEM_EVENT_TNAME, - OB_GV_SQL_AUDIT_TNAME, - OB_GV_LATCH_TNAME, - OB_GV_MEMORY_TNAME, - OB_V_MEMORY_TNAME, - OB_GV_MEMSTORE_TNAME, - OB_V_MEMSTORE_TNAME, - OB_GV_MEMSTORE_INFO_TNAME, - OB_V_MEMSTORE_INFO_TNAME, - OB_V_PLAN_CACHE_STAT_TNAME, - OB_V_PLAN_CACHE_PLAN_STAT_TNAME, - OB_GV_PLAN_CACHE_PLAN_EXPLAIN_TNAME, - OB_V_PLAN_CACHE_PLAN_EXPLAIN_TNAME, - OB_V_SQL_AUDIT_TNAME, - OB_V_LATCH_TNAME, - OB_GV_OBRPC_OUTGOING_TNAME, - OB_V_OBRPC_OUTGOING_TNAME, - OB_GV_OBRPC_INCOMING_TNAME, - OB_V_OBRPC_INCOMING_TNAME, - OB_GV_SQL_TNAME, - OB_V_SQL_TNAME, - OB_GV_SQL_MONITOR_TNAME, - OB_V_SQL_MONITOR_TNAME, - OB_GV_SQL_PLAN_MONITOR_TNAME, - OB_V_SQL_PLAN_MONITOR_TNAME, - OB_USER_RECYCLEBIN_TNAME, - OB_GV_OUTLINE_TNAME, - OB_GV_CONCURRENT_LIMIT_SQL_TNAME, - OB_GV_SQL_PLAN_STATISTICS_TNAME, - OB_V_SQL_PLAN_STATISTICS_TNAME, - OB_GV_SERVER_MEMSTORE_TNAME, - OB_GV_UNIT_LOAD_BALANCE_EVENT_HISTORY_TNAME, - OB_GV_TENANT_TNAME, - OB_GV_DATABASE_TNAME, - OB_GV_TABLE_TNAME, - OB_GV_UNIT_TNAME, - OB_V_UNIT_TNAME, - OB_GV_PARTITION_TNAME, - OB_V_PARTITION_TNAME, - OB_GV_LOCK_WAIT_STAT_TNAME, - OB_V_LOCK_WAIT_STAT_TNAME, - OB_TIME_ZONE_TNAME, - OB_TIME_ZONE_NAME_TNAME, - OB_TIME_ZONE_TRANSITION_TNAME, - OB_TIME_ZONE_TRANSITION_TYPE_TNAME, - OB_GV_SESSION_LONGOPS_TNAME, - OB_V_SESSION_LONGOPS_TNAME, - OB_GV_TENANT_MEMSTORE_ALLOCATOR_INFO_TNAME, - OB_V_TENANT_MEMSTORE_ALLOCATOR_INFO_TNAME, - OB_GV_TENANT_SEQUENCE_OBJECT_TNAME, - OB_COLUMNS_TNAME, - OB_GV_MINOR_MERGE_INFO_TNAME, - OB_GV_TENANT_PX_WORKER_STAT_TNAME, - OB_V_TENANT_PX_WORKER_STAT_TNAME, - OB_GV_PARTITION_AUDIT_TNAME, - OB_V_PARTITION_AUDIT_TNAME, - OB_GV_PS_STAT_TNAME, - OB_V_PS_STAT_TNAME, - OB_GV_PS_ITEM_INFO_TNAME, - OB_V_PS_ITEM_INFO_TNAME, - OB_GV_SQL_WORKAREA_TNAME, - OB_V_SQL_WORKAREA_TNAME, - OB_GV_SQL_WORKAREA_ACTIVE_TNAME, - OB_V_SQL_WORKAREA_ACTIVE_TNAME, - OB_GV_SQL_WORKAREA_HISTOGRAM_TNAME, - OB_V_SQL_WORKAREA_HISTOGRAM_TNAME, - OB_GV_OB_SQL_WORKAREA_MEMORY_INFO_TNAME, - OB_V_OB_SQL_WORKAREA_MEMORY_INFO_TNAME, - OB_GV_PLAN_CACHE_REFERENCE_INFO_TNAME, - OB_V_PLAN_CACHE_REFERENCE_INFO_TNAME, - OB_V_OB_TIMESTAMP_SERVICE_TNAME, - OB_GV_SSTABLE_TNAME, - OB_V_SSTABLE_TNAME, - OB_CDB_OB_BACKUP_ARCHIVELOG_SUMMARY_TNAME, - OB_CDB_OB_BACKUP_JOB_DETAILS_TNAME, - OB_CDB_OB_BACKUP_SET_DETAILS_TNAME, - OB_CDB_OB_BACKUP_SET_EXPIRED_TNAME, - OB_CDB_OB_BACKUP_PROGRESS_TNAME, - OB_CDB_OB_BACKUP_ARCHIVELOG_PROGRESS_TNAME, - OB_CDB_OB_BACKUP_CLEAN_HISTORY_TNAME, - OB_CDB_OB_BACKUP_TASK_CLEAN_HISTORY_TNAME, - OB_GV_SERVER_SCHEMA_INFO_TNAME, - OB_V_SERVER_SCHEMA_INFO_TNAME, - OB_CDB_CKPT_HISTORY_TNAME, - OB_GV_OB_TRANS_TABLE_STATUS_TNAME, - OB_V_OB_TRANS_TABLE_STATUS_TNAME, - OB_V_SQL_MONITOR_STATNAME_TNAME, - OB_GV_MERGE_INFO_TNAME, - OB_V_MERGE_INFO_TNAME, - OB_GV_LOCK_TNAME, - OB_V_LOCK_TNAME, - OB_CDB_OB_TENANT_BACKUP_VALIDATION_TASK_TNAME, - OB_V_RESTORE_POINT_TNAME, - OB_CDB_OB_BACKUP_SET_OBSOLETE_TNAME, - OB_DBA_SYNONYMS_TNAME, - OB_DBA_OBJECTS_TNAME, - OB_ALL_OBJECTS_TNAME, - OB_USER_OBJECTS_TNAME, - OB_DBA_SEQUENCES_TNAME, - OB_ALL_SEQUENCES_TNAME, - OB_USER_SEQUENCES_TNAME, - OB_DBA_USERS_TNAME, - OB_ALL_USERS_TNAME, - OB_ALL_SYNONYMS_TNAME, - OB_USER_SYNONYMS_TNAME, - OB_DBA_IND_COLUMNS_TNAME, - OB_ALL_IND_COLUMNS_TNAME, - OB_USER_IND_COLUMNS_TNAME, - OB_DBA_CONSTRAINTS_TNAME, - OB_ALL_CONSTRAINTS_TNAME, - OB_USER_CONSTRAINTS_TNAME, - OB_ALL_TAB_COLS_V_TNAME, - OB_DBA_TAB_COLS_V_TNAME, - OB_USER_TAB_COLS_V_TNAME, - OB_ALL_TAB_COLS_TNAME, - OB_DBA_TAB_COLS_TNAME, - OB_USER_TAB_COLS_TNAME, - OB_ALL_TAB_COLUMNS_TNAME, - OB_DBA_TAB_COLUMNS_TNAME, - OB_USER_TAB_COLUMNS_TNAME, - OB_ALL_TABLES_TNAME, - OB_DBA_TABLES_TNAME, - OB_USER_TABLES_TNAME, - OB_DBA_TAB_COMMENTS_TNAME, - OB_ALL_TAB_COMMENTS_TNAME, - OB_USER_TAB_COMMENTS_TNAME, - OB_DBA_COL_COMMENTS_TNAME, - OB_ALL_COL_COMMENTS_TNAME, - OB_USER_COL_COMMENTS_TNAME, - OB_DBA_INDEXES_TNAME, - OB_ALL_INDEXES_TNAME, - OB_USER_INDEXES_TNAME, - OB_DBA_CONS_COLUMNS_TNAME, - OB_ALL_CONS_COLUMNS_TNAME, - OB_USER_CONS_COLUMNS_TNAME, - OB_USER_SEGMENTS_TNAME, - OB_DBA_SEGMENTS_TNAME, - OB_DBA_TYPES_TNAME, - OB_ALL_TYPES_TNAME, - OB_USER_TYPES_TNAME, - OB_DBA_TYPE_ATTRS_TNAME, - OB_ALL_TYPE_ATTRS_TNAME, - OB_USER_TYPE_ATTRS_TNAME, - OB_DBA_COLL_TYPES_TNAME, - OB_ALL_COLL_TYPES_TNAME, - OB_USER_COLL_TYPES_TNAME, - OB_DBA_PROCEDURES_TNAME, - OB_DBA_ARGUMENTS_TNAME, - OB_DBA_SOURCE_TNAME, - OB_ALL_PROCEDURES_TNAME, - OB_ALL_ARGUMENTS_TNAME, - OB_ALL_SOURCE_TNAME, - OB_USER_PROCEDURES_TNAME, - OB_USER_ARGUMENTS_TNAME, - OB_USER_SOURCE_TNAME, - OB_DBA_PART_KEY_COLUMNS_TNAME, - OB_ALL_PART_KEY_COLUMNS_TNAME, - OB_USER_PART_KEY_COLUMNS_TNAME, - OB_DBA_SUBPART_KEY_COLUMNS_TNAME, - OB_ALL_SUBPART_KEY_COLUMNS_TNAME, - OB_USER_SUBPART_KEY_COLUMNS_TNAME, - OB_DBA_VIEWS_TNAME, - OB_ALL_VIEWS_TNAME, - OB_USER_VIEWS_TNAME, - OB_ALL_TAB_PARTITIONS_ORA_TNAME, - OB_ALL_TAB_SUBPARTITIONS_ORA_TNAME, - OB_ALL_PART_TABLES_ORA_TNAME, - OB_DBA_PART_TABLES_ORA_TNAME, - OB_USER_PART_TABLES_ORA_TNAME, - OB_DBA_TAB_PARTITIONS_ORA_TNAME, - OB_USER_TAB_PARTITIONS_ORA_TNAME, - OB_DBA_TAB_SUBPARTITIONS_ORA_TNAME, - OB_USER_TAB_SUBPARTITIONS_ORA_TNAME, - OB_DBA_SUBPARTITION_TEMPLATES_ORA_TNAME, - OB_ALL_SUBPARTITION_TEMPLATES_ORA_TNAME, - OB_USER_SUBPARTITION_TEMPLATES_ORA_TNAME, - OB_DBA_PART_INDEXES_TNAME, - OB_ALL_PART_INDEXES_TNAME, - OB_USER_PART_INDEXES_TNAME, - OB_ALL_ALL_TABLES_ORA_TNAME, - OB_DBA_ALL_TABLES_ORA_TNAME, - OB_USER_ALL_TABLES_ORA_TNAME, - OB_DBA_PROFILES_ORA_TNAME, - OB_USER_PROFILES_ORA_TNAME, - OB_ALL_PROFILES_ORA_TNAME, - OB_ALL_MVIEW_COMMENTS_ORA_TNAME, - OB_USER_MVIEW_COMMENTS_ORA_TNAME, - OB_DBA_MVIEW_COMMENTS_ORA_TNAME, - OB_ALL_SCHEDULER_PROGRAM_ARGS_ORA_TNAME, - OB_DBA_SCHEDULER_PROGRAM_ARGS_ORA_TNAME, - OB_USER_SCHEDULER_PROGRAM_ARGS_ORA_TNAME, - OB_ALL_SCHEDULER_JOB_ARGS_ORA_TNAME, - OB_DBA_SCHEDULER_JOB_ARGS_ORA_TNAME, - OB_USER_SCHEDULER_JOB_ARGS_ORA_TNAME, - OB_ALL_ERRORS_ORA_TNAME, - OB_DBA_ERRORS_ORA_TNAME, - OB_USER_ERRORS_ORA_TNAME, - OB_ALL_TYPE_METHODS_ORA_TNAME, - OB_DBA_TYPE_METHODS_ORA_TNAME, - OB_USER_TYPE_METHODS_ORA_TNAME, - OB_ALL_METHOD_PARAMS_ORA_TNAME, - OB_DBA_METHOD_PARAMS_ORA_TNAME, - OB_USER_METHOD_PARAMS_ORA_TNAME, - OB_DBA_TABLESPACES_ORA_TNAME, - OB_USER_TABLESPACES_ORA_TNAME, - OB_DBA_IND_EXPRESSIONS_TNAME, - OB_USER_IND_EXPRESSIONS_TNAME, - OB_ALL_IND_EXPRESSIONS_TNAME, - OB_ALL_IND_PARTITIONS_TNAME, - OB_USER_IND_PARTITIONS_TNAME, - OB_DBA_IND_PARTITIONS_TNAME, - OB_DBA_IND_SUBPARTITIONS_TNAME, - OB_ALL_IND_SUBPARTITIONS_TNAME, - OB_USER_IND_SUBPARTITIONS_TNAME, - OB_DBA_ROLES_TNAME, - OB_DBA_ROLE_PRIVS_TNAME, - OB_USER_ROLE_PRIVS_TNAME, - OB_DBA_TAB_PRIVS_TNAME, - OB_ALL_TAB_PRIVS_TNAME, - OB_USER_TAB_PRIVS_TNAME, - OB_DBA_SYS_PRIVS_TNAME, - OB_USER_SYS_PRIVS_TNAME, - OB_DBA_COL_PRIVS_ORA_TNAME, - OB_USER_COL_PRIVS_ORA_TNAME, - OB_ALL_COL_PRIVS_ORA_TNAME, - OB_ROLE_TAB_PRIVS_ORA_TNAME, - OB_ROLE_SYS_PRIVS_ORA_TNAME, - OB_ROLE_ROLE_PRIVS_ORA_TNAME, - OB_DICTIONARY_ORA_TNAME, - OB_DICT_ORA_TNAME, - OB_ALL_TRIGGERS_TNAME, - OB_DBA_TRIGGERS_TNAME, - OB_USER_TRIGGERS_TNAME, - OB_ALL_DEPENDENCIES_ORA_TNAME, - OB_DBA_DEPENDENCIES_ORA_TNAME, - OB_USER_DEPENDENCIES_ORA_TNAME, - OB_DBA_RSRC_PLANS_TNAME, - OB_DBA_RSRC_PLAN_DIRECTIVES_TNAME, - OB_DBA_RSRC_GROUP_MAPPINGS_TNAME, - OB_DBA_RECYCLEBIN_ORA_TNAME, - OB_USER_RECYCLEBIN_ORA_TNAME, - OB_DBA_RSRC_CONSUMER_GROUPS_TNAME, - OB_GV_OUTLINE_ORA_TNAME, - OB_GV_SQL_AUDIT_ORA_TNAME, - OB_V_SQL_AUDIT_ORA_TNAME, - OB_GV_INSTANCE_TNAME, - OB_V_INSTANCE_TNAME, - OB_GV_PLAN_CACHE_PLAN_STAT_ORA_TNAME, - OB_V_PLAN_CACHE_PLAN_STAT_ORA_TNAME, - OB_GV_PLAN_CACHE_PLAN_EXPLAIN_ORA_TNAME, - OB_V_PLAN_CACHE_PLAN_EXPLAIN_ORA_TNAME, - OB_GV_SESSION_WAIT_ORA_TNAME, - OB_V_SESSION_WAIT_ORA_TNAME, - OB_GV_SESSION_WAIT_HISTORY_ORA_TNAME, - OB_V_SESSION_WAIT_HISTORY_ORA_TNAME, - OB_GV_MEMORY_ORA_TNAME, - OB_V_MEMORY_ORA_TNAME, - OB_GV_MEMSTORE_ORA_TNAME, - OB_V_MEMSTORE_ORA_TNAME, - OB_GV_MEMSTORE_INFO_ORA_TNAME, - OB_V_MEMSTORE_INFO_ORA_TNAME, - OB_GV_SERVER_MEMSTORE_ORA_TNAME, - OB_GV_SESSTAT_ORA_TNAME, - OB_V_SESSTAT_ORA_TNAME, - OB_GV_SYSSTAT_ORA_TNAME, - OB_V_SYSSTAT_ORA_TNAME, - OB_GV_SYSTEM_EVENT_ORA_TNAME, - OB_V_SYSTEM_EVENT_ORA_TNAME, - OB_GV_TENANT_MEMSTORE_ALLOCATOR_INFO_ORA_TNAME, - OB_V_TENANT_MEMSTORE_ALLOCATOR_INFO_ORA_TNAME, - OB_GV_PLAN_CACHE_STAT_ORA_TNAME, - OB_V_PLAN_CACHE_STAT_ORA_TNAME, - OB_GV_CONCURRENT_LIMIT_SQL_ORA_TNAME, - OB_NLS_SESSION_PARAMETERS_ORA_TNAME, - OB_NLS_INSTANCE_PARAMETERS_ORA_TNAME, - OB_NLS_DATABASE_PARAMETERS_ORA_TNAME, - OB_V_NLS_PARAMETERS_ORA_TNAME, - OB_V_VERSION_ORA_TNAME, - OB_GV_TENANT_PX_WORKER_STAT_ORA_TNAME, - OB_V_TENANT_PX_WORKER_STAT_ORA_TNAME, - OB_GV_PS_STAT_ORA_TNAME, - OB_V_PS_STAT_ORA_TNAME, - OB_GV_PS_ITEM_INFO_ORA_TNAME, - OB_V_PS_ITEM_INFO_ORA_TNAME, - OB_GV_SQL_WORKAREA_ACTIVE_ORA_TNAME, - OB_V_SQL_WORKAREA_ACTIVE_ORA_TNAME, - OB_GV_SQL_WORKAREA_HISTOGRAM_ORA_TNAME, - OB_V_SQL_WORKAREA_HISTOGRAM_ORA_TNAME, - OB_GV_OB_SQL_WORKAREA_MEMORY_INFO_ORA_TNAME, - OB_V_OB_SQL_WORKAREA_MEMORY_INFO_ORA_TNAME, - OB_GV_PLAN_CACHE_REFERENCE_INFO_ORA_TNAME, - OB_V_PLAN_CACHE_REFERENCE_INFO_ORA_TNAME, - OB_GV_SQL_WORKAREA_ORA_TNAME, - OB_V_SQL_WORKAREA_ORA_TNAME, - OB_GV_SSTABLE_ORA_TNAME, - OB_V_SSTABLE_ORA_TNAME, - OB_GV_SERVER_SCHEMA_INFO_ORA_TNAME, - OB_V_SERVER_SCHEMA_INFO_ORA_TNAME, - OB_GV_SQL_PLAN_MONITOR_ORA_TNAME, - OB_V_SQL_PLAN_MONITOR_ORA_TNAME, - OB_V_SQL_MONITOR_STATNAME_ORA_TNAME, - OB_GV_LOCK_ORA_TNAME, - OB_V_LOCK_ORA_TNAME, - OB_GV_OPEN_CURSOR_ORA_TNAME, - OB_V_OPEN_CURSOR_ORA_TNAME, - OB_V_TIMEZONE_NAMES_ORA_TNAME, - OB_GV_GLOBAL_TRANSACTION_ORA_TNAME, - OB_V_GLOBAL_TRANSACTION_ORA_TNAME, - OB_V_RESTORE_POINT_ORA_TNAME, - OB_V_RSRC_PLAN_ORA_TNAME, -}; +const char* const tenant_space_table_names [] = { + OB_ALL_TABLE_TNAME, + OB_ALL_COLUMN_TNAME, + OB_ALL_DDL_OPERATION_TNAME, + OB_ALL_TABLE_V2_TNAME, + OB_ALL_USER_TNAME, + OB_ALL_USER_HISTORY_TNAME, + OB_ALL_DATABASE_TNAME, + OB_ALL_DATABASE_HISTORY_TNAME, + OB_ALL_TABLEGROUP_TNAME, + OB_ALL_TABLEGROUP_HISTORY_TNAME, + OB_ALL_TABLE_PRIVILEGE_TNAME, + OB_ALL_TABLE_PRIVILEGE_HISTORY_TNAME, + OB_ALL_DATABASE_PRIVILEGE_TNAME, + OB_ALL_DATABASE_PRIVILEGE_HISTORY_TNAME, + OB_ALL_TABLE_HISTORY_TNAME, + OB_ALL_COLUMN_HISTORY_TNAME, + OB_TENANT_PARAMETER_TNAME, + OB_ALL_SYS_VARIABLE_TNAME, + OB_ALL_SYS_STAT_TNAME, + OB_ALL_COLUMN_STATISTIC_TNAME, + OB_ALL_DUMMY_TNAME, + OB_ALL_CLOG_HISTORY_INFO_V2_TNAME, + OB_ALL_OUTLINE_TNAME, + OB_ALL_OUTLINE_HISTORY_TNAME, + OB_ALL_RECYCLEBIN_TNAME, + OB_ALL_PART_TNAME, + OB_ALL_PART_HISTORY_TNAME, + OB_ALL_SUB_PART_TNAME, + OB_ALL_SUB_PART_HISTORY_TNAME, + OB_ALL_PART_INFO_TNAME, + OB_ALL_PART_INFO_HISTORY_TNAME, + OB_ALL_DEF_SUB_PART_TNAME, + OB_ALL_DEF_SUB_PART_HISTORY_TNAME, + OB_ALL_SYS_VARIABLE_HISTORY_TNAME, + OB_ALL_DDL_ID_TNAME, + OB_ALL_FOREIGN_KEY_TNAME, + OB_ALL_FOREIGN_KEY_HISTORY_TNAME, + OB_ALL_FOREIGN_KEY_COLUMN_TNAME, + OB_ALL_FOREIGN_KEY_COLUMN_HISTORY_TNAME, + OB_ALL_SYNONYM_TNAME, + OB_ALL_SYNONYM_HISTORY_TNAME, + OB_ALL_SEQUENCE_V2_TNAME, + OB_ALL_TENANT_META_TABLE_TNAME, + OB_ALL_ROUTINE_TNAME, + OB_ALL_ROUTINE_HISTORY_TNAME, + OB_ALL_ROUTINE_PARAM_TNAME, + OB_ALL_ROUTINE_PARAM_HISTORY_TNAME, + OB_ALL_TABLE_STAT_TNAME, + OB_ALL_COLUMN_STAT_TNAME, + OB_ALL_HISTOGRAM_STAT_TNAME, + OB_ALL_PACKAGE_TNAME, + OB_ALL_PACKAGE_HISTORY_TNAME, + OB_ALL_TENANT_GC_PARTITION_INFO_TNAME, + OB_ALL_CONSTRAINT_TNAME, + OB_ALL_CONSTRAINT_HISTORY_TNAME, + OB_ALL_ORI_SCHEMA_VERSION_TNAME, + OB_ALL_FUNC_TNAME, + OB_ALL_FUNC_HISTORY_TNAME, + OB_ALL_TEMP_TABLE_TNAME, + OB_ALL_SEQUENCE_OBJECT_TNAME, + OB_ALL_SEQUENCE_OBJECT_HISTORY_TNAME, + OB_ALL_SEQUENCE_VALUE_TNAME, + OB_ALL_TENANT_PLAN_BASELINE_TNAME, + OB_ALL_TENANT_PLAN_BASELINE_HISTORY_TNAME, + OB_ALL_TYPE_TNAME, + OB_ALL_TYPE_HISTORY_TNAME, + OB_ALL_TYPE_ATTR_TNAME, + OB_ALL_TYPE_ATTR_HISTORY_TNAME, + OB_ALL_COLL_TYPE_TNAME, + OB_ALL_COLL_TYPE_HISTORY_TNAME, + OB_ALL_WEAK_READ_SERVICE_TNAME, + OB_ALL_DBLINK_TNAME, + OB_ALL_DBLINK_HISTORY_TNAME, + OB_ALL_TENANT_PARTITION_META_TABLE_TNAME, + OB_ALL_TENANT_ROLE_GRANTEE_MAP_TNAME, + OB_ALL_TENANT_ROLE_GRANTEE_MAP_HISTORY_TNAME, + OB_ALL_TENANT_KEYSTORE_TNAME, + OB_ALL_TENANT_KEYSTORE_HISTORY_TNAME, + OB_ALL_TENANT_TABLESPACE_TNAME, + OB_ALL_TENANT_TABLESPACE_HISTORY_TNAME, + OB_ALL_TENANT_USER_FAILED_LOGIN_STAT_TNAME, + OB_ALL_TENANT_PROFILE_TNAME, + OB_ALL_TENANT_PROFILE_HISTORY_TNAME, + OB_ALL_TENANT_SECURITY_AUDIT_TNAME, + OB_ALL_TENANT_SECURITY_AUDIT_HISTORY_TNAME, + OB_ALL_TENANT_TRIGGER_TNAME, + OB_ALL_TENANT_TRIGGER_HISTORY_TNAME, + OB_ALL_TENANT_SSTABLE_COLUMN_CHECKSUM_TNAME, + OB_ALL_TENANT_SECURITY_AUDIT_RECORD_TNAME, + OB_ALL_TENANT_SYSAUTH_TNAME, + OB_ALL_TENANT_SYSAUTH_HISTORY_TNAME, + OB_ALL_TENANT_OBJAUTH_TNAME, + OB_ALL_TENANT_OBJAUTH_HISTORY_TNAME, + OB_ALL_TENANT_BACKUP_INFO_TNAME, + OB_ALL_TENANT_BACKUP_LOG_ARCHIVE_STATUS_TNAME, + OB_ALL_TENANT_BACKUP_TASK_TNAME, + OB_ALL_TENANT_PG_BACKUP_TASK_TNAME, + OB_ALL_TENANT_ERROR_TNAME, + OB_ALL_TENANT_BACKUP_CLEAN_INFO_TNAME, + OB_ALL_TENANT_RESTORE_PG_INFO_TNAME, + OB_ALL_TABLE_V2_HISTORY_TNAME, + OB_ALL_TENANT_OBJECT_TYPE_TNAME, + OB_ALL_TENANT_OBJECT_TYPE_HISTORY_TNAME, + OB_ALL_TENANT_BACKUP_VALIDATION_TASK_TNAME, + OB_ALL_TENANT_PG_BACKUP_VALIDATION_TASK_TNAME, + OB_ALL_TENANT_TIME_ZONE_TNAME, + OB_ALL_TENANT_TIME_ZONE_NAME_TNAME, + OB_ALL_TENANT_TIME_ZONE_TRANSITION_TNAME, + OB_ALL_TENANT_TIME_ZONE_TRANSITION_TYPE_TNAME, + OB_ALL_TENANT_CONSTRAINT_COLUMN_TNAME, + OB_ALL_TENANT_CONSTRAINT_COLUMN_HISTORY_TNAME, + OB_ALL_TENANT_GLOBAL_TRANSACTION_TNAME, + OB_ALL_TENANT_DEPENDENCY_TNAME, + OB_ALL_TENANT_BACKUP_BACKUPSET_TASK_TNAME, + OB_ALL_TENANT_PG_BACKUP_BACKUPSET_TASK_TNAME, + OB_ALL_TENANT_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TNAME, + OB_ALL_RES_MGR_PLAN_TNAME, + OB_ALL_RES_MGR_DIRECTIVE_TNAME, + OB_ALL_RES_MGR_MAPPING_RULE_TNAME, + OB_ALL_RES_MGR_CONSUMER_GROUP_TNAME, + OB_ALL_TABLE_V2_HISTORY_IDX_DATA_TABLE_ID_TNAME, + OB_ALL_TABLE_HISTORY_IDX_DATA_TABLE_ID_TNAME, + OB_TENANT_VIRTUAL_ALL_TABLE_TNAME, + OB_TENANT_VIRTUAL_TABLE_COLUMN_TNAME, + OB_TENANT_VIRTUAL_TABLE_INDEX_TNAME, + OB_TENANT_VIRTUAL_SHOW_CREATE_DATABASE_TNAME, + OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_TNAME, + OB_TENANT_VIRTUAL_SESSION_VARIABLE_TNAME, + OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_TNAME, + OB_TENANT_VIRTUAL_WARNING_TNAME, + OB_TENANT_VIRTUAL_CURRENT_TENANT_TNAME, + OB_TENANT_VIRTUAL_DATABASE_STATUS_TNAME, + OB_TENANT_VIRTUAL_TENANT_STATUS_TNAME, + OB_TENANT_VIRTUAL_INTERM_RESULT_TNAME, + OB_TENANT_VIRTUAL_PARTITION_STAT_TNAME, + OB_TENANT_VIRTUAL_STATNAME_TNAME, + OB_TENANT_VIRTUAL_EVENT_NAME_TNAME, + OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_TNAME, + OB_TENANT_VIRTUAL_SHOW_TABLES_TNAME, + OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_TNAME, + OB_ALL_VIRTUAL_DATA_TYPE_CLASS_TNAME, + OB_ALL_VIRTUAL_DATA_TYPE_TNAME, + OB_ALL_VIRTUAL_CORE_ALL_TABLE_TNAME, + OB_ALL_VIRTUAL_CORE_COLUMN_TABLE_TNAME, + OB_ALL_VIRTUAL_TRACE_LOG_TNAME, + OB_ALL_VIRTUAL_ENGINE_TNAME, + OB_TENANT_VIRTUAL_OUTLINE_TNAME, + OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_TNAME, + OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_TNAME, + OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_TNAME, + OB_SESSION_VARIABLES_TNAME, + OB_TABLE_PRIVILEGES_TNAME, + OB_USER_PRIVILEGES_TNAME, + OB_SCHEMA_PRIVILEGES_TNAME, + OB_TABLE_CONSTRAINTS_TNAME, + OB_GLOBAL_STATUS_TNAME, + OB_PARTITIONS_TNAME, + OB_SESSION_STATUS_TNAME, + OB_USER_TNAME, + OB_DB_TNAME, + OB_PROC_TNAME, + OB_TENANT_VIRTUAL_COLLATION_TNAME, + OB_TENANT_VIRTUAL_CHARSET_TNAME, + OB_PARAMETERS_TNAME, + OB_ALL_VIRTUAL_WEAK_READ_STAT_TNAME, + OB_ALL_VIRTUAL_INFORMATION_COLUMNS_TNAME, + OB_REFERENTIAL_CONSTRAINTS_TNAME, + OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_TNAME, + OB_ALL_VIRTUAL_OPEN_CURSOR_TNAME, + OB_ALL_VIRTUAL_FILES_TNAME, + OB_FILES_TNAME, + OB_TENANT_VIRTUAL_OBJECT_DEFINITION_TNAME, + OB_ALL_VIRTUAL_TABLE_AGENT_TNAME, + OB_ALL_VIRTUAL_COLUMN_AGENT_TNAME, + OB_ALL_VIRTUAL_DATABASE_AGENT_TNAME, + OB_ALL_VIRTUAL_SEQUENCE_V2_AGENT_TNAME, + OB_ALL_VIRTUAL_PART_AGENT_TNAME, + OB_ALL_VIRTUAL_SUB_PART_AGENT_TNAME, + OB_ALL_VIRTUAL_PACKAGE_AGENT_TNAME, + OB_ALL_VIRTUAL_TENANT_META_TABLE_AGENT_TNAME, + OB_ALL_VIRTUAL_SQL_AUDIT_ORA_TNAME, + OB_ALL_VIRTUAL_SQL_AUDIT_ORA_ALL_VIRTUAL_SQL_AUDIT_I1_TNAME, + OB_ALL_VIRTUAL_PLAN_STAT_ORA_TNAME, + OB_ALL_VIRTUAL_SQL_PLAN_STATISTICS_AGENT_TNAME, + OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_ORA_TNAME, + OB_ALL_VIRTUAL_SEQUENCE_VALUE_AGENT_TNAME, + OB_ALL_VIRTUAL_SEQUENCE_OBJECT_AGENT_TNAME, + OB_ALL_VIRTUAL_USER_AGENT_TNAME, + OB_ALL_VIRTUAL_SYNONYM_AGENT_TNAME, + OB_ALL_VIRTUAL_FOREIGN_KEY_AGENT_TNAME, + OB_ALL_VIRTUAL_COLUMN_STAT_AGENT_TNAME, + OB_ALL_VIRTUAL_COLUMN_STATISTIC_AGENT_TNAME, + OB_ALL_VIRTUAL_PARTITION_TABLE_AGENT_TNAME, + OB_ALL_VIRTUAL_TABLE_STAT_AGENT_TNAME, + OB_ALL_VIRTUAL_RECYCLEBIN_AGENT_TNAME, + OB_TENANT_VIRTUAL_OUTLINE_AGENT_TNAME, + OB_ALL_VIRTUAL_ROUTINE_AGENT_TNAME, + OB_ALL_VIRTUAL_TABLEGROUP_AGENT_TNAME, + OB_ALL_VIRTUAL_PRIVILEGE_AGENT_TNAME, + OB_ALL_VIRTUAL_SYS_PARAMETER_STAT_AGENT_TNAME, + OB_TENANT_VIRTUAL_TABLE_INDEX_AGENT_TNAME, + OB_TENANT_VIRTUAL_CHARSET_AGENT_TNAME, + OB_TENANT_VIRTUAL_ALL_TABLE_AGENT_TNAME, + OB_TENANT_VIRTUAL_COLLATION_AGENT_TNAME, + OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_AGENT_TNAME, + OB_ALL_VIRTUAL_SERVER_AGENT_TNAME, + OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_TNAME, + OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TNAME, + OB_ALL_VIRTUAL_PROCESSLIST_ORA_TNAME, + OB_ALL_VIRTUAL_SESSION_WAIT_ORA_TNAME, + OB_ALL_VIRTUAL_SESSION_WAIT_ORA_ALL_VIRTUAL_SESSION_WAIT_I1_TNAME, + OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_TNAME, + OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TNAME, + OB_ALL_VIRTUAL_MEMORY_INFO_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_ORA_TNAME, + OB_ALL_VIRTUAL_MEMSTORE_INFO_ORA_TNAME, + OB_ALL_VIRTUAL_SERVER_MEMORY_INFO_AGENT_TNAME, + OB_ALL_VIRTUAL_SESSTAT_ORA_TNAME, + OB_ALL_VIRTUAL_SESSTAT_ORA_ALL_VIRTUAL_SESSTAT_I1_TNAME, + OB_ALL_VIRTUAL_SYSSTAT_ORA_TNAME, + OB_ALL_VIRTUAL_SYSSTAT_ORA_ALL_VIRTUAL_SYSSTAT_I1_TNAME, + OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_TNAME, + OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_ALL_VIRTUAL_SYSTEM_EVENT_I1_TNAME, + OB_ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_AGENT_TNAME, + OB_TENANT_VIRTUAL_SESSION_VARIABLE_ORA_TNAME, + OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_ORA_TNAME, + OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_ORA_TNAME, + OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_ORA_TNAME, + OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_ORA_TNAME, + OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_ORA_TNAME, + OB_TENANT_VIRTUAL_TABLE_COLUMN_ORA_TNAME, + OB_ALL_VIRTUAL_TRACE_LOG_ORA_TNAME, + OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_AGENT_TNAME, + OB_ALL_VIRTUAL_CONSTRAINT_AGENT_TNAME, + OB_ALL_VIRTUAL_TYPE_AGENT_TNAME, + OB_ALL_VIRTUAL_TYPE_ATTR_AGENT_TNAME, + OB_ALL_VIRTUAL_COLL_TYPE_AGENT_TNAME, + OB_ALL_VIRTUAL_ROUTINE_PARAM_AGENT_TNAME, + OB_ALL_VIRTUAL_DATA_TYPE_ORA_TNAME, + OB_ALL_VIRTUAL_TABLE_SYS_AGENT_TNAME, + OB_ALL_VIRTUAL_SSTABLE_CHECKSUM_AGENT_TNAME, + OB_ALL_VIRTUAL_PARTITION_INFO_AGENT_TNAME, + OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_AGENT_TNAME, + OB_ALL_VIRTUAL_TENANT_KEYSTORE_AGENT_TNAME, + OB_ALL_VIRTUAL_TENANT_TABLESPACE_AGENT_TNAME, + OB_ALL_VIRTUAL_TENANT_PROFILE_AGENT_TNAME, + OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT_TNAME, + OB_ALL_VIRTUAL_TABLE_PRIVILEGE_AGENT_TNAME, + OB_ALL_VIRTUAL_SECURITY_AUDIT_AGENT_TNAME, + OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_AGENT_TNAME, + OB_ALL_VIRTUAL_TRIGGER_AGENT_TNAME, + OB_ALL_VIRTUAL_PX_WORKER_STAT_ORA_TNAME, + OB_ALL_VIRTUAL_PS_STAT_ORA_TNAME, + OB_ALL_VIRTUAL_PS_ITEM_INFO_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_ORA_TNAME, + OB_ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT_TNAME, + OB_ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT_TNAME, + OB_ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT_TNAME, + OB_ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT_TNAME, + OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_AGENT_TNAME, + OB_ALL_VIRTUAL_SYSAUTH_AGENT_TNAME, + OB_ALL_VIRTUAL_SYSAUTH_HISTORY_AGENT_TNAME, + OB_ALL_VIRTUAL_OBJAUTH_AGENT_TNAME, + OB_ALL_VIRTUAL_OBJAUTH_HISTORY_AGENT_TNAME, + OB_ALL_VIRTUAL_ERROR_AGENT_TNAME, + OB_ALL_VIRTUAL_TABLE_MGR_AGENT_TNAME, + OB_ALL_VIRTUAL_DEF_SUB_PART_AGENT_TNAME, + OB_ALL_VIRTUAL_OBJECT_TYPE_AGENT_TNAME, + OB_ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT_TNAME, + OB_ALL_VIRTUAL_DBLINK_AGENT_TNAME, + OB_ALL_VIRTUAL_DBLINK_HISTORY_AGENT_TNAME, + OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_TNAME, + OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TNAME, + OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_ORA_TNAME, + OB_ALL_VIRTUAL_LOCK_WAIT_STAT_ORA_TNAME, + OB_ALL_VIRTUAL_OPEN_CURSOR_ORA_TNAME, + OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_AGENT_TNAME, + OB_ALL_VIRTUAL_DEPENDENCY_AGENT_TNAME, + OB_ALL_VIRTUAL_TENANT_TIME_ZONE_AGENT_TNAME, + OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_AGENT_TNAME, + OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_AGENT_TNAME, + OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_AGENT_TNAME, + OB_TENANT_VIRTUAL_OBJECT_DEFINITION_ORA_TNAME, + OB_ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT_TNAME, + OB_ALL_VIRTUAL_TYPE_SYS_AGENT_TNAME, + OB_ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT_TNAME, + OB_ALL_VIRTUAL_COLL_TYPE_SYS_AGENT_TNAME, + OB_ALL_VIRTUAL_PACKAGE_SYS_AGENT_TNAME, + OB_ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT_TNAME, + OB_ALL_VIRTUAL_ROUTINE_SYS_AGENT_TNAME, + OB_ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT_TNAME, + OB_ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT_TNAME, + OB_ALL_VIRTUAL_TABLE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_COLUMN_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_DATABASE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_SEQUENCE_V2_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_PART_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_SUB_PART_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_PACKAGE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_USER_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_SYNONYM_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_COLUMN_STAT_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_COLUMN_STATISTIC_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TABLE_STAT_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_ROUTINE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TABLEGROUP_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_CONSTRAINT_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TYPE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_COLL_TYPE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_KEYSTORE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TABLE_PRIVILEGE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_HISTORY_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_RECORD_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_SYSAUTH_HISTORY_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_OBJAUTH_HISTORY_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_OBJECT_TYPE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_DBLINK_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_DBLINK_HISTORY_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_CONSTRAINT_COLUMN_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_DEPENDENCY_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_TIME_ZONE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_RES_MGR_PLAN_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_RES_MGR_DIRECTIVE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_TRANS_LOCK_STAT_ORA_TNAME, + OB_ALL_VIRTUAL_RES_MGR_MAPPING_RULE_REAL_AGENT_ORA_TNAME, + OB_ALL_VIRTUAL_RES_MGR_CONSUMER_GROUP_REAL_AGENT_ORA_TNAME, + OB_GV_PLAN_CACHE_STAT_TNAME, + OB_GV_PLAN_CACHE_PLAN_STAT_TNAME, + OB_SCHEMATA_TNAME, + OB_CHARACTER_SETS_TNAME, + OB_GLOBAL_VARIABLES_TNAME, + OB_STATISTICS_TNAME, + OB_VIEWS_TNAME, + OB_TABLES_TNAME, + OB_COLLATIONS_TNAME, + OB_COLLATION_CHARACTER_SET_APPLICABILITY_TNAME, + OB_PROCESSLIST_TNAME, + OB_KEY_COLUMN_USAGE_TNAME, + OB_DBA_OUTLINES_TNAME, + OB_ENGINES_TNAME, + OB_ROUTINES_TNAME, + OB_GV_SESSION_EVENT_TNAME, + OB_GV_SESSION_WAIT_TNAME, + OB_GV_SESSION_WAIT_HISTORY_TNAME, + OB_GV_SYSTEM_EVENT_TNAME, + OB_GV_SESSTAT_TNAME, + OB_GV_SYSSTAT_TNAME, + OB_V_STATNAME_TNAME, + OB_V_EVENT_NAME_TNAME, + OB_V_SESSION_EVENT_TNAME, + OB_V_SESSION_WAIT_TNAME, + OB_V_SESSION_WAIT_HISTORY_TNAME, + OB_V_SESSTAT_TNAME, + OB_V_SYSSTAT_TNAME, + OB_V_SYSTEM_EVENT_TNAME, + OB_GV_SQL_AUDIT_TNAME, + OB_GV_LATCH_TNAME, + OB_GV_MEMORY_TNAME, + OB_V_MEMORY_TNAME, + OB_GV_MEMSTORE_TNAME, + OB_V_MEMSTORE_TNAME, + OB_GV_MEMSTORE_INFO_TNAME, + OB_V_MEMSTORE_INFO_TNAME, + OB_V_PLAN_CACHE_STAT_TNAME, + OB_V_PLAN_CACHE_PLAN_STAT_TNAME, + OB_GV_PLAN_CACHE_PLAN_EXPLAIN_TNAME, + OB_V_PLAN_CACHE_PLAN_EXPLAIN_TNAME, + OB_V_SQL_AUDIT_TNAME, + OB_V_LATCH_TNAME, + OB_GV_OBRPC_OUTGOING_TNAME, + OB_V_OBRPC_OUTGOING_TNAME, + OB_GV_OBRPC_INCOMING_TNAME, + OB_V_OBRPC_INCOMING_TNAME, + OB_GV_SQL_TNAME, + OB_V_SQL_TNAME, + OB_GV_SQL_MONITOR_TNAME, + OB_V_SQL_MONITOR_TNAME, + OB_GV_SQL_PLAN_MONITOR_TNAME, + OB_V_SQL_PLAN_MONITOR_TNAME, + OB_USER_RECYCLEBIN_TNAME, + OB_GV_OUTLINE_TNAME, + OB_GV_CONCURRENT_LIMIT_SQL_TNAME, + OB_GV_SQL_PLAN_STATISTICS_TNAME, + OB_V_SQL_PLAN_STATISTICS_TNAME, + OB_GV_SERVER_MEMSTORE_TNAME, + OB_GV_UNIT_LOAD_BALANCE_EVENT_HISTORY_TNAME, + OB_GV_TENANT_TNAME, + OB_GV_DATABASE_TNAME, + OB_GV_TABLE_TNAME, + OB_GV_UNIT_TNAME, + OB_V_UNIT_TNAME, + OB_GV_PARTITION_TNAME, + OB_V_PARTITION_TNAME, + OB_GV_LOCK_WAIT_STAT_TNAME, + OB_V_LOCK_WAIT_STAT_TNAME, + OB_TIME_ZONE_TNAME, + OB_TIME_ZONE_NAME_TNAME, + OB_TIME_ZONE_TRANSITION_TNAME, + OB_TIME_ZONE_TRANSITION_TYPE_TNAME, + OB_GV_SESSION_LONGOPS_TNAME, + OB_V_SESSION_LONGOPS_TNAME, + OB_GV_TENANT_MEMSTORE_ALLOCATOR_INFO_TNAME, + OB_V_TENANT_MEMSTORE_ALLOCATOR_INFO_TNAME, + OB_GV_TENANT_SEQUENCE_OBJECT_TNAME, + OB_COLUMNS_TNAME, + OB_GV_MINOR_MERGE_INFO_TNAME, + OB_GV_TENANT_PX_WORKER_STAT_TNAME, + OB_V_TENANT_PX_WORKER_STAT_TNAME, + OB_GV_PARTITION_AUDIT_TNAME, + OB_V_PARTITION_AUDIT_TNAME, + OB_GV_PS_STAT_TNAME, + OB_V_PS_STAT_TNAME, + OB_GV_PS_ITEM_INFO_TNAME, + OB_V_PS_ITEM_INFO_TNAME, + OB_GV_SQL_WORKAREA_TNAME, + OB_V_SQL_WORKAREA_TNAME, + OB_GV_SQL_WORKAREA_ACTIVE_TNAME, + OB_V_SQL_WORKAREA_ACTIVE_TNAME, + OB_GV_SQL_WORKAREA_HISTOGRAM_TNAME, + OB_V_SQL_WORKAREA_HISTOGRAM_TNAME, + OB_GV_OB_SQL_WORKAREA_MEMORY_INFO_TNAME, + OB_V_OB_SQL_WORKAREA_MEMORY_INFO_TNAME, + OB_GV_PLAN_CACHE_REFERENCE_INFO_TNAME, + OB_V_PLAN_CACHE_REFERENCE_INFO_TNAME, + OB_V_OB_TIMESTAMP_SERVICE_TNAME, + OB_GV_SSTABLE_TNAME, + OB_V_SSTABLE_TNAME, + OB_CDB_OB_BACKUP_ARCHIVELOG_SUMMARY_TNAME, + OB_CDB_OB_BACKUP_JOB_DETAILS_TNAME, + OB_CDB_OB_BACKUP_SET_DETAILS_TNAME, + OB_CDB_OB_BACKUP_SET_EXPIRED_TNAME, + OB_CDB_OB_BACKUP_PROGRESS_TNAME, + OB_CDB_OB_BACKUP_ARCHIVELOG_PROGRESS_TNAME, + OB_CDB_OB_BACKUP_CLEAN_HISTORY_TNAME, + OB_CDB_OB_BACKUP_TASK_CLEAN_HISTORY_TNAME, + OB_GV_SERVER_SCHEMA_INFO_TNAME, + OB_V_SERVER_SCHEMA_INFO_TNAME, + OB_CDB_CKPT_HISTORY_TNAME, + OB_GV_OB_TRANS_TABLE_STATUS_TNAME, + OB_V_OB_TRANS_TABLE_STATUS_TNAME, + OB_V_SQL_MONITOR_STATNAME_TNAME, + OB_GV_MERGE_INFO_TNAME, + OB_V_MERGE_INFO_TNAME, + OB_GV_LOCK_TNAME, + OB_V_LOCK_TNAME, + OB_CDB_OB_TENANT_BACKUP_VALIDATION_TASK_TNAME, + OB_V_RESTORE_POINT_TNAME, + OB_CDB_OB_BACKUP_SET_OBSOLETE_TNAME, + OB_DBA_SYNONYMS_TNAME, + OB_DBA_OBJECTS_TNAME, + OB_ALL_OBJECTS_TNAME, + OB_USER_OBJECTS_TNAME, + OB_DBA_SEQUENCES_TNAME, + OB_ALL_SEQUENCES_TNAME, + OB_USER_SEQUENCES_TNAME, + OB_DBA_USERS_TNAME, + OB_ALL_USERS_TNAME, + OB_ALL_SYNONYMS_TNAME, + OB_USER_SYNONYMS_TNAME, + OB_DBA_IND_COLUMNS_TNAME, + OB_ALL_IND_COLUMNS_TNAME, + OB_USER_IND_COLUMNS_TNAME, + OB_DBA_CONSTRAINTS_TNAME, + OB_ALL_CONSTRAINTS_TNAME, + OB_USER_CONSTRAINTS_TNAME, + OB_ALL_TAB_COLS_V_TNAME, + OB_DBA_TAB_COLS_V_TNAME, + OB_USER_TAB_COLS_V_TNAME, + OB_ALL_TAB_COLS_TNAME, + OB_DBA_TAB_COLS_TNAME, + OB_USER_TAB_COLS_TNAME, + OB_ALL_TAB_COLUMNS_TNAME, + OB_DBA_TAB_COLUMNS_TNAME, + OB_USER_TAB_COLUMNS_TNAME, + OB_ALL_TABLES_TNAME, + OB_DBA_TABLES_TNAME, + OB_USER_TABLES_TNAME, + OB_DBA_TAB_COMMENTS_TNAME, + OB_ALL_TAB_COMMENTS_TNAME, + OB_USER_TAB_COMMENTS_TNAME, + OB_DBA_COL_COMMENTS_TNAME, + OB_ALL_COL_COMMENTS_TNAME, + OB_USER_COL_COMMENTS_TNAME, + OB_DBA_INDEXES_TNAME, + OB_ALL_INDEXES_TNAME, + OB_USER_INDEXES_TNAME, + OB_DBA_CONS_COLUMNS_TNAME, + OB_ALL_CONS_COLUMNS_TNAME, + OB_USER_CONS_COLUMNS_TNAME, + OB_USER_SEGMENTS_TNAME, + OB_DBA_SEGMENTS_TNAME, + OB_DBA_TYPES_TNAME, + OB_ALL_TYPES_TNAME, + OB_USER_TYPES_TNAME, + OB_DBA_TYPE_ATTRS_TNAME, + OB_ALL_TYPE_ATTRS_TNAME, + OB_USER_TYPE_ATTRS_TNAME, + OB_DBA_COLL_TYPES_TNAME, + OB_ALL_COLL_TYPES_TNAME, + OB_USER_COLL_TYPES_TNAME, + OB_DBA_PROCEDURES_TNAME, + OB_DBA_ARGUMENTS_TNAME, + OB_DBA_SOURCE_TNAME, + OB_ALL_PROCEDURES_TNAME, + OB_ALL_ARGUMENTS_TNAME, + OB_ALL_SOURCE_TNAME, + OB_USER_PROCEDURES_TNAME, + OB_USER_ARGUMENTS_TNAME, + OB_USER_SOURCE_TNAME, + OB_DBA_PART_KEY_COLUMNS_TNAME, + OB_ALL_PART_KEY_COLUMNS_TNAME, + OB_USER_PART_KEY_COLUMNS_TNAME, + OB_DBA_SUBPART_KEY_COLUMNS_TNAME, + OB_ALL_SUBPART_KEY_COLUMNS_TNAME, + OB_USER_SUBPART_KEY_COLUMNS_TNAME, + OB_DBA_VIEWS_TNAME, + OB_ALL_VIEWS_TNAME, + OB_USER_VIEWS_TNAME, + OB_ALL_TAB_PARTITIONS_ORA_TNAME, + OB_ALL_TAB_SUBPARTITIONS_ORA_TNAME, + OB_ALL_PART_TABLES_ORA_TNAME, + OB_DBA_PART_TABLES_ORA_TNAME, + OB_USER_PART_TABLES_ORA_TNAME, + OB_DBA_TAB_PARTITIONS_ORA_TNAME, + OB_USER_TAB_PARTITIONS_ORA_TNAME, + OB_DBA_TAB_SUBPARTITIONS_ORA_TNAME, + OB_USER_TAB_SUBPARTITIONS_ORA_TNAME, + OB_DBA_SUBPARTITION_TEMPLATES_ORA_TNAME, + OB_ALL_SUBPARTITION_TEMPLATES_ORA_TNAME, + OB_USER_SUBPARTITION_TEMPLATES_ORA_TNAME, + OB_DBA_PART_INDEXES_TNAME, + OB_ALL_PART_INDEXES_TNAME, + OB_USER_PART_INDEXES_TNAME, + OB_ALL_ALL_TABLES_ORA_TNAME, + OB_DBA_ALL_TABLES_ORA_TNAME, + OB_USER_ALL_TABLES_ORA_TNAME, + OB_DBA_PROFILES_ORA_TNAME, + OB_USER_PROFILES_ORA_TNAME, + OB_ALL_PROFILES_ORA_TNAME, + OB_ALL_MVIEW_COMMENTS_ORA_TNAME, + OB_USER_MVIEW_COMMENTS_ORA_TNAME, + OB_DBA_MVIEW_COMMENTS_ORA_TNAME, + OB_ALL_SCHEDULER_PROGRAM_ARGS_ORA_TNAME, + OB_DBA_SCHEDULER_PROGRAM_ARGS_ORA_TNAME, + OB_USER_SCHEDULER_PROGRAM_ARGS_ORA_TNAME, + OB_ALL_SCHEDULER_JOB_ARGS_ORA_TNAME, + OB_DBA_SCHEDULER_JOB_ARGS_ORA_TNAME, + OB_USER_SCHEDULER_JOB_ARGS_ORA_TNAME, + OB_ALL_ERRORS_ORA_TNAME, + OB_DBA_ERRORS_ORA_TNAME, + OB_USER_ERRORS_ORA_TNAME, + OB_ALL_TYPE_METHODS_ORA_TNAME, + OB_DBA_TYPE_METHODS_ORA_TNAME, + OB_USER_TYPE_METHODS_ORA_TNAME, + OB_ALL_METHOD_PARAMS_ORA_TNAME, + OB_DBA_METHOD_PARAMS_ORA_TNAME, + OB_USER_METHOD_PARAMS_ORA_TNAME, + OB_DBA_TABLESPACES_ORA_TNAME, + OB_USER_TABLESPACES_ORA_TNAME, + OB_DBA_IND_EXPRESSIONS_TNAME, + OB_USER_IND_EXPRESSIONS_TNAME, + OB_ALL_IND_EXPRESSIONS_TNAME, + OB_ALL_IND_PARTITIONS_TNAME, + OB_USER_IND_PARTITIONS_TNAME, + OB_DBA_IND_PARTITIONS_TNAME, + OB_DBA_IND_SUBPARTITIONS_TNAME, + OB_ALL_IND_SUBPARTITIONS_TNAME, + OB_USER_IND_SUBPARTITIONS_TNAME, + OB_DBA_ROLES_TNAME, + OB_DBA_ROLE_PRIVS_TNAME, + OB_USER_ROLE_PRIVS_TNAME, + OB_DBA_TAB_PRIVS_TNAME, + OB_ALL_TAB_PRIVS_TNAME, + OB_USER_TAB_PRIVS_TNAME, + OB_DBA_SYS_PRIVS_TNAME, + OB_USER_SYS_PRIVS_TNAME, + OB_DBA_COL_PRIVS_ORA_TNAME, + OB_USER_COL_PRIVS_ORA_TNAME, + OB_ALL_COL_PRIVS_ORA_TNAME, + OB_ROLE_TAB_PRIVS_ORA_TNAME, + OB_ROLE_SYS_PRIVS_ORA_TNAME, + OB_ROLE_ROLE_PRIVS_ORA_TNAME, + OB_DICTIONARY_ORA_TNAME, + OB_DICT_ORA_TNAME, + OB_ALL_TRIGGERS_TNAME, + OB_DBA_TRIGGERS_TNAME, + OB_USER_TRIGGERS_TNAME, + OB_ALL_DEPENDENCIES_ORA_TNAME, + OB_DBA_DEPENDENCIES_ORA_TNAME, + OB_USER_DEPENDENCIES_ORA_TNAME, + OB_DBA_RSRC_PLANS_TNAME, + OB_DBA_RSRC_PLAN_DIRECTIVES_TNAME, + OB_DBA_RSRC_GROUP_MAPPINGS_TNAME, + OB_DBA_RECYCLEBIN_ORA_TNAME, + OB_USER_RECYCLEBIN_ORA_TNAME, + OB_DBA_RSRC_CONSUMER_GROUPS_TNAME, + OB_GV_OUTLINE_ORA_TNAME, + OB_GV_SQL_AUDIT_ORA_TNAME, + OB_V_SQL_AUDIT_ORA_TNAME, + OB_GV_INSTANCE_TNAME, + OB_V_INSTANCE_TNAME, + OB_GV_PLAN_CACHE_PLAN_STAT_ORA_TNAME, + OB_V_PLAN_CACHE_PLAN_STAT_ORA_TNAME, + OB_GV_PLAN_CACHE_PLAN_EXPLAIN_ORA_TNAME, + OB_V_PLAN_CACHE_PLAN_EXPLAIN_ORA_TNAME, + OB_GV_SESSION_WAIT_ORA_TNAME, + OB_V_SESSION_WAIT_ORA_TNAME, + OB_GV_SESSION_WAIT_HISTORY_ORA_TNAME, + OB_V_SESSION_WAIT_HISTORY_ORA_TNAME, + OB_GV_MEMORY_ORA_TNAME, + OB_V_MEMORY_ORA_TNAME, + OB_GV_MEMSTORE_ORA_TNAME, + OB_V_MEMSTORE_ORA_TNAME, + OB_GV_MEMSTORE_INFO_ORA_TNAME, + OB_V_MEMSTORE_INFO_ORA_TNAME, + OB_GV_SERVER_MEMSTORE_ORA_TNAME, + OB_GV_SESSTAT_ORA_TNAME, + OB_V_SESSTAT_ORA_TNAME, + OB_GV_SYSSTAT_ORA_TNAME, + OB_V_SYSSTAT_ORA_TNAME, + OB_GV_SYSTEM_EVENT_ORA_TNAME, + OB_V_SYSTEM_EVENT_ORA_TNAME, + OB_GV_TENANT_MEMSTORE_ALLOCATOR_INFO_ORA_TNAME, + OB_V_TENANT_MEMSTORE_ALLOCATOR_INFO_ORA_TNAME, + OB_GV_PLAN_CACHE_STAT_ORA_TNAME, + OB_V_PLAN_CACHE_STAT_ORA_TNAME, + OB_GV_CONCURRENT_LIMIT_SQL_ORA_TNAME, + OB_NLS_SESSION_PARAMETERS_ORA_TNAME, + OB_NLS_INSTANCE_PARAMETERS_ORA_TNAME, + OB_NLS_DATABASE_PARAMETERS_ORA_TNAME, + OB_V_NLS_PARAMETERS_ORA_TNAME, + OB_V_VERSION_ORA_TNAME, + OB_GV_TENANT_PX_WORKER_STAT_ORA_TNAME, + OB_V_TENANT_PX_WORKER_STAT_ORA_TNAME, + OB_GV_PS_STAT_ORA_TNAME, + OB_V_PS_STAT_ORA_TNAME, + OB_GV_PS_ITEM_INFO_ORA_TNAME, + OB_V_PS_ITEM_INFO_ORA_TNAME, + OB_GV_SQL_WORKAREA_ACTIVE_ORA_TNAME, + OB_V_SQL_WORKAREA_ACTIVE_ORA_TNAME, + OB_GV_SQL_WORKAREA_HISTOGRAM_ORA_TNAME, + OB_V_SQL_WORKAREA_HISTOGRAM_ORA_TNAME, + OB_GV_OB_SQL_WORKAREA_MEMORY_INFO_ORA_TNAME, + OB_V_OB_SQL_WORKAREA_MEMORY_INFO_ORA_TNAME, + OB_GV_PLAN_CACHE_REFERENCE_INFO_ORA_TNAME, + OB_V_PLAN_CACHE_REFERENCE_INFO_ORA_TNAME, + OB_GV_SQL_WORKAREA_ORA_TNAME, + OB_V_SQL_WORKAREA_ORA_TNAME, + OB_GV_SSTABLE_ORA_TNAME, + OB_V_SSTABLE_ORA_TNAME, + OB_GV_SERVER_SCHEMA_INFO_ORA_TNAME, + OB_V_SERVER_SCHEMA_INFO_ORA_TNAME, + OB_GV_SQL_PLAN_MONITOR_ORA_TNAME, + OB_V_SQL_PLAN_MONITOR_ORA_TNAME, + OB_V_SQL_MONITOR_STATNAME_ORA_TNAME, + OB_GV_LOCK_ORA_TNAME, + OB_V_LOCK_ORA_TNAME, + OB_GV_OPEN_CURSOR_ORA_TNAME, + OB_V_OPEN_CURSOR_ORA_TNAME, + OB_V_TIMEZONE_NAMES_ORA_TNAME, + OB_GV_GLOBAL_TRANSACTION_ORA_TNAME, + OB_V_GLOBAL_TRANSACTION_ORA_TNAME, + OB_V_RESTORE_POINT_ORA_TNAME, + OB_V_RSRC_PLAN_ORA_TNAME, }; -const uint64_t only_rs_vtables[] = { - OB_ALL_VIRTUAL_CORE_META_TABLE_TID, - OB_ALL_VIRTUAL_SERVER_STAT_TID, - OB_ALL_VIRTUAL_REBALANCE_TASK_STAT_TID, - OB_ALL_VIRTUAL_UPGRADE_INSPECTION_TID, - OB_ALL_VIRTUAL_CORE_ROOT_TABLE_TID, - OB_ALL_VIRTUAL_CORE_ALL_TABLE_TID, - OB_ALL_VIRTUAL_CORE_COLUMN_TABLE_TID, - OB_ALL_VIRTUAL_TENANT_STAT_TID, - OB_ALL_VIRTUAL_REBALANCE_TENANT_STAT_TID, - OB_ALL_VIRTUAL_REBALANCE_UNIT_STAT_TID, - OB_ALL_VIRTUAL_REBALANCE_REPLICA_STAT_TID, - OB_ALL_VIRTUAL_LEADER_STAT_TID, - OB_ALL_VIRTUAL_ROOTSERVICE_STAT_TID, - OB_ALL_VIRTUAL_REBALANCE_MAP_STAT_TID, - OB_ALL_VIRTUAL_REBALANCE_MAP_ITEM_STAT_TID, - OB_ALL_VIRTUAL_REBALANCE_UNIT_MIGRATE_STAT_TID, - OB_ALL_VIRTUAL_REBALANCE_UNIT_DISTRIBUTION_STAT_TID, - OB_ALL_VIRTUAL_PARTITION_TABLE_TID, - OB_ALL_VIRTUAL_REPLICA_TASK_TID, - OB_ALL_VIRTUAL_REPLICA_TASK_TID, - OB_ALL_VIRTUAL_FREEZE_INFO_TID, - OB_ALL_VIRTUAL_CLUSTER_TID, - OB_ALL_VIRTUAL_CLUSTER_STATS_TID, - OB_ALL_VIRTUAL_BACKUPSET_HISTORY_MGR_TID, - OB_ALL_VIRTUAL_PARTITION_TABLE_AGENT_TID, -}; +const uint64_t only_rs_vtables [] = { + OB_ALL_VIRTUAL_CORE_META_TABLE_TID, + OB_ALL_VIRTUAL_SERVER_STAT_TID, + OB_ALL_VIRTUAL_REBALANCE_TASK_STAT_TID, + OB_ALL_VIRTUAL_UPGRADE_INSPECTION_TID, + OB_ALL_VIRTUAL_CORE_ROOT_TABLE_TID, + OB_ALL_VIRTUAL_CORE_ALL_TABLE_TID, + OB_ALL_VIRTUAL_CORE_COLUMN_TABLE_TID, + OB_ALL_VIRTUAL_TENANT_STAT_TID, + OB_ALL_VIRTUAL_REBALANCE_TENANT_STAT_TID, + OB_ALL_VIRTUAL_REBALANCE_UNIT_STAT_TID, + OB_ALL_VIRTUAL_REBALANCE_REPLICA_STAT_TID, + OB_ALL_VIRTUAL_LEADER_STAT_TID, + OB_ALL_VIRTUAL_ROOTSERVICE_STAT_TID, + OB_ALL_VIRTUAL_REBALANCE_MAP_STAT_TID, + OB_ALL_VIRTUAL_REBALANCE_MAP_ITEM_STAT_TID, + OB_ALL_VIRTUAL_REBALANCE_UNIT_MIGRATE_STAT_TID, + OB_ALL_VIRTUAL_REBALANCE_UNIT_DISTRIBUTION_STAT_TID, + OB_ALL_VIRTUAL_PARTITION_TABLE_TID, + OB_ALL_VIRTUAL_REPLICA_TASK_TID, + OB_ALL_VIRTUAL_REPLICA_TASK_TID, + OB_ALL_VIRTUAL_FREEZE_INFO_TID, + OB_ALL_VIRTUAL_CLUSTER_TID, + OB_ALL_VIRTUAL_CLUSTER_STATS_TID, + OB_ALL_VIRTUAL_BACKUPSET_HISTORY_MGR_TID, + OB_ALL_VIRTUAL_PARTITION_TABLE_AGENT_TID, }; + +const uint64_t restrict_access_virtual_tables[] = { + OB_ALL_VIRTUAL_SQL_AUDIT_ORA_TID, + OB_ALL_VIRTUAL_PLAN_STAT_ORA_TID, + OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_ORA_TID, + OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_TID, + OB_ALL_VIRTUAL_SESSION_WAIT_ORA_TID, + OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_TID, + OB_ALL_VIRTUAL_MEMORY_INFO_ORA_TID, + OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_ORA_TID, + OB_ALL_VIRTUAL_MEMSTORE_INFO_ORA_TID, + OB_ALL_VIRTUAL_SESSTAT_ORA_TID, + OB_ALL_VIRTUAL_SYSSTAT_ORA_TID, + OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_TID, + OB_ALL_VIRTUAL_PS_STAT_ORA_TID, + OB_ALL_VIRTUAL_PS_ITEM_INFO_ORA_TID, + OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_TID }; -const uint64_t restrict_access_virtual_tables[] = {OB_ALL_VIRTUAL_SQL_AUDIT_ORA_TID, - OB_ALL_VIRTUAL_PLAN_STAT_ORA_TID, - OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_ORA_TID, - OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_TID, - OB_ALL_VIRTUAL_SESSION_WAIT_ORA_TID, - OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_TID, - OB_ALL_VIRTUAL_MEMORY_INFO_ORA_TID, - OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_ORA_TID, - OB_ALL_VIRTUAL_MEMSTORE_INFO_ORA_TID, - OB_ALL_VIRTUAL_SESSTAT_ORA_TID, - OB_ALL_VIRTUAL_SYSSTAT_ORA_TID, - OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_TID, - OB_ALL_VIRTUAL_PS_STAT_ORA_TID, - OB_ALL_VIRTUAL_PS_ITEM_INFO_ORA_TID, - OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_TID}; static inline bool is_restrict_access_virtual_table(const uint64_t tid) { @@ -3924,7 +3935,7 @@ static inline bool is_tenant_table(const uint64_t tid) return in_tenant_space; } -static inline bool is_tenant_table_name(const common::ObString& tname) +static inline bool is_tenant_table_name(const common::ObString &tname) { bool in_tenant_space = false; for (int64_t i = 0; i < ARRAYSIZEOF(tenant_space_table_names); ++i) { @@ -3956,7 +3967,7 @@ static inline uint64_t get_origin_tid_by_oracle_mapping_tid(const uint64_t tid) } } if (common::OB_INVALID_ID != idx) { - org_tid = all_ora_mapping_virtual_table_org_tables[idx]; + org_tid = all_ora_mapping_virtual_table_org_tables[idx]; } return org_tid; } @@ -3978,7 +3989,7 @@ static inline uint64_t get_real_table_mappings_tid(const uint64_t tid) uint64_t pure_id = common::extract_pure_id(tid); if (pure_id >= common::OB_MIN_VIRTUAL_TABLE_ID && pure_id < common::OB_MAX_VIRTUAL_TABLE_ID) { int64_t idx = pure_id - common::OB_MIN_VIRTUAL_TABLE_ID; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; if (tmp_vt_mapping.is_real_vt_) { org_tid = tmp_vt_mapping.mapping_tid_; } @@ -3991,7 +4002,7 @@ static inline bool is_oracle_mapping_real_virtual_table(const uint64_t tid) return common::OB_INVALID_ID != get_real_table_mappings_tid(tid); } -static inline void get_real_table_vt_mapping(const uint64_t tid, VTMapping*& vt_mapping) +static inline void get_real_table_vt_mapping(const uint64_t tid, VTMapping *&vt_mapping) { uint64_t pure_id = common::extract_pure_id(tid); vt_mapping = nullptr; @@ -4004,8 +4015,8 @@ static inline void get_real_table_vt_mapping(const uint64_t tid, VTMapping*& vt_ static inline bool is_only_rs_virtual_table(const uint64_t tid) { bool only_rs = false; - if (common::extract_pure_id(tid) == OB_ALL_VIRTUAL_ZONE_STAT_TID && - GET_MIN_CLUSTER_VERSION() <= CLUSTER_VERSION_141) { + if (common::extract_pure_id(tid) == OB_ALL_VIRTUAL_ZONE_STAT_TID + && GET_MIN_CLUSTER_VERSION() <= CLUSTER_VERSION_141) { only_rs = true; } else { for (int64_t i = 0; i < ARRAYSIZEOF(only_rs_vtables); ++i) { @@ -4025,6 +4036,6 @@ const int64_t OB_SYS_TENANT_TABLE_COUNT = 997; const int64_t OB_CORE_SCHEMA_VERSION = 1; const int64_t OB_BOOTSTRAP_SCHEMA_VERSION = 1000; -} // end namespace share -} // end namespace oceanbase +} // end namespace share +} // end namespace oceanbase #endif /* _OB_INNER_TABLE_SCHEMA_H_ */ diff --git a/src/share/inner_table/ob_inner_table_schema.vt.cpp b/src/share/inner_table/ob_inner_table_schema.vt.cpp index f7a665363..acc799875 100644 --- a/src/share/inner_table/ob_inner_table_schema.vt.cpp +++ b/src/share/inner_table/ob_inner_table_schema.vt.cpp @@ -13,492 +13,494 @@ #define USING_LOG_PREFIX SHARE_SCHEMA #include "ob_inner_table_schema.h" -namespace oceanbase { -namespace share { +namespace oceanbase +{ +namespace share +{ VTMapping vt_mappings[5000]; bool vt_mapping_init() { - int64_t start_idx = common::OB_MIN_VIRTUAL_TABLE_ID; - { - int64_t idx = OB_ALL_VIRTUAL_COLL_TYPE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_COLL_TYPE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 0; - tmp_vt_mapping.end_pos_ = 3; - } + int64_t start_idx = common::OB_MIN_VIRTUAL_TABLE_ID; + { + int64_t idx = OB_ALL_VIRTUAL_COLL_TYPE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_COLL_TYPE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 0; + tmp_vt_mapping.end_pos_ = 3; + } - { - int64_t idx = OB_ALL_VIRTUAL_COLUMN_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_COLUMN_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 3; - tmp_vt_mapping.end_pos_ = 4; - } + { + int64_t idx = OB_ALL_VIRTUAL_COLUMN_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_COLUMN_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 3; + tmp_vt_mapping.end_pos_ = 4; + } - { - int64_t idx = OB_ALL_VIRTUAL_COLUMN_STATISTIC_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_COLUMN_STATISTIC_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 4; - tmp_vt_mapping.end_pos_ = 5; - } + { + int64_t idx = OB_ALL_VIRTUAL_COLUMN_STATISTIC_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_COLUMN_STATISTIC_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 4; + tmp_vt_mapping.end_pos_ = 5; + } - { - int64_t idx = OB_ALL_VIRTUAL_COLUMN_STAT_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_COLUMN_STAT_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 5; - tmp_vt_mapping.end_pos_ = 6; - } + { + int64_t idx = OB_ALL_VIRTUAL_COLUMN_STAT_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_COLUMN_STAT_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 5; + tmp_vt_mapping.end_pos_ = 6; + } - { - int64_t idx = OB_ALL_VIRTUAL_CONSTRAINT_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_CONSTRAINT_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 6; - tmp_vt_mapping.end_pos_ = 7; - } + { + int64_t idx = OB_ALL_VIRTUAL_CONSTRAINT_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_CONSTRAINT_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 6; + tmp_vt_mapping.end_pos_ = 7; + } - { - int64_t idx = OB_ALL_VIRTUAL_DATABASE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_DATABASE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 7; - tmp_vt_mapping.end_pos_ = 9; - } + { + int64_t idx = OB_ALL_VIRTUAL_DATABASE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_DATABASE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 7; + tmp_vt_mapping.end_pos_ = 9; + } - { - int64_t idx = OB_ALL_VIRTUAL_DBLINK_HISTORY_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_DBLINK_HISTORY_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 9; - tmp_vt_mapping.end_pos_ = 11; - } + { + int64_t idx = OB_ALL_VIRTUAL_DBLINK_HISTORY_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_DBLINK_HISTORY_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 9; + tmp_vt_mapping.end_pos_ = 11; + } - { - int64_t idx = OB_ALL_VIRTUAL_DBLINK_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_DBLINK_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 11; - tmp_vt_mapping.end_pos_ = 13; - } + { + int64_t idx = OB_ALL_VIRTUAL_DBLINK_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_DBLINK_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 11; + tmp_vt_mapping.end_pos_ = 13; + } - { - int64_t idx = OB_ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_DEF_SUB_PART_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 13; - tmp_vt_mapping.end_pos_ = 15; - } + { + int64_t idx = OB_ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_DEF_SUB_PART_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 13; + tmp_vt_mapping.end_pos_ = 15; + } - { - int64_t idx = OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_FOREIGN_KEY_COLUMN_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 15; - tmp_vt_mapping.end_pos_ = 16; - } + { + int64_t idx = OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_FOREIGN_KEY_COLUMN_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 15; + tmp_vt_mapping.end_pos_ = 16; + } - { - int64_t idx = OB_ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_FOREIGN_KEY_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 16; - tmp_vt_mapping.end_pos_ = 19; - } + { + int64_t idx = OB_ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_FOREIGN_KEY_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 16; + tmp_vt_mapping.end_pos_ = 19; + } - { - int64_t idx = OB_ALL_VIRTUAL_PACKAGE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_PACKAGE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 19; - tmp_vt_mapping.end_pos_ = 22; - } + { + int64_t idx = OB_ALL_VIRTUAL_PACKAGE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_PACKAGE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 19; + tmp_vt_mapping.end_pos_ = 22; + } - { - int64_t idx = OB_ALL_VIRTUAL_PART_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_PART_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 22; - tmp_vt_mapping.end_pos_ = 24; - } + { + int64_t idx = OB_ALL_VIRTUAL_PART_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_PART_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 22; + tmp_vt_mapping.end_pos_ = 24; + } - { - int64_t idx = OB_ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_RECYCLEBIN_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 24; - tmp_vt_mapping.end_pos_ = 27; - } + { + int64_t idx = OB_ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_RECYCLEBIN_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 24; + tmp_vt_mapping.end_pos_ = 27; + } - { - int64_t idx = OB_ALL_VIRTUAL_RES_MGR_CONSUMER_GROUP_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_RES_MGR_CONSUMER_GROUP_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.use_real_tenant_id_ = true; - } + { + int64_t idx = OB_ALL_VIRTUAL_RES_MGR_CONSUMER_GROUP_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_RES_MGR_CONSUMER_GROUP_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.use_real_tenant_id_ = true; + } - { - int64_t idx = OB_ALL_VIRTUAL_RES_MGR_DIRECTIVE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_RES_MGR_DIRECTIVE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.use_real_tenant_id_ = true; - } + { + int64_t idx = OB_ALL_VIRTUAL_RES_MGR_DIRECTIVE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_RES_MGR_DIRECTIVE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.use_real_tenant_id_ = true; + } - { - int64_t idx = OB_ALL_VIRTUAL_RES_MGR_MAPPING_RULE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_RES_MGR_MAPPING_RULE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.use_real_tenant_id_ = true; - } + { + int64_t idx = OB_ALL_VIRTUAL_RES_MGR_MAPPING_RULE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_RES_MGR_MAPPING_RULE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.use_real_tenant_id_ = true; + } - { - int64_t idx = OB_ALL_VIRTUAL_RES_MGR_PLAN_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_RES_MGR_PLAN_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.use_real_tenant_id_ = true; - } + { + int64_t idx = OB_ALL_VIRTUAL_RES_MGR_PLAN_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_RES_MGR_PLAN_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.use_real_tenant_id_ = true; + } - { - int64_t idx = OB_ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_ROUTINE_PARAM_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 27; - tmp_vt_mapping.end_pos_ = 29; - } + { + int64_t idx = OB_ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_ROUTINE_PARAM_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 27; + tmp_vt_mapping.end_pos_ = 29; + } - { - int64_t idx = OB_ALL_VIRTUAL_ROUTINE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_ROUTINE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 29; - tmp_vt_mapping.end_pos_ = 33; - } + { + int64_t idx = OB_ALL_VIRTUAL_ROUTINE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_ROUTINE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 29; + tmp_vt_mapping.end_pos_ = 33; + } - { - int64_t idx = OB_ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_SEQUENCE_OBJECT_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 33; - tmp_vt_mapping.end_pos_ = 35; - } + { + int64_t idx = OB_ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_SEQUENCE_OBJECT_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 33; + tmp_vt_mapping.end_pos_ = 35; + } - { - int64_t idx = OB_ALL_VIRTUAL_SEQUENCE_V2_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_SEQUENCE_V2_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 35; - tmp_vt_mapping.end_pos_ = 36; - } + { + int64_t idx = OB_ALL_VIRTUAL_SEQUENCE_V2_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_SEQUENCE_V2_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 35; + tmp_vt_mapping.end_pos_ = 36; + } - { - int64_t idx = OB_ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_SEQUENCE_VALUE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 36; - tmp_vt_mapping.end_pos_ = 37; - } + { + int64_t idx = OB_ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_SEQUENCE_VALUE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 36; + tmp_vt_mapping.end_pos_ = 37; + } - { - int64_t idx = OB_ALL_VIRTUAL_SUB_PART_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_SUB_PART_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 37; - tmp_vt_mapping.end_pos_ = 39; - } + { + int64_t idx = OB_ALL_VIRTUAL_SUB_PART_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_SUB_PART_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 37; + tmp_vt_mapping.end_pos_ = 39; + } - { - int64_t idx = OB_ALL_VIRTUAL_SYNONYM_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_SYNONYM_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 39; - tmp_vt_mapping.end_pos_ = 42; - } + { + int64_t idx = OB_ALL_VIRTUAL_SYNONYM_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_SYNONYM_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 39; + tmp_vt_mapping.end_pos_ = 42; + } - { - int64_t idx = OB_ALL_VIRTUAL_TABLEGROUP_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TABLEGROUP_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 42; - tmp_vt_mapping.end_pos_ = 43; - } + { + int64_t idx = OB_ALL_VIRTUAL_TABLEGROUP_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TABLEGROUP_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 42; + tmp_vt_mapping.end_pos_ = 43; + } - { - int64_t idx = OB_ALL_VIRTUAL_TABLE_PRIVILEGE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TABLE_PRIVILEGE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 43; - tmp_vt_mapping.end_pos_ = 44; - } + { + int64_t idx = OB_ALL_VIRTUAL_TABLE_PRIVILEGE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TABLE_PRIVILEGE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 43; + tmp_vt_mapping.end_pos_ = 44; + } - { - int64_t idx = OB_ALL_VIRTUAL_TABLE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TABLE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 44; - tmp_vt_mapping.end_pos_ = 49; - } + { + int64_t idx = OB_ALL_VIRTUAL_TABLE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TABLE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 44; + tmp_vt_mapping.end_pos_ = 49; + } - { - int64_t idx = OB_ALL_VIRTUAL_TABLE_STAT_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TABLE_STAT_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 49; - tmp_vt_mapping.end_pos_ = 50; - } + { + int64_t idx = OB_ALL_VIRTUAL_TABLE_STAT_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TABLE_STAT_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 49; + tmp_vt_mapping.end_pos_ = 50; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_CONSTRAINT_COLUMN_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_CONSTRAINT_COLUMN_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 50; - tmp_vt_mapping.end_pos_ = 51; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_CONSTRAINT_COLUMN_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_CONSTRAINT_COLUMN_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 50; + tmp_vt_mapping.end_pos_ = 51; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_DEPENDENCY_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_DEPENDENCY_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 51; - tmp_vt_mapping.end_pos_ = 54; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_DEPENDENCY_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_DEPENDENCY_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 51; + tmp_vt_mapping.end_pos_ = 54; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_ERROR_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 54; - tmp_vt_mapping.end_pos_ = 55; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_ERROR_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 54; + tmp_vt_mapping.end_pos_ = 55; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_KEYSTORE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_KEYSTORE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 55; - tmp_vt_mapping.end_pos_ = 57; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_KEYSTORE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_KEYSTORE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 55; + tmp_vt_mapping.end_pos_ = 57; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_META_TABLE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.use_real_tenant_id_ = true; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_META_TABLE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.use_real_tenant_id_ = true; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_OBJAUTH_HISTORY_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_OBJAUTH_HISTORY_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 57; - tmp_vt_mapping.end_pos_ = 60; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_OBJAUTH_HISTORY_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_OBJAUTH_HISTORY_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 57; + tmp_vt_mapping.end_pos_ = 60; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_OBJAUTH_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 60; - tmp_vt_mapping.end_pos_ = 63; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_OBJAUTH_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 60; + tmp_vt_mapping.end_pos_ = 63; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_OBJECT_TYPE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_OBJECT_TYPE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 63; - tmp_vt_mapping.end_pos_ = 66; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_OBJECT_TYPE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_OBJECT_TYPE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 63; + tmp_vt_mapping.end_pos_ = 66; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_PARTITION_META_TABLE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.use_real_tenant_id_ = true; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_PARTITION_META_TABLE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.use_real_tenant_id_ = true; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_PROFILE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 66; - tmp_vt_mapping.end_pos_ = 67; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_PROFILE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 66; + tmp_vt_mapping.end_pos_ = 67; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_ROLE_GRANTEE_MAP_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 67; - tmp_vt_mapping.end_pos_ = 69; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_ROLE_GRANTEE_MAP_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 67; + tmp_vt_mapping.end_pos_ = 69; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_HISTORY_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_SECURITY_AUDIT_HISTORY_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 69; - tmp_vt_mapping.end_pos_ = 71; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_HISTORY_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_SECURITY_AUDIT_HISTORY_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 69; + tmp_vt_mapping.end_pos_ = 71; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_SECURITY_AUDIT_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 71; - tmp_vt_mapping.end_pos_ = 73; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_SECURITY_AUDIT_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 71; + tmp_vt_mapping.end_pos_ = 73; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_RECORD_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_SECURITY_AUDIT_RECORD_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 73; - tmp_vt_mapping.end_pos_ = 78; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_RECORD_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_SECURITY_AUDIT_RECORD_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 73; + tmp_vt_mapping.end_pos_ = 78; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_SYSAUTH_HISTORY_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_SYSAUTH_HISTORY_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 78; - tmp_vt_mapping.end_pos_ = 79; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_SYSAUTH_HISTORY_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_SYSAUTH_HISTORY_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 78; + tmp_vt_mapping.end_pos_ = 79; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_SYSAUTH_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 79; - tmp_vt_mapping.end_pos_ = 80; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_SYSAUTH_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 79; + tmp_vt_mapping.end_pos_ = 80; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_TABLESPACE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 80; - tmp_vt_mapping.end_pos_ = 82; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_TABLESPACE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 80; + tmp_vt_mapping.end_pos_ = 82; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_TIME_ZONE_NAME_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.use_real_tenant_id_ = true; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_TIME_ZONE_NAME_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.use_real_tenant_id_ = true; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_TIME_ZONE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_TIME_ZONE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.use_real_tenant_id_ = true; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_TIME_ZONE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_TIME_ZONE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.use_real_tenant_id_ = true; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_TIME_ZONE_TRANSITION_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.use_real_tenant_id_ = true; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_TIME_ZONE_TRANSITION_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.use_real_tenant_id_ = true; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_TIME_ZONE_TRANSITION_TYPE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.use_real_tenant_id_ = true; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_TIME_ZONE_TRANSITION_TYPE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.use_real_tenant_id_ = true; + } - { - int64_t idx = OB_ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_TRIGGER_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 82; - tmp_vt_mapping.end_pos_ = 86; - } + { + int64_t idx = OB_ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TENANT_TRIGGER_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 82; + tmp_vt_mapping.end_pos_ = 86; + } - { - int64_t idx = OB_ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TYPE_ATTR_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 86; - tmp_vt_mapping.end_pos_ = 88; - } + { + int64_t idx = OB_ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TYPE_ATTR_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 86; + tmp_vt_mapping.end_pos_ = 88; + } - { - int64_t idx = OB_ALL_VIRTUAL_TYPE_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_TYPE_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 88; - tmp_vt_mapping.end_pos_ = 92; - } + { + int64_t idx = OB_ALL_VIRTUAL_TYPE_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_TYPE_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 88; + tmp_vt_mapping.end_pos_ = 92; + } - { - int64_t idx = OB_ALL_VIRTUAL_USER_REAL_AGENT_ORA_TID - start_idx; - VTMapping& tmp_vt_mapping = vt_mappings[idx]; - tmp_vt_mapping.mapping_tid_ = OB_ALL_USER_TID; - tmp_vt_mapping.is_real_vt_ = true; - tmp_vt_mapping.start_pos_ = 92; - tmp_vt_mapping.end_pos_ = 94; - } + { + int64_t idx = OB_ALL_VIRTUAL_USER_REAL_AGENT_ORA_TID - start_idx; + VTMapping &tmp_vt_mapping = vt_mappings[idx]; + tmp_vt_mapping.mapping_tid_ = OB_ALL_USER_TID; + tmp_vt_mapping.is_real_vt_ = true; + tmp_vt_mapping.start_pos_ = 92; + tmp_vt_mapping.end_pos_ = 94; + } - return true; -} // end define vt_mappings + return true; +} // end define vt_mappings bool inited_vt = vt_mapping_init(); -} // end namespace share -} // end namespace oceanbase +} // end namespace share +} // end namespace oceanbase diff --git a/src/share/inner_table/ob_inner_table_schema_constants.h b/src/share/inner_table/ob_inner_table_schema_constants.h index a4397bc73..6ba6ad25c 100644 --- a/src/share/inner_table/ob_inner_table_schema_constants.h +++ b/src/share/inner_table/ob_inner_table_schema_constants.h @@ -15,2143 +15,2062 @@ #include "share/ob_define.h" -namespace oceanbase { -namespace share { -namespace schema { +namespace oceanbase +{ +namespace share +{ +namespace schema +{ class ObTableSchema; } -} // namespace share +} -namespace share { -const uint64_t OB_ALL_CORE_TABLE_TID = 1; // "__all_core_table" -const uint64_t OB_ALL_ROOT_TABLE_TID = 2; // "__all_root_table" -const uint64_t OB_ALL_TABLE_TID = 3; // "__all_table" -const uint64_t OB_ALL_COLUMN_TID = 4; // "__all_column" -const uint64_t OB_ALL_DDL_OPERATION_TID = 5; // "__all_ddl_operation" -const uint64_t OB_ALL_TABLE_V2_TID = 7; // "__all_table_v2" -const uint64_t OB_ALL_META_TABLE_TID = 101; // "__all_meta_table" -const uint64_t OB_ALL_USER_TID = 102; // "__all_user" -const uint64_t OB_ALL_USER_HISTORY_TID = 103; // "__all_user_history" -const uint64_t OB_ALL_DATABASE_TID = 104; // "__all_database" -const uint64_t OB_ALL_DATABASE_HISTORY_TID = 105; // "__all_database_history" -const uint64_t OB_ALL_TABLEGROUP_TID = 106; // "__all_tablegroup" -const uint64_t OB_ALL_TABLEGROUP_HISTORY_TID = 107; // "__all_tablegroup_history" -const uint64_t OB_ALL_TENANT_TID = 108; // "__all_tenant" -const uint64_t OB_ALL_TENANT_HISTORY_TID = 109; // "__all_tenant_history" -const uint64_t OB_ALL_TABLE_PRIVILEGE_TID = 110; // "__all_table_privilege" -const uint64_t OB_ALL_TABLE_PRIVILEGE_HISTORY_TID = 111; // "__all_table_privilege_history" -const uint64_t OB_ALL_DATABASE_PRIVILEGE_TID = 112; // "__all_database_privilege" -const uint64_t OB_ALL_DATABASE_PRIVILEGE_HISTORY_TID = 113; // "__all_database_privilege_history" -const uint64_t OB_ALL_TABLE_HISTORY_TID = 114; // "__all_table_history" -const uint64_t OB_ALL_COLUMN_HISTORY_TID = 115; // "__all_column_history" -const uint64_t OB_ALL_ZONE_TID = 116; // "__all_zone" -const uint64_t OB_ALL_SERVER_TID = 117; // "__all_server" -const uint64_t OB_ALL_SYS_PARAMETER_TID = 118; // "__all_sys_parameter" -const uint64_t OB_TENANT_PARAMETER_TID = 119; // "__tenant_parameter" -const uint64_t OB_ALL_SYS_VARIABLE_TID = 120; // "__all_sys_variable" -const uint64_t OB_ALL_SYS_STAT_TID = 121; // "__all_sys_stat" -const uint64_t OB_ALL_COLUMN_STATISTIC_TID = 122; // "__all_column_statistic" -const uint64_t OB_ALL_UNIT_TID = 123; // "__all_unit" -const uint64_t OB_ALL_UNIT_CONFIG_TID = 124; // "__all_unit_config" -const uint64_t OB_ALL_RESOURCE_POOL_TID = 125; // "__all_resource_pool" -const uint64_t OB_ALL_TENANT_RESOURCE_USAGE_TID = 126; // "__all_tenant_resource_usage" -const uint64_t OB_ALL_SEQUENCE_TID = 127; // "__all_sequence" -const uint64_t OB_ALL_CHARSET_TID = 128; // "__all_charset" -const uint64_t OB_ALL_COLLATION_TID = 129; // "__all_collation" -const uint64_t OB_ALL_LOCAL_INDEX_STATUS_TID = 134; // "__all_local_index_status" -const uint64_t OB_ALL_DUMMY_TID = 135; // "__all_dummy" -const uint64_t OB_ALL_FROZEN_MAP_TID = 136; // "__all_frozen_map" -const uint64_t OB_ALL_CLOG_HISTORY_INFO_TID = 137; // "__all_clog_history_info" -const uint64_t OB_ALL_CLOG_HISTORY_INFO_V2_TID = 139; // "__all_clog_history_info_v2" -const uint64_t OB_ALL_ROOTSERVICE_EVENT_HISTORY_TID = 140; // "__all_rootservice_event_history" -const uint64_t OB_ALL_PRIVILEGE_TID = 141; // "__all_privilege" -const uint64_t OB_ALL_OUTLINE_TID = 142; // "__all_outline" -const uint64_t OB_ALL_OUTLINE_HISTORY_TID = 143; // "__all_outline_history" -const uint64_t OB_ALL_ELECTION_EVENT_HISTORY_TID = 144; // "__all_election_event_history" -const uint64_t OB_ALL_RECYCLEBIN_TID = 145; // "__all_recyclebin" -const uint64_t OB_ALL_PART_TID = 146; // "__all_part" -const uint64_t OB_ALL_PART_HISTORY_TID = 147; // "__all_part_history" -const uint64_t OB_ALL_SUB_PART_TID = 148; // "__all_sub_part" -const uint64_t OB_ALL_SUB_PART_HISTORY_TID = 149; // "__all_sub_part_history" -const uint64_t OB_ALL_PART_INFO_TID = 150; // "__all_part_info" -const uint64_t OB_ALL_PART_INFO_HISTORY_TID = 151; // "__all_part_info_history" -const uint64_t OB_ALL_DEF_SUB_PART_TID = 152; // "__all_def_sub_part" -const uint64_t OB_ALL_DEF_SUB_PART_HISTORY_TID = 153; // "__all_def_sub_part_history" -const uint64_t OB_ALL_SERVER_EVENT_HISTORY_TID = 154; // "__all_server_event_history" -const uint64_t OB_ALL_ROOTSERVICE_JOB_TID = 155; // "__all_rootservice_job" -const uint64_t OB_ALL_UNIT_LOAD_HISTORY_TID = 156; // "__all_unit_load_history" -const uint64_t OB_ALL_SYS_VARIABLE_HISTORY_TID = 157; // "__all_sys_variable_history" -const uint64_t OB_ALL_RESTORE_JOB_TID = 158; // "__all_restore_job" -const uint64_t OB_ALL_RESTORE_TASK_TID = 159; // "__all_restore_task" -const uint64_t OB_ALL_RESTORE_JOB_HISTORY_TID = 160; // "__all_restore_job_history" -const uint64_t OB_ALL_TIME_ZONE_TID = 161; // "__all_time_zone" -const uint64_t OB_ALL_TIME_ZONE_NAME_TID = 162; // "__all_time_zone_name" -const uint64_t OB_ALL_TIME_ZONE_TRANSITION_TID = 163; // "__all_time_zone_transition" -const uint64_t OB_ALL_TIME_ZONE_TRANSITION_TYPE_TID = 164; // "__all_time_zone_transition_type" -const uint64_t OB_ALL_DDL_ID_TID = 165; // "__all_ddl_id" -const uint64_t OB_ALL_FOREIGN_KEY_TID = 166; // "__all_foreign_key" -const uint64_t OB_ALL_FOREIGN_KEY_HISTORY_TID = 167; // "__all_foreign_key_history" -const uint64_t OB_ALL_FOREIGN_KEY_COLUMN_TID = 168; // "__all_foreign_key_column" -const uint64_t OB_ALL_FOREIGN_KEY_COLUMN_HISTORY_TID = 169; // "__all_foreign_key_column_history" -const uint64_t OB_ALL_SYNONYM_TID = 180; // "__all_synonym" -const uint64_t OB_ALL_SYNONYM_HISTORY_TID = 181; // "__all_synonym_history" -const uint64_t OB_ALL_SEQUENCE_V2_TID = 182; // "__all_sequence_v2" -const uint64_t OB_ALL_TENANT_META_TABLE_TID = 183; // "__all_tenant_meta_table" -const uint64_t OB_ALL_INDEX_WAIT_TRANSACTION_STATUS_TID = 186; // "__all_index_wait_transaction_status" -const uint64_t OB_ALL_INDEX_SCHEDULE_TASK_TID = 187; // "__all_index_schedule_task" -const uint64_t OB_ALL_INDEX_CHECKSUM_TID = 188; // "__all_index_checksum" -const uint64_t OB_ALL_ROUTINE_TID = 189; // "__all_routine" -const uint64_t OB_ALL_ROUTINE_HISTORY_TID = 190; // "__all_routine_history" -const uint64_t OB_ALL_ROUTINE_PARAM_TID = 191; // "__all_routine_param" -const uint64_t OB_ALL_ROUTINE_PARAM_HISTORY_TID = 192; // "__all_routine_param_history" -const uint64_t OB_ALL_TABLE_STAT_TID = 193; // "__all_table_stat" -const uint64_t OB_ALL_COLUMN_STAT_TID = 194; // "__all_column_stat" -const uint64_t OB_ALL_HISTOGRAM_STAT_TID = 195; // "__all_histogram_stat" -const uint64_t OB_ALL_PACKAGE_TID = 196; // "__all_package" -const uint64_t OB_ALL_PACKAGE_HISTORY_TID = 197; // "__all_package_history" -const uint64_t OB_ALL_SQL_EXECUTE_TASK_TID = 198; // "__all_sql_execute_task" -const uint64_t OB_ALL_INDEX_BUILD_STAT_TID = 199; // "__all_index_build_stat" -const uint64_t OB_ALL_BUILD_INDEX_PARAM_TID = 200; // "__all_build_index_param" -const uint64_t OB_ALL_GLOBAL_INDEX_DATA_SRC_TID = 201; // "__all_global_index_data_src" -const uint64_t OB_ALL_ACQUIRED_SNAPSHOT_TID = 202; // "__all_acquired_snapshot" -const uint64_t OB_ALL_IMMEDIATE_EFFECT_INDEX_SSTABLE_TID = 203; // "__all_immediate_effect_index_sstable" -const uint64_t OB_ALL_SSTABLE_CHECKSUM_TID = 204; // "__all_sstable_checksum" -const uint64_t OB_ALL_TENANT_GC_PARTITION_INFO_TID = 205; // "__all_tenant_gc_partition_info" -const uint64_t OB_ALL_CONSTRAINT_TID = 206; // "__all_constraint" -const uint64_t OB_ALL_CONSTRAINT_HISTORY_TID = 207; // "__all_constraint_history" -const uint64_t OB_ALL_ORI_SCHEMA_VERSION_TID = 208; // "__all_ori_schema_version" -const uint64_t OB_ALL_FUNC_TID = 209; // "__all_func" -const uint64_t OB_ALL_FUNC_HISTORY_TID = 210; // "__all_func_history" -const uint64_t OB_ALL_TEMP_TABLE_TID = 211; // "__all_temp_table" -const uint64_t OB_ALL_SSTABLE_COLUMN_CHECKSUM_TID = 212; // "__all_sstable_column_checksum" -const uint64_t OB_ALL_SEQUENCE_OBJECT_TID = 213; // "__all_sequence_object" -const uint64_t OB_ALL_SEQUENCE_OBJECT_HISTORY_TID = 214; // "__all_sequence_object_history" -const uint64_t OB_ALL_SEQUENCE_VALUE_TID = 215; // "__all_sequence_value" -const uint64_t OB_ALL_TENANT_PLAN_BASELINE_TID = 216; // "__all_tenant_plan_baseline" -const uint64_t OB_ALL_TENANT_PLAN_BASELINE_HISTORY_TID = 217; // "__all_tenant_plan_baseline_history" -const uint64_t OB_ALL_DDL_HELPER_TID = 218; // "__all_ddl_helper" -const uint64_t OB_ALL_FREEZE_SCHEMA_VERSION_TID = 219; // "__all_freeze_schema_version" -const uint64_t OB_ALL_TYPE_TID = 220; // "__all_type" -const uint64_t OB_ALL_TYPE_HISTORY_TID = 221; // "__all_type_history" -const uint64_t OB_ALL_TYPE_ATTR_TID = 222; // "__all_type_attr" -const uint64_t OB_ALL_TYPE_ATTR_HISTORY_TID = 223; // "__all_type_attr_history" -const uint64_t OB_ALL_COLL_TYPE_TID = 224; // "__all_coll_type" -const uint64_t OB_ALL_COLL_TYPE_HISTORY_TID = 225; // "__all_coll_type_history" -const uint64_t OB_ALL_WEAK_READ_SERVICE_TID = 226; // "__all_weak_read_service" -const uint64_t OB_ALL_GTS_TID = 229; // "__all_gts" -const uint64_t OB_ALL_TENANT_GTS_TID = 230; // "__all_tenant_gts" -const uint64_t OB_ALL_PARTITION_MEMBER_LIST_TID = 231; // "__all_partition_member_list" -const uint64_t OB_ALL_DBLINK_TID = 232; // "__all_dblink" -const uint64_t OB_ALL_DBLINK_HISTORY_TID = 233; // "__all_dblink_history" -const uint64_t OB_ALL_TENANT_PARTITION_META_TABLE_TID = 234; // "__all_tenant_partition_meta_table" -const uint64_t OB_ALL_TENANT_ROLE_GRANTEE_MAP_TID = 235; // "__all_tenant_role_grantee_map" -const uint64_t OB_ALL_TENANT_ROLE_GRANTEE_MAP_HISTORY_TID = 236; // "__all_tenant_role_grantee_map_history" -const uint64_t OB_ALL_TENANT_KEYSTORE_TID = 237; // "__all_tenant_keystore" -const uint64_t OB_ALL_TENANT_KEYSTORE_HISTORY_TID = 238; // "__all_tenant_keystore_history" -const uint64_t OB_ALL_TENANT_TABLESPACE_TID = 247; // "__all_tenant_tablespace" -const uint64_t OB_ALL_TENANT_TABLESPACE_HISTORY_TID = 248; // "__all_tenant_tablespace_history" -const uint64_t OB_ALL_TENANT_USER_FAILED_LOGIN_STAT_TID = 249; // "__all_tenant_user_failed_login_stat" -const uint64_t OB_ALL_TENANT_PROFILE_TID = 250; // "__all_tenant_profile" -const uint64_t OB_ALL_TENANT_PROFILE_HISTORY_TID = 251; // "__all_tenant_profile_history" -const uint64_t OB_ALL_TENANT_SECURITY_AUDIT_TID = 252; // "__all_tenant_security_audit" -const uint64_t OB_ALL_TENANT_SECURITY_AUDIT_HISTORY_TID = 253; // "__all_tenant_security_audit_history" -const uint64_t OB_ALL_TENANT_TRIGGER_TID = 254; // "__all_tenant_trigger" -const uint64_t OB_ALL_TENANT_TRIGGER_HISTORY_TID = 255; // "__all_tenant_trigger_history" -const uint64_t OB_ALL_SEED_PARAMETER_TID = 256; // "__all_seed_parameter" -const uint64_t OB_ALL_TENANT_SSTABLE_COLUMN_CHECKSUM_TID = 258; // "__all_tenant_sstable_column_checksum" -const uint64_t OB_ALL_TENANT_SECURITY_AUDIT_RECORD_TID = 259; // "__all_tenant_security_audit_record" -const uint64_t OB_ALL_TENANT_SYSAUTH_TID = 260; // "__all_tenant_sysauth" -const uint64_t OB_ALL_TENANT_SYSAUTH_HISTORY_TID = 261; // "__all_tenant_sysauth_history" -const uint64_t OB_ALL_TENANT_OBJAUTH_TID = 262; // "__all_tenant_objauth" -const uint64_t OB_ALL_TENANT_OBJAUTH_HISTORY_TID = 263; // "__all_tenant_objauth_history" -const uint64_t OB_ALL_TENANT_BACKUP_INFO_TID = 264; // "__all_tenant_backup_info" -const uint64_t OB_ALL_RESTORE_INFO_TID = 265; // "__all_restore_info" -const uint64_t OB_ALL_TENANT_BACKUP_LOG_ARCHIVE_STATUS_TID = 266; // "__all_tenant_backup_log_archive_status" -const uint64_t OB_ALL_BACKUP_LOG_ARCHIVE_STATUS_HISTORY_TID = 267; // "__all_backup_log_archive_status_history" -const uint64_t OB_ALL_TENANT_BACKUP_TASK_TID = 268; // "__all_tenant_backup_task" -const uint64_t OB_ALL_BACKUP_TASK_HISTORY_TID = 269; // "__all_backup_task_history" -const uint64_t OB_ALL_TENANT_PG_BACKUP_TASK_TID = 270; // "__all_tenant_pg_backup_task" -const uint64_t OB_ALL_TENANT_ERROR_TID = 272; // "__all_tenant_error" -const uint64_t OB_ALL_SERVER_RECOVERY_STATUS_TID = 273; // "__all_server_recovery_status" -const uint64_t OB_ALL_DATAFILE_RECOVERY_STATUS_TID = 274; // "__all_datafile_recovery_status" -const uint64_t OB_ALL_TENANT_BACKUP_CLEAN_INFO_TID = 276; // "__all_tenant_backup_clean_info" -const uint64_t OB_ALL_BACKUP_CLEAN_INFO_HISTORY_TID = 277; // "__all_backup_clean_info_history" -const uint64_t OB_ALL_BACKUP_TASK_CLEAN_HISTORY_TID = 278; // "__all_backup_task_clean_history" -const uint64_t OB_ALL_RESTORE_PROGRESS_TID = 279; // "__all_restore_progress" -const uint64_t OB_ALL_RESTORE_HISTORY_TID = 280; // "__all_restore_history" -const uint64_t OB_ALL_TENANT_RESTORE_PG_INFO_TID = 281; // "__all_tenant_restore_pg_info" -const uint64_t OB_ALL_TABLE_V2_HISTORY_TID = 282; // "__all_table_v2_history" -const uint64_t OB_ALL_TENANT_OBJECT_TYPE_TID = 283; // "__all_tenant_object_type" -const uint64_t OB_ALL_TENANT_OBJECT_TYPE_HISTORY_TID = 284; // "__all_tenant_object_type_history" -const uint64_t OB_ALL_BACKUP_VALIDATION_JOB_TID = 285; // "__all_backup_validation_job" -const uint64_t OB_ALL_BACKUP_VALIDATION_JOB_HISTORY_TID = 286; // "__all_backup_validation_job_history" -const uint64_t OB_ALL_TENANT_BACKUP_VALIDATION_TASK_TID = 287; // "__all_tenant_backup_validation_task" -const uint64_t OB_ALL_BACKUP_VALIDATION_TASK_HISTORY_TID = 288; // "__all_backup_validation_task_history" -const uint64_t OB_ALL_TENANT_PG_BACKUP_VALIDATION_TASK_TID = 289; // "__all_tenant_pg_backup_validation_task" -const uint64_t OB_ALL_TENANT_TIME_ZONE_TID = 290; // "__all_tenant_time_zone" -const uint64_t OB_ALL_TENANT_TIME_ZONE_NAME_TID = 291; // "__all_tenant_time_zone_name" -const uint64_t OB_ALL_TENANT_TIME_ZONE_TRANSITION_TID = 292; // "__all_tenant_time_zone_transition" -const uint64_t OB_ALL_TENANT_TIME_ZONE_TRANSITION_TYPE_TID = 293; // "__all_tenant_time_zone_transition_type" -const uint64_t OB_ALL_TENANT_CONSTRAINT_COLUMN_TID = 294; // "__all_tenant_constraint_column" -const uint64_t OB_ALL_TENANT_CONSTRAINT_COLUMN_HISTORY_TID = 295; // "__all_tenant_constraint_column_history" -const uint64_t OB_ALL_TENANT_GLOBAL_TRANSACTION_TID = 296; // "__all_tenant_global_transaction" -const uint64_t OB_ALL_TENANT_DEPENDENCY_TID = 297; // "__all_tenant_dependency" -const uint64_t OB_ALL_BACKUP_BACKUPSET_JOB_TID = 298; // "__all_backup_backupset_job" -const uint64_t OB_ALL_BACKUP_BACKUPSET_JOB_HISTORY_TID = 299; // "__all_backup_backupset_job_history" -const uint64_t OB_ALL_TENANT_BACKUP_BACKUPSET_TASK_TID = 300; // "__all_tenant_backup_backupset_task" -const uint64_t OB_ALL_BACKUP_BACKUPSET_TASK_HISTORY_TID = 301; // "__all_backup_backupset_task_history" -const uint64_t OB_ALL_TENANT_PG_BACKUP_BACKUPSET_TASK_TID = 302; // "__all_tenant_pg_backup_backupset_task" -const uint64_t OB_ALL_TENANT_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TID = - 303; // "__all_tenant_backup_backup_log_archive_status" -const uint64_t OB_ALL_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_HISTORY_TID = - 304; // "__all_backup_backup_log_archive_status_history" -const uint64_t OB_ALL_RES_MGR_PLAN_TID = 305; // "__all_res_mgr_plan" -const uint64_t OB_ALL_RES_MGR_DIRECTIVE_TID = 306; // "__all_res_mgr_directive" -const uint64_t OB_ALL_RES_MGR_MAPPING_RULE_TID = 307; // "__all_res_mgr_mapping_rule" -const uint64_t OB_ALL_RES_MGR_CONSUMER_GROUP_TID = 316; // "__all_res_mgr_consumer_group" -const uint64_t OB_TENANT_VIRTUAL_ALL_TABLE_TID = 10001; // "__tenant_virtual_all_table" -const uint64_t OB_TENANT_VIRTUAL_TABLE_COLUMN_TID = 10002; // "__tenant_virtual_table_column" -const uint64_t OB_TENANT_VIRTUAL_TABLE_INDEX_TID = 10003; // "__tenant_virtual_table_index" -const uint64_t OB_TENANT_VIRTUAL_SHOW_CREATE_DATABASE_TID = 10004; // "__tenant_virtual_show_create_database" -const uint64_t OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_TID = 10005; // "__tenant_virtual_show_create_table" -const uint64_t OB_TENANT_VIRTUAL_SESSION_VARIABLE_TID = 10006; // "__tenant_virtual_session_variable" -const uint64_t OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_TID = 10007; // "__tenant_virtual_privilege_grant" -const uint64_t OB_ALL_VIRTUAL_PROCESSLIST_TID = 10008; // "__all_virtual_processlist" -const uint64_t OB_TENANT_VIRTUAL_WARNING_TID = 10009; // "__tenant_virtual_warning" -const uint64_t OB_TENANT_VIRTUAL_CURRENT_TENANT_TID = 10010; // "__tenant_virtual_current_tenant" -const uint64_t OB_TENANT_VIRTUAL_DATABASE_STATUS_TID = 10011; // "__tenant_virtual_database_status" -const uint64_t OB_TENANT_VIRTUAL_TENANT_STATUS_TID = 10012; // "__tenant_virtual_tenant_status" -const uint64_t OB_TENANT_VIRTUAL_INTERM_RESULT_TID = 10013; // "__tenant_virtual_interm_result" -const uint64_t OB_TENANT_VIRTUAL_PARTITION_STAT_TID = 10014; // "__tenant_virtual_partition_stat" -const uint64_t OB_TENANT_VIRTUAL_STATNAME_TID = 10015; // "__tenant_virtual_statname" -const uint64_t OB_TENANT_VIRTUAL_EVENT_NAME_TID = 10016; // "__tenant_virtual_event_name" -const uint64_t OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_TID = 10017; // "__tenant_virtual_global_variable" -const uint64_t OB_TENANT_VIRTUAL_SHOW_TABLES_TID = 10018; // "__tenant_virtual_show_tables" -const uint64_t OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_TID = 10019; // "__tenant_virtual_show_create_procedure" -const uint64_t OB_ALL_VIRTUAL_CORE_META_TABLE_TID = 11001; // "__all_virtual_core_meta_table" -const uint64_t OB_ALL_VIRTUAL_ZONE_STAT_TID = 11002; // "__all_virtual_zone_stat" -const uint64_t OB_ALL_VIRTUAL_PLAN_CACHE_STAT_TID = 11003; // "__all_virtual_plan_cache_stat" -const uint64_t OB_ALL_VIRTUAL_PLAN_STAT_TID = 11004; // "__all_virtual_plan_stat" -const uint64_t OB_ALL_VIRTUAL_MEM_LEAK_CHECKER_INFO_TID = 11006; // "__all_virtual_mem_leak_checker_info" -const uint64_t OB_ALL_VIRTUAL_LATCH_TID = 11007; // "__all_virtual_latch" -const uint64_t OB_ALL_VIRTUAL_KVCACHE_INFO_TID = 11008; // "__all_virtual_kvcache_info" -const uint64_t OB_ALL_VIRTUAL_DATA_TYPE_CLASS_TID = 11009; // "__all_virtual_data_type_class" -const uint64_t OB_ALL_VIRTUAL_DATA_TYPE_TID = 11010; // "__all_virtual_data_type" -const uint64_t OB_ALL_VIRTUAL_SERVER_STAT_TID = 11011; // "__all_virtual_server_stat" -const uint64_t OB_ALL_VIRTUAL_REBALANCE_TASK_STAT_TID = 11012; // "__all_virtual_rebalance_task_stat" -const uint64_t OB_ALL_VIRTUAL_SESSION_EVENT_TID = 11013; // "__all_virtual_session_event" -const uint64_t OB_ALL_VIRTUAL_SESSION_WAIT_TID = 11014; // "__all_virtual_session_wait" -const uint64_t OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_TID = 11015; // "__all_virtual_session_wait_history" -const uint64_t OB_ALL_VIRTUAL_SYSTEM_EVENT_TID = 11017; // "__all_virtual_system_event" -const uint64_t OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_TID = 11018; // "__all_virtual_tenant_memstore_info" -const uint64_t OB_ALL_VIRTUAL_CONCURRENCY_OBJECT_POOL_TID = 11019; // "__all_virtual_concurrency_object_pool" -const uint64_t OB_ALL_VIRTUAL_SESSTAT_TID = 11020; // "__all_virtual_sesstat" -const uint64_t OB_ALL_VIRTUAL_SYSSTAT_TID = 11021; // "__all_virtual_sysstat" -const uint64_t OB_ALL_VIRTUAL_STORAGE_STAT_TID = 11022; // "__all_virtual_storage_stat" -const uint64_t OB_ALL_VIRTUAL_DISK_STAT_TID = 11023; // "__all_virtual_disk_stat" -const uint64_t OB_ALL_VIRTUAL_MEMSTORE_INFO_TID = 11024; // "__all_virtual_memstore_info" -const uint64_t OB_ALL_VIRTUAL_PARTITION_INFO_TID = 11025; // "__all_virtual_partition_info" -const uint64_t OB_ALL_VIRTUAL_UPGRADE_INSPECTION_TID = 11026; // "__all_virtual_upgrade_inspection" -const uint64_t OB_ALL_VIRTUAL_TRANS_STAT_TID = 11027; // "__all_virtual_trans_stat" -const uint64_t OB_ALL_VIRTUAL_TRANS_MGR_STAT_TID = 11028; // "__all_virtual_trans_mgr_stat" -const uint64_t OB_ALL_VIRTUAL_ELECTION_INFO_TID = 11029; // "__all_virtual_election_info" -const uint64_t OB_ALL_VIRTUAL_ELECTION_MEM_STAT_TID = 11030; // "__all_virtual_election_mem_stat" -const uint64_t OB_ALL_VIRTUAL_SQL_AUDIT_TID = 11031; // "__all_virtual_sql_audit" -const uint64_t OB_ALL_VIRTUAL_TRANS_MEM_STAT_TID = 11032; // "__all_virtual_trans_mem_stat" -const uint64_t OB_ALL_VIRTUAL_PARTITION_SSTABLE_IMAGE_INFO_TID = 11033; // "__all_virtual_partition_sstable_image_info" -const uint64_t OB_ALL_VIRTUAL_CORE_ROOT_TABLE_TID = 11034; // "__all_virtual_core_root_table" -const uint64_t OB_ALL_VIRTUAL_CORE_ALL_TABLE_TID = 11035; // "__all_virtual_core_all_table" -const uint64_t OB_ALL_VIRTUAL_CORE_COLUMN_TABLE_TID = 11036; // "__all_virtual_core_column_table" -const uint64_t OB_ALL_VIRTUAL_MEMORY_INFO_TID = 11037; // "__all_virtual_memory_info" -const uint64_t OB_ALL_VIRTUAL_TENANT_STAT_TID = 11038; // "__all_virtual_tenant_stat" -const uint64_t OB_ALL_VIRTUAL_SYS_PARAMETER_STAT_TID = 11039; // "__all_virtual_sys_parameter_stat" -const uint64_t OB_ALL_VIRTUAL_PARTITION_REPLAY_STATUS_TID = 11040; // "__all_virtual_partition_replay_status" -const uint64_t OB_ALL_VIRTUAL_CLOG_STAT_TID = 11041; // "__all_virtual_clog_stat" -const uint64_t OB_ALL_VIRTUAL_TRACE_LOG_TID = 11042; // "__all_virtual_trace_log" -const uint64_t OB_ALL_VIRTUAL_ENGINE_TID = 11043; // "__all_virtual_engine" -const uint64_t OB_ALL_VIRTUAL_PROXY_SERVER_STAT_TID = 11045; // "__all_virtual_proxy_server_stat" -const uint64_t OB_ALL_VIRTUAL_PROXY_SYS_VARIABLE_TID = 11046; // "__all_virtual_proxy_sys_variable" -const uint64_t OB_ALL_VIRTUAL_PROXY_SCHEMA_TID = 11047; // "__all_virtual_proxy_schema" -const uint64_t OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_TID = 11048; // "__all_virtual_plan_cache_plan_explain" -const uint64_t OB_ALL_VIRTUAL_OBRPC_STAT_TID = 11049; // "__all_virtual_obrpc_stat" -const uint64_t OB_ALL_VIRTUAL_PARTITION_SSTABLE_MERGE_INFO_TID = 11051; // "__all_virtual_partition_sstable_merge_info" -const uint64_t OB_ALL_VIRTUAL_SQL_MONITOR_TID = 11052; // "__all_virtual_sql_monitor" -const uint64_t OB_TENANT_VIRTUAL_OUTLINE_TID = 11053; // "__tenant_virtual_outline" -const uint64_t OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_TID = 11054; // "__tenant_virtual_concurrent_limit_sql" -const uint64_t OB_ALL_VIRTUAL_SQL_PLAN_STATISTICS_TID = 11055; // "__all_virtual_sql_plan_statistics" -const uint64_t OB_ALL_VIRTUAL_PARTITION_SSTABLE_MACRO_INFO_TID = 11056; // "__all_virtual_partition_sstable_macro_info" -const uint64_t OB_ALL_VIRTUAL_PROXY_PARTITION_INFO_TID = 11057; // "__all_virtual_proxy_partition_info" -const uint64_t OB_ALL_VIRTUAL_PROXY_PARTITION_TID = 11058; // "__all_virtual_proxy_partition" -const uint64_t OB_ALL_VIRTUAL_PROXY_SUB_PARTITION_TID = 11059; // "__all_virtual_proxy_sub_partition" -const uint64_t OB_ALL_VIRTUAL_PROXY_ROUTE_TID = 11060; // "__all_virtual_proxy_route" -const uint64_t OB_ALL_VIRTUAL_REBALANCE_TENANT_STAT_TID = 11061; // "__all_virtual_rebalance_tenant_stat" -const uint64_t OB_ALL_VIRTUAL_REBALANCE_UNIT_STAT_TID = 11062; // "__all_virtual_rebalance_unit_stat" -const uint64_t OB_ALL_VIRTUAL_REBALANCE_REPLICA_STAT_TID = 11063; // "__all_virtual_rebalance_replica_stat" -const uint64_t OB_ALL_VIRTUAL_PARTITION_AMPLIFICATION_STAT_TID = 11064; // "__all_virtual_partition_amplification_stat" -const uint64_t OB_ALL_VIRTUAL_ELECTION_EVENT_HISTORY_TID = 11067; // "__all_virtual_election_event_history" -const uint64_t OB_ALL_VIRTUAL_PARTITION_STORE_INFO_TID = 11068; // "__all_virtual_partition_store_info" -const uint64_t OB_ALL_VIRTUAL_LEADER_STAT_TID = 11069; // "__all_virtual_leader_stat" -const uint64_t OB_ALL_VIRTUAL_PARTITION_MIGRATION_STATUS_TID = 11070; // "__all_virtual_partition_migration_status" -const uint64_t OB_ALL_VIRTUAL_SYS_TASK_STATUS_TID = 11071; // "__all_virtual_sys_task_status" -const uint64_t OB_ALL_VIRTUAL_MACRO_BLOCK_MARKER_STATUS_TID = 11072; // "__all_virtual_macro_block_marker_status" -const uint64_t OB_ALL_VIRTUAL_SERVER_CLOG_STAT_TID = 11073; // "__all_virtual_server_clog_stat" -const uint64_t OB_ALL_VIRTUAL_ROOTSERVICE_STAT_TID = 11074; // "__all_virtual_rootservice_stat" -const uint64_t OB_ALL_VIRTUAL_ELECTION_PRIORITY_TID = 11075; // "__all_virtual_election_priority" -const uint64_t OB_ALL_VIRTUAL_TENANT_DISK_STAT_TID = 11076; // "__all_virtual_tenant_disk_stat" -const uint64_t OB_ALL_VIRTUAL_REBALANCE_MAP_STAT_TID = 11078; // "__all_virtual_rebalance_map_stat" -const uint64_t OB_ALL_VIRTUAL_REBALANCE_MAP_ITEM_STAT_TID = 11079; // "__all_virtual_rebalance_map_item_stat" -const uint64_t OB_ALL_VIRTUAL_IO_STAT_TID = 11080; // "__all_virtual_io_stat" -const uint64_t OB_ALL_VIRTUAL_LONG_OPS_STATUS_TID = 11081; // "__all_virtual_long_ops_status" -const uint64_t OB_ALL_VIRTUAL_REBALANCE_UNIT_MIGRATE_STAT_TID = 11082; // "__all_virtual_rebalance_unit_migrate_stat" -const uint64_t OB_ALL_VIRTUAL_REBALANCE_UNIT_DISTRIBUTION_STAT_TID = - 11083; // "__all_virtual_rebalance_unit_distribution_stat" -const uint64_t OB_ALL_VIRTUAL_SERVER_OBJECT_POOL_TID = 11084; // "__all_virtual_server_object_pool" -const uint64_t OB_ALL_VIRTUAL_TRANS_LOCK_STAT_TID = 11085; // "__all_virtual_trans_lock_stat" -const uint64_t OB_ALL_VIRTUAL_ELECTION_GROUP_INFO_TID = 11086; // "__all_virtual_election_group_info" -const uint64_t OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_TID = 11087; // "__tenant_virtual_show_create_tablegroup" -const uint64_t OB_ALL_VIRTUAL_SERVER_BLACKLIST_TID = 11088; // "__all_virtual_server_blacklist" -const uint64_t OB_ALL_VIRTUAL_PARTITION_SPLIT_INFO_TID = 11089; // "__all_virtual_partition_split_info" -const uint64_t OB_ALL_VIRTUAL_TRANS_RESULT_INFO_STAT_TID = 11090; // "__all_virtual_trans_result_info_stat" -const uint64_t OB_ALL_VIRTUAL_DUPLICATE_PARTITION_MGR_STAT_TID = 11091; // "__all_virtual_duplicate_partition_mgr_stat" -const uint64_t OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_TID = 11092; // "__all_virtual_tenant_parameter_stat" -const uint64_t OB_ALL_VIRTUAL_SERVER_SCHEMA_INFO_TID = 11093; // "__all_virtual_server_schema_info" -const uint64_t OB_ALL_VIRTUAL_MEMORY_CONTEXT_STAT_TID = 11094; // "__all_virtual_memory_context_stat" -const uint64_t OB_ALL_VIRTUAL_DUMP_TENANT_INFO_TID = 11095; // "__all_virtual_dump_tenant_info" -const uint64_t OB_ALL_VIRTUAL_TENANT_PARAMETER_INFO_TID = 11096; // "__all_virtual_tenant_parameter_info" -const uint64_t OB_ALL_VIRTUAL_DAG_WARNING_HISTORY_TID = 11099; // "__all_virtual_dag_warning_history" -const uint64_t OB_SESSION_VARIABLES_TID = 12001; // "SESSION_VARIABLES" -const uint64_t OB_TABLE_PRIVILEGES_TID = 12002; // "TABLE_PRIVILEGES" -const uint64_t OB_USER_PRIVILEGES_TID = 12003; // "USER_PRIVILEGES" -const uint64_t OB_SCHEMA_PRIVILEGES_TID = 12004; // "SCHEMA_PRIVILEGES" -const uint64_t OB_TABLE_CONSTRAINTS_TID = 12005; // "TABLE_CONSTRAINTS" -const uint64_t OB_GLOBAL_STATUS_TID = 12006; // "GLOBAL_STATUS" -const uint64_t OB_PARTITIONS_TID = 12007; // "PARTITIONS" -const uint64_t OB_SESSION_STATUS_TID = 12008; // "SESSION_STATUS" -const uint64_t OB_USER_TID = 12009; // "user" -const uint64_t OB_DB_TID = 12010; // "db" -const uint64_t OB_ALL_VIRTUAL_SERVER_MEMORY_INFO_TID = 12011; // "__all_virtual_server_memory_info" -const uint64_t OB_ALL_VIRTUAL_PARTITION_TABLE_TID = 12012; // "__all_virtual_partition_table" -const uint64_t OB_ALL_VIRTUAL_LOCK_WAIT_STAT_TID = 12013; // "__all_virtual_lock_wait_stat" -const uint64_t OB_ALL_VIRTUAL_PARTITION_ITEM_TID = 12014; // "__all_virtual_partition_item" -const uint64_t OB_ALL_VIRTUAL_REPLICA_TASK_TID = 12015; // "__all_virtual_replica_task" -const uint64_t OB_ALL_VIRTUAL_PARTITION_LOCATION_TID = 12016; // "__all_virtual_partition_location" -const uint64_t OB_PROC_TID = 12030; // "proc" -const uint64_t OB_TENANT_VIRTUAL_COLLATION_TID = 12031; // "__tenant_virtual_collation" -const uint64_t OB_TENANT_VIRTUAL_CHARSET_TID = 12032; // "__tenant_virtual_charset" -const uint64_t OB_ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_TID = - 12033; // "__all_virtual_tenant_memstore_allocator_info" -const uint64_t OB_ALL_VIRTUAL_TABLE_MGR_TID = 12034; // "__all_virtual_table_mgr" -const uint64_t OB_ALL_VIRTUAL_META_TABLE_TID = 12035; // "__all_virtual_meta_table" -const uint64_t OB_ALL_VIRTUAL_FREEZE_INFO_TID = 12036; // "__all_virtual_freeze_info" -const uint64_t OB_PARAMETERS_TID = 12037; // "PARAMETERS" -const uint64_t OB_ALL_VIRTUAL_BAD_BLOCK_TABLE_TID = 12038; // "__all_virtual_bad_block_table" -const uint64_t OB_ALL_VIRTUAL_PX_WORKER_STAT_TID = 12039; // "__all_virtual_px_worker_stat" -const uint64_t OB_ALL_VIRTUAL_TRANS_AUDIT_TID = 12040; // "__all_virtual_trans_audit" -const uint64_t OB_ALL_VIRTUAL_TRANS_SQL_AUDIT_TID = 12041; // "__all_virtual_trans_sql_audit" -const uint64_t OB_ALL_VIRTUAL_WEAK_READ_STAT_TID = 12042; // "__all_virtual_weak_read_stat" -const uint64_t OB_ALL_VIRTUAL_PARTITION_AUDIT_TID = 12054; // "__all_virtual_partition_audit" -const uint64_t OB_ALL_VIRTUAL_SEQUENCE_V2_TID = 12055; // "__all_virtual_sequence_v2" -const uint64_t OB_ALL_VIRTUAL_SEQUENCE_VALUE_TID = 12056; // "__all_virtual_sequence_value" -const uint64_t OB_ALL_VIRTUAL_CLUSTER_TID = 12057; // "__all_virtual_cluster" -const uint64_t OB_ALL_VIRTUAL_PARTITION_TABLE_STORE_STAT_TID = 12058; // "__all_virtual_partition_table_store_stat" -const uint64_t OB_ALL_VIRTUAL_DDL_OPERATION_TID = 12059; // "__all_virtual_ddl_operation" -const uint64_t OB_ALL_VIRTUAL_OUTLINE_TID = 12060; // "__all_virtual_outline" -const uint64_t OB_ALL_VIRTUAL_OUTLINE_HISTORY_TID = 12061; // "__all_virtual_outline_history" -const uint64_t OB_ALL_VIRTUAL_SYNONYM_TID = 12062; // "__all_virtual_synonym" -const uint64_t OB_ALL_VIRTUAL_SYNONYM_HISTORY_TID = 12063; // "__all_virtual_synonym_history" -const uint64_t OB_ALL_VIRTUAL_DATABASE_PRIVILEGE_TID = 12064; // "__all_virtual_database_privilege" -const uint64_t OB_ALL_VIRTUAL_DATABASE_PRIVILEGE_HISTORY_TID = 12065; // "__all_virtual_database_privilege_history" -const uint64_t OB_ALL_VIRTUAL_TABLE_PRIVILEGE_TID = 12066; // "__all_virtual_table_privilege" -const uint64_t OB_ALL_VIRTUAL_TABLE_PRIVILEGE_HISTORY_TID = 12067; // "__all_virtual_table_privilege_history" -const uint64_t OB_ALL_VIRTUAL_DATABASE_TID = 12068; // "__all_virtual_database" -const uint64_t OB_ALL_VIRTUAL_DATABASE_HISTORY_TID = 12069; // "__all_virtual_database_history" -const uint64_t OB_ALL_VIRTUAL_TABLEGROUP_TID = 12070; // "__all_virtual_tablegroup" -const uint64_t OB_ALL_VIRTUAL_TABLEGROUP_HISTORY_TID = 12071; // "__all_virtual_tablegroup_history" -const uint64_t OB_ALL_VIRTUAL_TABLE_TID = 12072; // "__all_virtual_table" -const uint64_t OB_ALL_VIRTUAL_TABLE_HISTORY_TID = 12073; // "__all_virtual_table_history" -const uint64_t OB_ALL_VIRTUAL_COLUMN_TID = 12074; // "__all_virtual_column" -const uint64_t OB_ALL_VIRTUAL_COLUMN_HISTORY_TID = 12075; // "__all_virtual_column_history" -const uint64_t OB_ALL_VIRTUAL_PART_TID = 12076; // "__all_virtual_part" -const uint64_t OB_ALL_VIRTUAL_PART_HISTORY_TID = 12077; // "__all_virtual_part_history" -const uint64_t OB_ALL_VIRTUAL_PART_INFO_TID = 12078; // "__all_virtual_part_info" -const uint64_t OB_ALL_VIRTUAL_PART_INFO_HISTORY_TID = 12079; // "__all_virtual_part_info_history" -const uint64_t OB_ALL_VIRTUAL_DEF_SUB_PART_TID = 12080; // "__all_virtual_def_sub_part" -const uint64_t OB_ALL_VIRTUAL_DEF_SUB_PART_HISTORY_TID = 12081; // "__all_virtual_def_sub_part_history" -const uint64_t OB_ALL_VIRTUAL_SUB_PART_TID = 12082; // "__all_virtual_sub_part" -const uint64_t OB_ALL_VIRTUAL_SUB_PART_HISTORY_TID = 12083; // "__all_virtual_sub_part_history" -const uint64_t OB_ALL_VIRTUAL_CONSTRAINT_TID = 12084; // "__all_virtual_constraint" -const uint64_t OB_ALL_VIRTUAL_CONSTRAINT_HISTORY_TID = 12085; // "__all_virtual_constraint_history" -const uint64_t OB_ALL_VIRTUAL_FOREIGN_KEY_TID = 12086; // "__all_virtual_foreign_key" -const uint64_t OB_ALL_VIRTUAL_FOREIGN_KEY_HISTORY_TID = 12087; // "__all_virtual_foreign_key_history" -const uint64_t OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_TID = 12088; // "__all_virtual_foreign_key_column" -const uint64_t OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_HISTORY_TID = 12089; // "__all_virtual_foreign_key_column_history" -const uint64_t OB_ALL_VIRTUAL_TEMP_TABLE_TID = 12090; // "__all_virtual_temp_table" -const uint64_t OB_ALL_VIRTUAL_ORI_SCHEMA_VERSION_TID = 12091; // "__all_virtual_ori_schema_version" -const uint64_t OB_ALL_VIRTUAL_SYS_STAT_TID = 12092; // "__all_virtual_sys_stat" -const uint64_t OB_ALL_VIRTUAL_USER_TID = 12093; // "__all_virtual_user" -const uint64_t OB_ALL_VIRTUAL_USER_HISTORY_TID = 12094; // "__all_virtual_user_history" -const uint64_t OB_ALL_VIRTUAL_SYS_VARIABLE_TID = 12095; // "__all_virtual_sys_variable" -const uint64_t OB_ALL_VIRTUAL_SYS_VARIABLE_HISTORY_TID = 12096; // "__all_virtual_sys_variable_history" -const uint64_t OB_ALL_VIRTUAL_FUNC_TID = 12097; // "__all_virtual_func" -const uint64_t OB_ALL_VIRTUAL_FUNC_HISTORY_TID = 12098; // "__all_virtual_func_history" -const uint64_t OB_ALL_VIRTUAL_PACKAGE_TID = 12099; // "__all_virtual_package" -const uint64_t OB_ALL_VIRTUAL_PACKAGE_HISTORY_TID = 12100; // "__all_virtual_package_history" -const uint64_t OB_ALL_VIRTUAL_ROUTINE_TID = 12101; // "__all_virtual_routine" -const uint64_t OB_ALL_VIRTUAL_ROUTINE_HISTORY_TID = 12102; // "__all_virtual_routine_history" -const uint64_t OB_ALL_VIRTUAL_ROUTINE_PARAM_TID = 12103; // "__all_virtual_routine_param" -const uint64_t OB_ALL_VIRTUAL_ROUTINE_PARAM_HISTORY_TID = 12104; // "__all_virtual_routine_param_history" -const uint64_t OB_ALL_VIRTUAL_TYPE_TID = 12105; // "__all_virtual_type" -const uint64_t OB_ALL_VIRTUAL_TYPE_HISTORY_TID = 12106; // "__all_virtual_type_history" -const uint64_t OB_ALL_VIRTUAL_TYPE_ATTR_TID = 12107; // "__all_virtual_type_attr" -const uint64_t OB_ALL_VIRTUAL_TYPE_ATTR_HISTORY_TID = 12108; // "__all_virtual_type_attr_history" -const uint64_t OB_ALL_VIRTUAL_COLL_TYPE_TID = 12109; // "__all_virtual_coll_type" -const uint64_t OB_ALL_VIRTUAL_COLL_TYPE_HISTORY_TID = 12110; // "__all_virtual_coll_type_history" -const uint64_t OB_ALL_VIRTUAL_COLUMN_STAT_TID = 12111; // "__all_virtual_column_stat" -const uint64_t OB_ALL_VIRTUAL_TABLE_STAT_TID = 12112; // "__all_virtual_table_stat" -const uint64_t OB_ALL_VIRTUAL_HISTOGRAM_STAT_TID = 12113; // "__all_virtual_histogram_stat" -const uint64_t OB_ALL_VIRTUAL_COLUMN_STATISTIC_TID = 12114; // "__all_virtual_column_statistic" -const uint64_t OB_ALL_VIRTUAL_RECYCLEBIN_TID = 12115; // "__all_virtual_recyclebin" -const uint64_t OB_ALL_VIRTUAL_TENANT_GC_PARTITION_INFO_TID = 12116; // "__all_virtual_tenant_gc_partition_info" -const uint64_t OB_ALL_VIRTUAL_TENANT_PLAN_BASELINE_TID = 12117; // "__all_virtual_tenant_plan_baseline" -const uint64_t OB_ALL_VIRTUAL_TENANT_PLAN_BASELINE_HISTORY_TID = 12118; // "__all_virtual_tenant_plan_baseline_history" -const uint64_t OB_ALL_VIRTUAL_SEQUENCE_OBJECT_TID = 12119; // "__all_virtual_sequence_object" -const uint64_t OB_ALL_VIRTUAL_SEQUENCE_OBJECT_HISTORY_TID = 12120; // "__all_virtual_sequence_object_history" -const uint64_t OB_ALL_VIRTUAL_RAID_STAT_TID = 12121; // "__all_virtual_raid_stat" -const uint64_t OB_ALL_VIRTUAL_SERVER_LOG_META_TID = 12122; // "__all_virtual_server_log_meta" -const uint64_t OB_ALL_VIRTUAL_DTL_CHANNEL_TID = 12123; // "__all_virtual_dtl_channel" -const uint64_t OB_ALL_VIRTUAL_DTL_MEMORY_TID = 12124; // "__all_virtual_dtl_memory" -const uint64_t OB_ALL_VIRTUAL_DTL_FIRST_CACHED_BUFFER_TID = 12125; // "__all_virtual_dtl_first_cached_buffer" -const uint64_t OB_ALL_VIRTUAL_DBLINK_TID = 12126; // "__all_virtual_dblink" -const uint64_t OB_ALL_VIRTUAL_DBLINK_HISTORY_TID = 12127; // "__all_virtual_dblink_history" -const uint64_t OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_TID = 12128; // "__all_virtual_tenant_partition_meta_table" -const uint64_t OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_TID = 12129; // "__all_virtual_tenant_role_grantee_map" -const uint64_t OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_HISTORY_TID = - 12130; // "__all_virtual_tenant_role_grantee_map_history" -const uint64_t OB_ALL_VIRTUAL_TENANT_KEYSTORE_TID = 12131; // "__all_virtual_tenant_keystore" -const uint64_t OB_ALL_VIRTUAL_TENANT_KEYSTORE_HISTORY_TID = 12132; // "__all_virtual_tenant_keystore_history" -const uint64_t OB_ALL_VIRTUAL_DEADLOCK_STAT_TID = 12141; // "__all_virtual_deadlock_stat" -const uint64_t OB_ALL_VIRTUAL_TENANT_TABLESPACE_TID = 12142; // "__all_virtual_tenant_tablespace" -const uint64_t OB_ALL_VIRTUAL_TENANT_TABLESPACE_HISTORY_TID = 12143; // "__all_virtual_tenant_tablespace_history" -const uint64_t OB_ALL_VIRTUAL_INFORMATION_COLUMNS_TID = 12144; // "__ALL_VIRTUAL_INFORMATION_COLUMNS" -const uint64_t OB_ALL_VIRTUAL_PG_PARTITION_INFO_TID = 12145; // "__all_virtual_pg_partition_info" -const uint64_t OB_ALL_VIRTUAL_TENANT_USER_FAILED_LOGIN_STAT_TID = - 12146; // "__all_virtual_tenant_user_failed_login_stat" -const uint64_t OB_ALL_VIRTUAL_TENANT_PROFILE_TID = 12147; // "__all_virtual_tenant_profile" -const uint64_t OB_ALL_VIRTUAL_TENANT_PROFILE_HISTORY_TID = 12148; // "__all_virtual_tenant_profile_history" -const uint64_t OB_ALL_VIRTUAL_SECURITY_AUDIT_TID = 12149; // "__all_virtual_security_audit" -const uint64_t OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_TID = 12150; // "__all_virtual_security_audit_history" -const uint64_t OB_ALL_VIRTUAL_TRIGGER_TID = 12151; // "__all_virtual_trigger" -const uint64_t OB_ALL_VIRTUAL_TRIGGER_HISTORY_TID = 12152; // "__all_virtual_trigger_history" -const uint64_t OB_ALL_VIRTUAL_CLUSTER_STATS_TID = 12153; // "__all_virtual_cluster_stats" -const uint64_t OB_ALL_VIRTUAL_SSTABLE_COLUMN_CHECKSUM_TID = 12154; // "__all_virtual_sstable_column_checksum" -const uint64_t OB_ALL_VIRTUAL_PS_STAT_TID = 12155; // "__all_virtual_ps_stat" -const uint64_t OB_ALL_VIRTUAL_PS_ITEM_INFO_TID = 12156; // "__all_virtual_ps_item_info" -const uint64_t OB_ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_TID = 12158; // "__all_virtual_sql_workarea_history_stat" -const uint64_t OB_ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_TID = 12159; // "__all_virtual_sql_workarea_active" -const uint64_t OB_ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_TID = 12160; // "__all_virtual_sql_workarea_histogram" -const uint64_t OB_ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_TID = 12161; // "__all_virtual_sql_workarea_memory_info" -const uint64_t OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_TID = 12162; // "__all_virtual_security_audit_record" -const uint64_t OB_ALL_VIRTUAL_SYSAUTH_TID = 12163; // "__all_virtual_sysauth" -const uint64_t OB_ALL_VIRTUAL_SYSAUTH_HISTORY_TID = 12164; // "__all_virtual_sysauth_history" -const uint64_t OB_ALL_VIRTUAL_OBJAUTH_TID = 12165; // "__all_virtual_objauth" -const uint64_t OB_ALL_VIRTUAL_OBJAUTH_HISTORY_TID = 12166; // "__all_virtual_objauth_history" -const uint64_t OB_ALL_VIRTUAL_BACKUP_INFO_TID = 12167; // "__all_virtual_backup_info" -const uint64_t OB_ALL_VIRTUAL_BACKUP_LOG_ARCHIVE_STATUS_TID = 12168; // "__all_virtual_backup_log_archive_status" -const uint64_t OB_ALL_VIRTUAL_BACKUP_TASK_TID = 12170; // "__all_virtual_backup_task" -const uint64_t OB_ALL_VIRTUAL_PG_BACKUP_TASK_TID = 12171; // "__all_virtual_pg_backup_task" -const uint64_t OB_ALL_VIRTUAL_PG_BACKUP_LOG_ARCHIVE_STATUS_TID = 12173; // "__all_virtual_pg_backup_log_archive_status" -const uint64_t OB_ALL_VIRTUAL_SERVER_BACKUP_LOG_ARCHIVE_STATUS_TID = - 12174; // "__all_virtual_server_backup_log_archive_status" -const uint64_t OB_ALL_VIRTUAL_ERROR_TID = 12175; // "__all_virtual_error" -const uint64_t OB_ALL_VIRTUAL_TIMESTAMP_SERVICE_TID = 12176; // "__all_virtual_timestamp_service" -const uint64_t OB_REFERENTIAL_CONSTRAINTS_TID = 12177; // "REFERENTIAL_CONSTRAINTS" -const uint64_t OB_ALL_VIRTUAL_TABLE_MODIFICATIONS_TID = 12179; // "__all_virtual_table_modifications" -const uint64_t OB_ALL_VIRTUAL_BACKUP_CLEAN_INFO_TID = 12180; // "__all_virtual_backup_clean_info" -const uint64_t OB_ALL_VIRTUAL_RESTORE_PG_INFO_TID = 12181; // "__all_virtual_restore_pg_info" -const uint64_t OB_ALL_VIRTUAL_OBJECT_TYPE_TID = 12182; // "__all_virtual_object_type" -const uint64_t OB_ALL_VIRTUAL_TRANS_TABLE_STATUS_TID = 12183; // "__all_virtual_trans_table_status" -const uint64_t OB_ALL_VIRTUAL_PG_LOG_ARCHIVE_STAT_TID = 12184; // "__all_virtual_pg_log_archive_stat" -const uint64_t OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_TID = 12185; // "__all_virtual_sql_plan_monitor" -const uint64_t OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_TID = 12186; // "__all_virtual_sql_monitor_statname" -const uint64_t OB_ALL_VIRTUAL_OPEN_CURSOR_TID = 12187; // "__all_virtual_open_cursor" -const uint64_t OB_ALL_VIRTUAL_BACKUP_VALIDATION_TASK_TID = 12188; // "__all_virtual_backup_validation_task" -const uint64_t OB_ALL_VIRTUAL_PG_BACKUP_VALIDATION_TASK_TID = 12189; // "__all_virtual_pg_backup_validation_task" -const uint64_t OB_ALL_VIRTUAL_TIME_ZONE_TID = 12190; // "__all_virtual_time_zone" -const uint64_t OB_ALL_VIRTUAL_TIME_ZONE_NAME_TID = 12191; // "__all_virtual_time_zone_name" -const uint64_t OB_ALL_VIRTUAL_TIME_ZONE_TRANSITION_TID = 12192; // "__all_virtual_time_zone_transition" -const uint64_t OB_ALL_VIRTUAL_TIME_ZONE_TRANSITION_TYPE_TID = 12193; // "__all_virtual_time_zone_transition_type" -const uint64_t OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_TID = 12194; // "__all_virtual_constraint_column" -const uint64_t OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_HISTORY_TID = 12195; // "__all_virtual_constraint_column_history" -const uint64_t OB_ALL_VIRTUAL_FILES_TID = 12196; // "__all_virtual_files" -const uint64_t OB_FILES_TID = 12197; // "FILES" -const uint64_t OB_ALL_VIRTUAL_DEPENDENCY_TID = 12198; // "__all_virtual_dependency" -const uint64_t OB_TENANT_VIRTUAL_OBJECT_DEFINITION_TID = 12199; // "__tenant_virtual_object_definition" -const uint64_t OB_ALL_VIRTUAL_RESERVED_TABLE_MGR_TID = 12200; // "__all_virtual_reserved_table_mgr" -const uint64_t OB_ALL_VIRTUAL_BACKUPSET_HISTORY_MGR_TID = 12201; // "__all_virtual_backupset_history_mgr" -const uint64_t OB_ALL_VIRTUAL_BACKUP_BACKUPSET_TASK_TID = 12202; // "__all_virtual_backup_backupset_task" -const uint64_t OB_ALL_VIRTUAL_PG_BACKUP_BACKUPSET_TASK_TID = 12203; // "__all_virtual_pg_backup_backupset_task" -const uint64_t OB_ALL_VIRTUAL_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TID = - 12204; // "__all_virtual_backup_backup_log_archive_status" -const uint64_t OB_ALL_VIRTUAL_GLOBAL_TRANSACTION_TID = 12206; // "__all_virtual_global_transaction" -const uint64_t OB_ALL_VIRTUAL_TABLE_AGENT_TID = 15001; // "ALL_VIRTUAL_TABLE_AGENT" -const uint64_t OB_ALL_VIRTUAL_COLUMN_AGENT_TID = 15002; // "ALL_VIRTUAL_COLUMN_AGENT" -const uint64_t OB_ALL_VIRTUAL_DATABASE_AGENT_TID = 15003; // "ALL_VIRTUAL_DATABASE_AGENT" -const uint64_t OB_ALL_VIRTUAL_SEQUENCE_V2_AGENT_TID = 15004; // "ALL_VIRTUAL_SEQUENCE_V2_AGENT" -const uint64_t OB_ALL_VIRTUAL_PART_AGENT_TID = 15005; // "ALL_VIRTUAL_PART_AGENT" -const uint64_t OB_ALL_VIRTUAL_SUB_PART_AGENT_TID = 15006; // "ALL_VIRTUAL_SUB_PART_AGENT" -const uint64_t OB_ALL_VIRTUAL_PACKAGE_AGENT_TID = 15007; // "ALL_VIRTUAL_PACKAGE_AGENT" -const uint64_t OB_ALL_VIRTUAL_TENANT_META_TABLE_AGENT_TID = 15008; // "ALL_VIRTUAL_TENANT_META_TABLE_AGENT" -const uint64_t OB_ALL_VIRTUAL_SQL_AUDIT_ORA_TID = 15009; // "ALL_VIRTUAL_SQL_AUDIT_ORA" -const uint64_t OB_ALL_VIRTUAL_PLAN_STAT_ORA_TID = 15010; // "ALL_VIRTUAL_PLAN_STAT_ORA" -const uint64_t OB_ALL_VIRTUAL_SQL_PLAN_STATISTICS_AGENT_TID = 15011; // "ALL_VIRTUAL_SQL_PLAN_STATISTICS_AGENT" -const uint64_t OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_ORA_TID = 15012; // "ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_ORA" -const uint64_t OB_ALL_VIRTUAL_SEQUENCE_VALUE_AGENT_TID = 15013; // "ALL_VIRTUAL_SEQUENCE_VALUE_AGENT" -const uint64_t OB_ALL_VIRTUAL_SEQUENCE_OBJECT_AGENT_TID = 15014; // "ALL_VIRTUAL_SEQUENCE_OBJECT_AGENT" -const uint64_t OB_ALL_VIRTUAL_USER_AGENT_TID = 15015; // "ALL_VIRTUAL_USER_AGENT" -const uint64_t OB_ALL_VIRTUAL_SYNONYM_AGENT_TID = 15016; // "ALL_VIRTUAL_SYNONYM_AGENT" -const uint64_t OB_ALL_VIRTUAL_FOREIGN_KEY_AGENT_TID = 15017; // "ALL_VIRTUAL_FOREIGN_KEY_AGENT" -const uint64_t OB_ALL_VIRTUAL_COLUMN_STAT_AGENT_TID = 15018; // "ALL_VIRTUAL_COLUMN_STAT_AGENT" -const uint64_t OB_ALL_VIRTUAL_COLUMN_STATISTIC_AGENT_TID = 15019; // "ALL_VIRTUAL_COLUMN_STATISTIC_AGENT" -const uint64_t OB_ALL_VIRTUAL_PARTITION_TABLE_AGENT_TID = 15020; // "ALL_VIRTUAL_PARTITION_TABLE_AGENT" -const uint64_t OB_ALL_VIRTUAL_TABLE_STAT_AGENT_TID = 15021; // "ALL_VIRTUAL_TABLE_STAT_AGENT" -const uint64_t OB_ALL_VIRTUAL_RECYCLEBIN_AGENT_TID = 15022; // "ALL_VIRTUAL_RECYCLEBIN_AGENT" -const uint64_t OB_TENANT_VIRTUAL_OUTLINE_AGENT_TID = 15023; // "TENANT_VIRTUAL_OUTLINE_AGENT" -const uint64_t OB_ALL_VIRTUAL_ROUTINE_AGENT_TID = 15024; // "ALL_VIRTUAL_ROUTINE_AGENT" -const uint64_t OB_ALL_VIRTUAL_TABLEGROUP_AGENT_TID = 15025; // "ALL_VIRTUAL_TABLEGROUP_AGENT" -const uint64_t OB_ALL_VIRTUAL_PRIVILEGE_AGENT_TID = 15026; // "ALL_VIRTUAL_PRIVILEGE_AGENT" -const uint64_t OB_ALL_VIRTUAL_SYS_PARAMETER_STAT_AGENT_TID = 15027; // "ALL_VIRTUAL_SYS_PARAMETER_STAT_AGENT" -const uint64_t OB_TENANT_VIRTUAL_TABLE_INDEX_AGENT_TID = 15028; // "TENANT_VIRTUAL_TABLE_INDEX_AGENT" -const uint64_t OB_TENANT_VIRTUAL_CHARSET_AGENT_TID = 15029; // "TENANT_VIRTUAL_CHARSET_AGENT" -const uint64_t OB_TENANT_VIRTUAL_ALL_TABLE_AGENT_TID = 15030; // "TENANT_VIRTUAL_ALL_TABLE_AGENT" -const uint64_t OB_TENANT_VIRTUAL_COLLATION_AGENT_TID = 15031; // "TENANT_VIRTUAL_COLLATION_AGENT" -const uint64_t OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_AGENT_TID = 15032; // "ALL_VIRTUAL_FOREIGN_KEY_COLUMN_AGENT" -const uint64_t OB_ALL_VIRTUAL_SERVER_AGENT_TID = 15033; // "ALL_VIRTUAL_SERVER_AGENT" -const uint64_t OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_TID = 15034; // "ALL_VIRTUAL_PLAN_CACHE_STAT_ORA" -const uint64_t OB_ALL_VIRTUAL_PROCESSLIST_ORA_TID = 15035; // "ALL_VIRTUAL_PROCESSLIST_ORA" -const uint64_t OB_ALL_VIRTUAL_SESSION_WAIT_ORA_TID = 15036; // "ALL_VIRTUAL_SESSION_WAIT_ORA" -const uint64_t OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_TID = 15037; // "ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA" -const uint64_t OB_ALL_VIRTUAL_MEMORY_INFO_ORA_TID = 15038; // "ALL_VIRTUAL_MEMORY_INFO_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_ORA_TID = 15039; // "ALL_VIRTUAL_TENANT_MEMSTORE_INFO_ORA" -const uint64_t OB_ALL_VIRTUAL_MEMSTORE_INFO_ORA_TID = 15040; // "ALL_VIRTUAL_MEMSTORE_INFO_ORA" -const uint64_t OB_ALL_VIRTUAL_SERVER_MEMORY_INFO_AGENT_TID = 15041; // "ALL_VIRTUAL_SERVER_MEMORY_INFO_AGENT" -const uint64_t OB_ALL_VIRTUAL_SESSTAT_ORA_TID = 15042; // "ALL_VIRTUAL_SESSTAT_ORA" -const uint64_t OB_ALL_VIRTUAL_SYSSTAT_ORA_TID = 15043; // "ALL_VIRTUAL_SYSSTAT_ORA" -const uint64_t OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_TID = 15044; // "ALL_VIRTUAL_SYSTEM_EVENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_AGENT_TID = - 15045; // "ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_AGENT" -const uint64_t OB_TENANT_VIRTUAL_SESSION_VARIABLE_ORA_TID = 15046; // "TENANT_VIRTUAL_SESSION_VARIABLE_ORA" -const uint64_t OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_ORA_TID = 15047; // "TENANT_VIRTUAL_GLOBAL_VARIABLE_ORA" -const uint64_t OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_ORA_TID = 15048; // "TENANT_VIRTUAL_SHOW_CREATE_TABLE_ORA" -const uint64_t OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_ORA_TID = 15049; // "TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_ORA" -const uint64_t OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_ORA_TID = 15050; // "TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_ORA" -const uint64_t OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_ORA_TID = 15051; // "TENANT_VIRTUAL_PRIVILEGE_GRANT_ORA" -const uint64_t OB_TENANT_VIRTUAL_TABLE_COLUMN_ORA_TID = 15052; // "TENANT_VIRTUAL_TABLE_COLUMN_ORA" -const uint64_t OB_ALL_VIRTUAL_TRACE_LOG_ORA_TID = 15053; // "ALL_VIRTUAL_TRACE_LOG_ORA" -const uint64_t OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_AGENT_TID = 15054; // "TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_AGENT" -const uint64_t OB_ALL_VIRTUAL_CONSTRAINT_AGENT_TID = 15055; // "ALL_VIRTUAL_CONSTRAINT_AGENT" -const uint64_t OB_ALL_VIRTUAL_TYPE_AGENT_TID = 15056; // "ALL_VIRTUAL_TYPE_AGENT" -const uint64_t OB_ALL_VIRTUAL_TYPE_ATTR_AGENT_TID = 15057; // "ALL_VIRTUAL_TYPE_ATTR_AGENT" -const uint64_t OB_ALL_VIRTUAL_COLL_TYPE_AGENT_TID = 15058; // "ALL_VIRTUAL_COLL_TYPE_AGENT" -const uint64_t OB_ALL_VIRTUAL_ROUTINE_PARAM_AGENT_TID = 15059; // "ALL_VIRTUAL_ROUTINE_PARAM_AGENT" -const uint64_t OB_ALL_VIRTUAL_DATA_TYPE_ORA_TID = 15060; // "ALL_VIRTUAL_DATA_TYPE_ORA" -const uint64_t OB_ALL_VIRTUAL_TABLE_SYS_AGENT_TID = 15062; // "ALL_VIRTUAL_TABLE_SYS_AGENT" -const uint64_t OB_ALL_VIRTUAL_SSTABLE_CHECKSUM_AGENT_TID = 15063; // "ALL_VIRTUAL_SSTABLE_CHECKSUM_AGENT" -const uint64_t OB_ALL_VIRTUAL_PARTITION_INFO_AGENT_TID = 15064; // "ALL_VIRTUAL_PARTITION_INFO_AGENT" -const uint64_t OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_AGENT_TID = - 15065; // "ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_AGENT" -const uint64_t OB_ALL_VIRTUAL_TENANT_KEYSTORE_AGENT_TID = 15066; // "ALL_VIRTUAL_TENANT_KEYSTORE_AGENT" -const uint64_t OB_ALL_VIRTUAL_TENANT_TABLESPACE_AGENT_TID = 15071; // "ALL_VIRTUAL_TENANT_TABLESPACE_AGENT" -const uint64_t OB_ALL_VIRTUAL_TENANT_PROFILE_AGENT_TID = 15072; // "ALL_VIRTUAL_TENANT_PROFILE_AGENT" -const uint64_t OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT_TID = 15073; // "ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT" -const uint64_t OB_ALL_VIRTUAL_TABLE_PRIVILEGE_AGENT_TID = 15074; // "ALL_VIRTUAL_TABLE_PRIVILEGE_AGENT" -const uint64_t OB_ALL_VIRTUAL_SECURITY_AUDIT_AGENT_TID = 15075; // "ALL_VIRTUAL_SECURITY_AUDIT_AGENT" -const uint64_t OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_AGENT_TID = 15076; // "ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_AGENT" -const uint64_t OB_ALL_VIRTUAL_TRIGGER_AGENT_TID = 15079; // "ALL_VIRTUAL_TRIGGER_AGENT" -const uint64_t OB_ALL_VIRTUAL_PX_WORKER_STAT_ORA_TID = 15080; // "ALL_VIRTUAL_PX_WORKER_STAT_ORA" -const uint64_t OB_ALL_VIRTUAL_PS_STAT_ORA_TID = 15081; // "ALL_VIRTUAL_PS_STAT_ORA" -const uint64_t OB_ALL_VIRTUAL_PS_ITEM_INFO_ORA_TID = 15082; // "ALL_VIRTUAL_PS_ITEM_INFO_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_ORA_TID = 15083; // "ALL_VIRTUAL_TENANT_PARAMETER_STAT_ORA" -const uint64_t OB_ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT_TID = - 15084; // "ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT" -const uint64_t OB_ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT_TID = 15085; // "ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT" -const uint64_t OB_ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT_TID = 15086; // "ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT" -const uint64_t OB_ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT_TID = - 15087; // "ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT" -const uint64_t OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_AGENT_TID = 15088; // "ALL_VIRTUAL_SECURITY_AUDIT_RECORD_AGENT" -const uint64_t OB_ALL_VIRTUAL_SYSAUTH_AGENT_TID = 15089; // "ALL_VIRTUAL_SYSAUTH_AGENT" -const uint64_t OB_ALL_VIRTUAL_SYSAUTH_HISTORY_AGENT_TID = 15090; // "ALL_VIRTUAL_SYSAUTH_HISTORY_AGENT" -const uint64_t OB_ALL_VIRTUAL_OBJAUTH_AGENT_TID = 15091; // "ALL_VIRTUAL_OBJAUTH_AGENT" -const uint64_t OB_ALL_VIRTUAL_OBJAUTH_HISTORY_AGENT_TID = 15092; // "ALL_VIRTUAL_OBJAUTH_HISTORY_AGENT" -const uint64_t OB_ALL_VIRTUAL_ERROR_AGENT_TID = 15093; // "ALL_VIRTUAL_ERROR_AGENT" -const uint64_t OB_ALL_VIRTUAL_TABLE_MGR_AGENT_TID = 15094; // "ALL_VIRTUAL_TABLE_MGR_AGENT" -const uint64_t OB_ALL_VIRTUAL_DEF_SUB_PART_AGENT_TID = 15095; // "ALL_VIRTUAL_DEF_SUB_PART_AGENT" -const uint64_t OB_ALL_VIRTUAL_OBJECT_TYPE_AGENT_TID = 15096; // "ALL_VIRTUAL_OBJECT_TYPE_AGENT" -const uint64_t OB_ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT_TID = 15097; // "ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT" -const uint64_t OB_ALL_VIRTUAL_DBLINK_AGENT_TID = 15098; // "ALL_VIRTUAL_DBLINK_AGENT" -const uint64_t OB_ALL_VIRTUAL_DBLINK_HISTORY_AGENT_TID = 15099; // "ALL_VIRTUAL_DBLINK_HISTORY_AGENT" -const uint64_t OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_TID = 15100; // "ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA" -const uint64_t OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_ORA_TID = 15101; // "ALL_VIRTUAL_SQL_MONITOR_STATNAME_ORA" -const uint64_t OB_ALL_VIRTUAL_LOCK_WAIT_STAT_ORA_TID = 15102; // "ALL_VIRTUAL_LOCK_WAIT_STAT_ORA" -const uint64_t OB_ALL_VIRTUAL_OPEN_CURSOR_ORA_TID = 15103; // "ALL_VIRTUAL_OPEN_CURSOR_ORA" -const uint64_t OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_AGENT_TID = 15104; // "ALL_VIRTUAL_CONSTRAINT_COLUMN_AGENT" -const uint64_t OB_ALL_VIRTUAL_DEPENDENCY_AGENT_TID = 15105; // "ALL_VIRTUAL_DEPENDENCY_AGENT" -const uint64_t OB_ALL_VIRTUAL_TENANT_TIME_ZONE_AGENT_TID = 15106; // "ALL_VIRTUAL_TENANT_TIME_ZONE_AGENT" -const uint64_t OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_AGENT_TID = 15107; // "ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_AGENT" -const uint64_t OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_AGENT_TID = - 15108; // "ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_AGENT" -const uint64_t OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_AGENT_TID = - 15109; // "ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_AGENT" -const uint64_t OB_TENANT_VIRTUAL_OBJECT_DEFINITION_ORA_TID = 15110; // "TENANT_VIRTUAL_OBJECT_DEFINITION_ORA" -const uint64_t OB_ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT_TID = 15111; // "ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT" -const uint64_t OB_ALL_VIRTUAL_TYPE_SYS_AGENT_TID = 15112; // "ALL_VIRTUAL_TYPE_SYS_AGENT" -const uint64_t OB_ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT_TID = 15113; // "ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT" -const uint64_t OB_ALL_VIRTUAL_COLL_TYPE_SYS_AGENT_TID = 15114; // "ALL_VIRTUAL_COLL_TYPE_SYS_AGENT" -const uint64_t OB_ALL_VIRTUAL_PACKAGE_SYS_AGENT_TID = 15115; // "ALL_VIRTUAL_PACKAGE_SYS_AGENT" -const uint64_t OB_ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT_TID = 15116; // "ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT" -const uint64_t OB_ALL_VIRTUAL_ROUTINE_SYS_AGENT_TID = 15117; // "ALL_VIRTUAL_ROUTINE_SYS_AGENT" -const uint64_t OB_ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT_TID = - 15118; // "ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT" -const uint64_t OB_ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT_TID = 15119; // "ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT" -const uint64_t OB_ALL_VIRTUAL_TABLE_REAL_AGENT_ORA_TID = 15120; // "ALL_VIRTUAL_TABLE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_COLUMN_REAL_AGENT_ORA_TID = 15121; // "ALL_VIRTUAL_COLUMN_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_DATABASE_REAL_AGENT_ORA_TID = 15122; // "ALL_VIRTUAL_DATABASE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_SEQUENCE_V2_REAL_AGENT_ORA_TID = 15123; // "ALL_VIRTUAL_SEQUENCE_V2_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_PART_REAL_AGENT_ORA_TID = 15124; // "ALL_VIRTUAL_PART_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_SUB_PART_REAL_AGENT_ORA_TID = 15125; // "ALL_VIRTUAL_SUB_PART_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_PACKAGE_REAL_AGENT_ORA_TID = 15126; // "ALL_VIRTUAL_PACKAGE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT_ORA_TID = 15127; // "ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT_ORA_TID = - 15128; // "ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_USER_REAL_AGENT_ORA_TID = 15129; // "ALL_VIRTUAL_USER_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_SYNONYM_REAL_AGENT_ORA_TID = 15130; // "ALL_VIRTUAL_SYNONYM_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT_ORA_TID = 15131; // "ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_COLUMN_STAT_REAL_AGENT_ORA_TID = 15132; // "ALL_VIRTUAL_COLUMN_STAT_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_COLUMN_STATISTIC_REAL_AGENT_ORA_TID = - 15133; // "ALL_VIRTUAL_COLUMN_STATISTIC_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TABLE_STAT_REAL_AGENT_ORA_TID = 15134; // "ALL_VIRTUAL_TABLE_STAT_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT_ORA_TID = 15135; // "ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_ROUTINE_REAL_AGENT_ORA_TID = 15136; // "ALL_VIRTUAL_ROUTINE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TABLEGROUP_REAL_AGENT_ORA_TID = 15137; // "ALL_VIRTUAL_TABLEGROUP_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT_ORA_TID = - 15138; // "ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_CONSTRAINT_REAL_AGENT_ORA_TID = 15139; // "ALL_VIRTUAL_CONSTRAINT_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TYPE_REAL_AGENT_ORA_TID = 15140; // "ALL_VIRTUAL_TYPE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT_ORA_TID = 15141; // "ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_COLL_TYPE_REAL_AGENT_ORA_TID = 15142; // "ALL_VIRTUAL_COLL_TYPE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT_ORA_TID = 15143; // "ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT_ORA_TID = - 15144; // "ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_KEYSTORE_REAL_AGENT_ORA_TID = - 15145; // "ALL_VIRTUAL_TENANT_KEYSTORE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT_ORA_TID = - 15150; // "ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT_ORA_TID = 15151; // "ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_REAL_AGENT_ORA_TID = - 15152; // "ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TABLE_PRIVILEGE_REAL_AGENT_ORA_TID = - 15153; // "ALL_VIRTUAL_TABLE_PRIVILEGE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_REAL_AGENT_ORA_TID = - 15154; // "ALL_VIRTUAL_TENANT_SECURITY_AUDIT_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_HISTORY_REAL_AGENT_ORA_TID = - 15155; // "ALL_VIRTUAL_TENANT_SECURITY_AUDIT_HISTORY_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT_ORA_TID = 15156; // "ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_RECORD_REAL_AGENT_ORA_TID = - 15157; // "ALL_VIRTUAL_TENANT_SECURITY_AUDIT_RECORD_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT_ORA_TID = 15158; // "ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_SYSAUTH_HISTORY_REAL_AGENT_ORA_TID = - 15159; // "ALL_VIRTUAL_TENANT_SYSAUTH_HISTORY_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT_ORA_TID = 15160; // "ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_OBJAUTH_HISTORY_REAL_AGENT_ORA_TID = - 15161; // "ALL_VIRTUAL_TENANT_OBJAUTH_HISTORY_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT_ORA_TID = 15162; // "ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT_ORA_TID = 15163; // "ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_OBJECT_TYPE_REAL_AGENT_ORA_TID = - 15164; // "ALL_VIRTUAL_TENANT_OBJECT_TYPE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_DBLINK_REAL_AGENT_ORA_TID = 15165; // "ALL_VIRTUAL_DBLINK_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_DBLINK_HISTORY_REAL_AGENT_ORA_TID = 15166; // "ALL_VIRTUAL_DBLINK_HISTORY_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_CONSTRAINT_COLUMN_REAL_AGENT_ORA_TID = - 15167; // "ALL_VIRTUAL_TENANT_CONSTRAINT_COLUMN_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_DEPENDENCY_REAL_AGENT_ORA_TID = - 15168; // "ALL_VIRTUAL_TENANT_DEPENDENCY_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT_ORA_TID = - 15169; // "ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_TIME_ZONE_REAL_AGENT_ORA_TID = - 15170; // "ALL_VIRTUAL_TENANT_TIME_ZONE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_REAL_AGENT_ORA_TID = - 15171; // "ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_REAL_AGENT_ORA_TID = - 15172; // "ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT_ORA_TID = - 15173; // "ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_RES_MGR_PLAN_REAL_AGENT_ORA_TID = 15174; // "ALL_VIRTUAL_RES_MGR_PLAN_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_RES_MGR_DIRECTIVE_REAL_AGENT_ORA_TID = - 15175; // "ALL_VIRTUAL_RES_MGR_DIRECTIVE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_TRANS_LOCK_STAT_ORA_TID = 15176; // "ALL_VIRTUAL_TRANS_LOCK_STAT_ORA" -const uint64_t OB_ALL_VIRTUAL_RES_MGR_MAPPING_RULE_REAL_AGENT_ORA_TID = - 15177; // "ALL_VIRTUAL_RES_MGR_MAPPING_RULE_REAL_AGENT_ORA" -const uint64_t OB_ALL_VIRTUAL_RES_MGR_CONSUMER_GROUP_REAL_AGENT_ORA_TID = - 15179; // "ALL_VIRTUAL_RES_MGR_CONSUMER_GROUP_REAL_AGENT_ORA" -const uint64_t OB_GV_PLAN_CACHE_STAT_TID = 20001; // "gv$plan_cache_stat" -const uint64_t OB_GV_PLAN_CACHE_PLAN_STAT_TID = 20002; // "gv$plan_cache_plan_stat" -const uint64_t OB_SCHEMATA_TID = 20003; // "SCHEMATA" -const uint64_t OB_CHARACTER_SETS_TID = 20004; // "CHARACTER_SETS" -const uint64_t OB_GLOBAL_VARIABLES_TID = 20005; // "GLOBAL_VARIABLES" -const uint64_t OB_STATISTICS_TID = 20006; // "STATISTICS" -const uint64_t OB_VIEWS_TID = 20007; // "VIEWS" -const uint64_t OB_TABLES_TID = 20008; // "TABLES" -const uint64_t OB_COLLATIONS_TID = 20009; // "COLLATIONS" -const uint64_t OB_COLLATION_CHARACTER_SET_APPLICABILITY_TID = 20010; // "COLLATION_CHARACTER_SET_APPLICABILITY" -const uint64_t OB_PROCESSLIST_TID = 20011; // "PROCESSLIST" -const uint64_t OB_KEY_COLUMN_USAGE_TID = 20012; // "KEY_COLUMN_USAGE" -const uint64_t OB_DBA_OUTLINES_TID = 20013; // "DBA_OUTLINES" -const uint64_t OB_ENGINES_TID = 20014; // "ENGINES" -const uint64_t OB_ROUTINES_TID = 20015; // "ROUTINES" -const uint64_t OB_GV_SESSION_EVENT_TID = 21000; // "gv$session_event" -const uint64_t OB_GV_SESSION_WAIT_TID = 21001; // "gv$session_wait" -const uint64_t OB_GV_SESSION_WAIT_HISTORY_TID = 21002; // "gv$session_wait_history" -const uint64_t OB_GV_SYSTEM_EVENT_TID = 21003; // "gv$system_event" -const uint64_t OB_GV_SESSTAT_TID = 21004; // "gv$sesstat" -const uint64_t OB_GV_SYSSTAT_TID = 21005; // "gv$sysstat" -const uint64_t OB_V_STATNAME_TID = 21006; // "v$statname" -const uint64_t OB_V_EVENT_NAME_TID = 21007; // "v$event_name" -const uint64_t OB_V_SESSION_EVENT_TID = 21008; // "v$session_event" -const uint64_t OB_V_SESSION_WAIT_TID = 21009; // "v$session_wait" -const uint64_t OB_V_SESSION_WAIT_HISTORY_TID = 21010; // "v$session_wait_history" -const uint64_t OB_V_SESSTAT_TID = 21011; // "v$sesstat" -const uint64_t OB_V_SYSSTAT_TID = 21012; // "v$sysstat" -const uint64_t OB_V_SYSTEM_EVENT_TID = 21013; // "v$system_event" -const uint64_t OB_GV_SQL_AUDIT_TID = 21014; // "gv$sql_audit" -const uint64_t OB_GV_LATCH_TID = 21015; // "gv$latch" -const uint64_t OB_GV_MEMORY_TID = 21016; // "gv$memory" -const uint64_t OB_V_MEMORY_TID = 21017; // "v$memory" -const uint64_t OB_GV_MEMSTORE_TID = 21018; // "gv$memstore" -const uint64_t OB_V_MEMSTORE_TID = 21019; // "v$memstore" -const uint64_t OB_GV_MEMSTORE_INFO_TID = 21020; // "gv$memstore_info" -const uint64_t OB_V_MEMSTORE_INFO_TID = 21021; // "v$memstore_info" -const uint64_t OB_V_PLAN_CACHE_STAT_TID = 21022; // "v$plan_cache_stat" -const uint64_t OB_V_PLAN_CACHE_PLAN_STAT_TID = 21023; // "v$plan_cache_plan_stat" -const uint64_t OB_GV_PLAN_CACHE_PLAN_EXPLAIN_TID = 21024; // "gv$plan_cache_plan_explain" -const uint64_t OB_V_PLAN_CACHE_PLAN_EXPLAIN_TID = 21025; // "v$plan_cache_plan_explain" -const uint64_t OB_V_SQL_AUDIT_TID = 21026; // "v$sql_audit" -const uint64_t OB_V_LATCH_TID = 21027; // "v$latch" -const uint64_t OB_GV_OBRPC_OUTGOING_TID = 21028; // "gv$obrpc_outgoing" -const uint64_t OB_V_OBRPC_OUTGOING_TID = 21029; // "v$obrpc_outgoing" -const uint64_t OB_GV_OBRPC_INCOMING_TID = 21030; // "gv$obrpc_incoming" -const uint64_t OB_V_OBRPC_INCOMING_TID = 21031; // "v$obrpc_incoming" -const uint64_t OB_GV_SQL_TID = 21032; // "gv$sql" -const uint64_t OB_V_SQL_TID = 21033; // "v$sql" -const uint64_t OB_GV_SQL_MONITOR_TID = 21034; // "gv$sql_monitor" -const uint64_t OB_V_SQL_MONITOR_TID = 21035; // "v$sql_monitor" -const uint64_t OB_GV_SQL_PLAN_MONITOR_TID = 21036; // "gv$sql_plan_monitor" -const uint64_t OB_V_SQL_PLAN_MONITOR_TID = 21037; // "v$sql_plan_monitor" -const uint64_t OB_USER_RECYCLEBIN_TID = 21038; // "USER_RECYCLEBIN" -const uint64_t OB_GV_OUTLINE_TID = 21039; // "gv$outline" -const uint64_t OB_GV_CONCURRENT_LIMIT_SQL_TID = 21040; // "gv$concurrent_limit_sql" -const uint64_t OB_GV_SQL_PLAN_STATISTICS_TID = 21041; // "gv$sql_plan_statistics" -const uint64_t OB_V_SQL_PLAN_STATISTICS_TID = 21042; // "v$sql_plan_statistics" -const uint64_t OB_GV_SERVER_MEMSTORE_TID = 21043; // "gv$server_memstore" -const uint64_t OB_GV_UNIT_LOAD_BALANCE_EVENT_HISTORY_TID = 21044; // "gv$unit_load_balance_event_history" -const uint64_t OB_GV_TENANT_TID = 21045; // "gv$tenant" -const uint64_t OB_GV_DATABASE_TID = 21046; // "gv$database" -const uint64_t OB_GV_TABLE_TID = 21047; // "gv$table" -const uint64_t OB_GV_UNIT_TID = 21048; // "gv$unit" -const uint64_t OB_V_UNIT_TID = 21049; // "v$unit" -const uint64_t OB_GV_PARTITION_TID = 21050; // "gv$partition" -const uint64_t OB_V_PARTITION_TID = 21051; // "v$partition" -const uint64_t OB_GV_LOCK_WAIT_STAT_TID = 21052; // "gv$lock_wait_stat" -const uint64_t OB_V_LOCK_WAIT_STAT_TID = 21053; // "v$lock_wait_stat" -const uint64_t OB_TIME_ZONE_TID = 21054; // "time_zone" -const uint64_t OB_TIME_ZONE_NAME_TID = 21055; // "time_zone_name" -const uint64_t OB_TIME_ZONE_TRANSITION_TID = 21056; // "time_zone_transition" -const uint64_t OB_TIME_ZONE_TRANSITION_TYPE_TID = 21057; // "time_zone_transition_type" -const uint64_t OB_GV_SESSION_LONGOPS_TID = 21059; // "gv$session_longops" -const uint64_t OB_V_SESSION_LONGOPS_TID = 21060; // "v$session_longops" -const uint64_t OB_GV_TENANT_MEMSTORE_ALLOCATOR_INFO_TID = 21064; // "gv$tenant_memstore_allocator_info" -const uint64_t OB_V_TENANT_MEMSTORE_ALLOCATOR_INFO_TID = 21065; // "v$tenant_memstore_allocator_info" -const uint64_t OB_GV_TENANT_SEQUENCE_OBJECT_TID = 21066; // "gv$tenant_sequence_object" -const uint64_t OB_COLUMNS_TID = 21068; // "COLUMNS" -const uint64_t OB_GV_MINOR_MERGE_INFO_TID = 21069; // "gv$minor_merge_info" -const uint64_t OB_GV_TENANT_PX_WORKER_STAT_TID = 21071; // "gv$tenant_px_worker_stat" -const uint64_t OB_V_TENANT_PX_WORKER_STAT_TID = 21072; // "v$tenant_px_worker_stat" -const uint64_t OB_GV_PARTITION_AUDIT_TID = 21073; // "gv$partition_audit" -const uint64_t OB_V_PARTITION_AUDIT_TID = 21074; // "v$partition_audit" -const uint64_t OB_V_OB_CLUSTER_TID = 21075; // "v$ob_cluster" -const uint64_t OB_GV_PS_STAT_TID = 21079; // "gv$ps_stat" -const uint64_t OB_V_PS_STAT_TID = 21080; // "v$ps_stat" -const uint64_t OB_GV_PS_ITEM_INFO_TID = 21081; // "gv$ps_item_info" -const uint64_t OB_V_PS_ITEM_INFO_TID = 21082; // "v$ps_item_info" -const uint64_t OB_GV_SQL_WORKAREA_TID = 21083; // "gv$sql_workarea" -const uint64_t OB_V_SQL_WORKAREA_TID = 21084; // "v$sql_workarea" -const uint64_t OB_GV_SQL_WORKAREA_ACTIVE_TID = 21085; // "gv$sql_workarea_active" -const uint64_t OB_V_SQL_WORKAREA_ACTIVE_TID = 21086; // "v$sql_workarea_active" -const uint64_t OB_GV_SQL_WORKAREA_HISTOGRAM_TID = 21087; // "gv$sql_workarea_histogram" -const uint64_t OB_V_SQL_WORKAREA_HISTOGRAM_TID = 21088; // "v$sql_workarea_histogram" -const uint64_t OB_GV_OB_SQL_WORKAREA_MEMORY_INFO_TID = 21089; // "gv$ob_sql_workarea_memory_info" -const uint64_t OB_V_OB_SQL_WORKAREA_MEMORY_INFO_TID = 21090; // "v$ob_sql_workarea_memory_info" -const uint64_t OB_GV_PLAN_CACHE_REFERENCE_INFO_TID = 21097; // "gv$plan_cache_reference_info" -const uint64_t OB_V_PLAN_CACHE_REFERENCE_INFO_TID = 21098; // "v$plan_cache_reference_info" -const uint64_t OB_V_OB_TIMESTAMP_SERVICE_TID = 21099; // "v$ob_timestamp_service" -const uint64_t OB_GV_SSTABLE_TID = 21100; // "gv$sstable" -const uint64_t OB_V_SSTABLE_TID = 21101; // "v$sstable" -const uint64_t OB_CDB_OB_BACKUP_ARCHIVELOG_SUMMARY_TID = 21102; // "CDB_OB_BACKUP_ARCHIVELOG_SUMMARY" -const uint64_t OB_CDB_OB_BACKUP_JOB_DETAILS_TID = 21103; // "CDB_OB_BACKUP_JOB_DETAILS" -const uint64_t OB_CDB_OB_BACKUP_SET_DETAILS_TID = 21104; // "CDB_OB_BACKUP_SET_DETAILS" -const uint64_t OB_CDB_OB_BACKUP_SET_EXPIRED_TID = 21105; // "CDB_OB_BACKUP_SET_EXPIRED" -const uint64_t OB_CDB_OB_BACKUP_PROGRESS_TID = 21106; // "CDB_OB_BACKUP_PROGRESS" -const uint64_t OB_CDB_OB_BACKUP_ARCHIVELOG_PROGRESS_TID = 21107; // "CDB_OB_BACKUP_ARCHIVELOG_PROGRESS" -const uint64_t OB_CDB_OB_BACKUP_CLEAN_HISTORY_TID = 21108; // "CDB_OB_BACKUP_CLEAN_HISTORY" -const uint64_t OB_CDB_OB_BACKUP_TASK_CLEAN_HISTORY_TID = 21109; // "CDB_OB_BACKUP_TASK_CLEAN_HISTORY" -const uint64_t OB_CDB_OB_RESTORE_PROGRESS_TID = 21110; // "CDB_OB_RESTORE_PROGRESS" -const uint64_t OB_CDB_OB_RESTORE_HISTORY_TID = 21111; // "CDB_OB_RESTORE_HISTORY" -const uint64_t OB_GV_SERVER_SCHEMA_INFO_TID = 21112; // "gv$server_schema_info" -const uint64_t OB_V_SERVER_SCHEMA_INFO_TID = 21113; // "v$server_schema_info" -const uint64_t OB_CDB_CKPT_HISTORY_TID = 21114; // "CDB_CKPT_HISTORY" -const uint64_t OB_GV_OB_TRANS_TABLE_STATUS_TID = 21115; // "gv$ob_trans_table_status" -const uint64_t OB_V_OB_TRANS_TABLE_STATUS_TID = 21116; // "v$ob_trans_table_status" -const uint64_t OB_V_SQL_MONITOR_STATNAME_TID = 21117; // "v$sql_monitor_statname" -const uint64_t OB_GV_MERGE_INFO_TID = 21118; // "gv$merge_info" -const uint64_t OB_V_MERGE_INFO_TID = 21119; // "v$merge_info" -const uint64_t OB_GV_LOCK_TID = 21120; // "gv$lock" -const uint64_t OB_V_LOCK_TID = 21121; // "v$lock" -const uint64_t OB_CDB_OB_BACKUP_VALIDATION_JOB_TID = 21122; // "CDB_OB_BACKUP_VALIDATION_JOB" -const uint64_t OB_CDB_OB_BACKUP_VALIDATION_JOB_HISTORY_TID = 21123; // "CDB_OB_BACKUP_VALIDATION_JOB_HISTORY" -const uint64_t OB_CDB_OB_TENANT_BACKUP_VALIDATION_TASK_TID = 21124; // "CDB_OB_TENANT_BACKUP_VALIDATION_TASK" -const uint64_t OB_CDB_OB_BACKUP_VALIDATION_TASK_HISTORY_TID = 21125; // "CDB_OB_BACKUP_VALIDATION_TASK_HISTORY" -const uint64_t OB_V_RESTORE_POINT_TID = 21126; // "v$restore_point" -const uint64_t OB_CDB_OB_BACKUP_SET_OBSOLETE_TID = 21127; // "CDB_OB_BACKUP_SET_OBSOLETE" -const uint64_t OB_CDB_OB_BACKUP_BACKUPSET_JOB_TID = 21128; // "CDB_OB_BACKUP_BACKUPSET_JOB" -const uint64_t OB_CDB_OB_BACKUP_BACKUPSET_JOB_HISTORY_TID = 21129; // "CDB_OB_BACKUP_BACKUPSET_JOB_HISTORY" -const uint64_t OB_CDB_OB_BACKUP_BACKUPSET_TASK_TID = 21130; // "CDB_OB_BACKUP_BACKUPSET_TASK" -const uint64_t OB_CDB_OB_BACKUP_BACKUPSET_TASK_HISTORY_TID = 21131; // "CDB_OB_BACKUP_BACKUPSET_TASK_HISTORY" -const uint64_t OB_CDB_OB_BACKUP_BACKUP_ARCHIVELOG_SUMMARY_TID = 21132; // "CDB_OB_BACKUP_BACKUP_ARCHIVELOG_SUMMARY" -const uint64_t OB_DBA_SYNONYMS_TID = 25001; // "DBA_SYNONYMS" -const uint64_t OB_DBA_OBJECTS_TID = 25002; // "DBA_OBJECTS" -const uint64_t OB_ALL_OBJECTS_TID = 25003; // "ALL_OBJECTS" -const uint64_t OB_USER_OBJECTS_TID = 25004; // "USER_OBJECTS" -const uint64_t OB_DBA_SEQUENCES_TID = 25005; // "DBA_SEQUENCES" -const uint64_t OB_ALL_SEQUENCES_TID = 25006; // "ALL_SEQUENCES" -const uint64_t OB_USER_SEQUENCES_TID = 25007; // "USER_SEQUENCES" -const uint64_t OB_DBA_USERS_TID = 25008; // "DBA_USERS" -const uint64_t OB_ALL_USERS_TID = 25009; // "ALL_USERS" -const uint64_t OB_ALL_SYNONYMS_TID = 25010; // "ALL_SYNONYMS" -const uint64_t OB_USER_SYNONYMS_TID = 25011; // "USER_SYNONYMS" -const uint64_t OB_DBA_IND_COLUMNS_TID = 25012; // "DBA_IND_COLUMNS" -const uint64_t OB_ALL_IND_COLUMNS_TID = 25013; // "ALL_IND_COLUMNS" -const uint64_t OB_USER_IND_COLUMNS_TID = 25014; // "USER_IND_COLUMNS" -const uint64_t OB_DBA_CONSTRAINTS_TID = 25015; // "DBA_CONSTRAINTS" -const uint64_t OB_ALL_CONSTRAINTS_TID = 25016; // "ALL_CONSTRAINTS" -const uint64_t OB_USER_CONSTRAINTS_TID = 25017; // "USER_CONSTRAINTS" -const uint64_t OB_ALL_TAB_COLS_V_TID = 25018; // "ALL_TAB_COLS_V$" -const uint64_t OB_DBA_TAB_COLS_V_TID = 25019; // "DBA_TAB_COLS_V$" -const uint64_t OB_USER_TAB_COLS_V_TID = 25020; // "USER_TAB_COLS_V$" -const uint64_t OB_ALL_TAB_COLS_TID = 25021; // "ALL_TAB_COLS" -const uint64_t OB_DBA_TAB_COLS_TID = 25022; // "DBA_TAB_COLS" -const uint64_t OB_USER_TAB_COLS_TID = 25023; // "USER_TAB_COLS" -const uint64_t OB_ALL_TAB_COLUMNS_TID = 25024; // "ALL_TAB_COLUMNS" -const uint64_t OB_DBA_TAB_COLUMNS_TID = 25025; // "DBA_TAB_COLUMNS" -const uint64_t OB_USER_TAB_COLUMNS_TID = 25026; // "USER_TAB_COLUMNS" -const uint64_t OB_ALL_TABLES_TID = 25027; // "ALL_TABLES" -const uint64_t OB_DBA_TABLES_TID = 25028; // "DBA_TABLES" -const uint64_t OB_USER_TABLES_TID = 25029; // "USER_TABLES" -const uint64_t OB_DBA_TAB_COMMENTS_TID = 25030; // "DBA_TAB_COMMENTS" -const uint64_t OB_ALL_TAB_COMMENTS_TID = 25031; // "ALL_TAB_COMMENTS" -const uint64_t OB_USER_TAB_COMMENTS_TID = 25032; // "USER_TAB_COMMENTS" -const uint64_t OB_DBA_COL_COMMENTS_TID = 25033; // "DBA_COL_COMMENTS" -const uint64_t OB_ALL_COL_COMMENTS_TID = 25034; // "ALL_COL_COMMENTS" -const uint64_t OB_USER_COL_COMMENTS_TID = 25035; // "USER_COL_COMMENTS" -const uint64_t OB_DBA_INDEXES_TID = 25036; // "DBA_INDEXES" -const uint64_t OB_ALL_INDEXES_TID = 25037; // "ALL_INDEXES" -const uint64_t OB_USER_INDEXES_TID = 25038; // "USER_INDEXES" -const uint64_t OB_DBA_CONS_COLUMNS_TID = 25039; // "DBA_CONS_COLUMNS" -const uint64_t OB_ALL_CONS_COLUMNS_TID = 25040; // "ALL_CONS_COLUMNS" -const uint64_t OB_USER_CONS_COLUMNS_TID = 25041; // "USER_CONS_COLUMNS" -const uint64_t OB_USER_SEGMENTS_TID = 25042; // "USER_SEGMENTS" -const uint64_t OB_DBA_SEGMENTS_TID = 25043; // "DBA_SEGMENTS" -const uint64_t OB_DBA_TYPES_TID = 25044; // "DBA_TYPES" -const uint64_t OB_ALL_TYPES_TID = 25045; // "ALL_TYPES" -const uint64_t OB_USER_TYPES_TID = 25046; // "USER_TYPES" -const uint64_t OB_DBA_TYPE_ATTRS_TID = 25047; // "DBA_TYPE_ATTRS" -const uint64_t OB_ALL_TYPE_ATTRS_TID = 25048; // "ALL_TYPE_ATTRS" -const uint64_t OB_USER_TYPE_ATTRS_TID = 25049; // "USER_TYPE_ATTRS" -const uint64_t OB_DBA_COLL_TYPES_TID = 25050; // "DBA_COLL_TYPES" -const uint64_t OB_ALL_COLL_TYPES_TID = 25051; // "ALL_COLL_TYPES" -const uint64_t OB_USER_COLL_TYPES_TID = 25052; // "USER_COLL_TYPES" -const uint64_t OB_DBA_PROCEDURES_TID = 25053; // "DBA_PROCEDURES" -const uint64_t OB_DBA_ARGUMENTS_TID = 25054; // "DBA_ARGUMENTS" -const uint64_t OB_DBA_SOURCE_TID = 25055; // "DBA_SOURCE" -const uint64_t OB_ALL_PROCEDURES_TID = 25056; // "ALL_PROCEDURES" -const uint64_t OB_ALL_ARGUMENTS_TID = 25057; // "ALL_ARGUMENTS" -const uint64_t OB_ALL_SOURCE_TID = 25058; // "ALL_SOURCE" -const uint64_t OB_USER_PROCEDURES_TID = 25059; // "USER_PROCEDURES" -const uint64_t OB_USER_ARGUMENTS_TID = 25060; // "USER_ARGUMENTS" -const uint64_t OB_USER_SOURCE_TID = 25061; // "USER_SOURCE" -const uint64_t OB_DBA_PART_KEY_COLUMNS_TID = 25062; // "DBA_PART_KEY_COLUMNS" -const uint64_t OB_ALL_PART_KEY_COLUMNS_TID = 25063; // "ALL_PART_KEY_COLUMNS" -const uint64_t OB_USER_PART_KEY_COLUMNS_TID = 25064; // "USER_PART_KEY_COLUMNS" -const uint64_t OB_DBA_SUBPART_KEY_COLUMNS_TID = 25065; // "DBA_SUBPART_KEY_COLUMNS" -const uint64_t OB_ALL_SUBPART_KEY_COLUMNS_TID = 25066; // "ALL_SUBPART_KEY_COLUMNS" -const uint64_t OB_USER_SUBPART_KEY_COLUMNS_TID = 25067; // "USER_SUBPART_KEY_COLUMNS" -const uint64_t OB_DBA_VIEWS_TID = 25068; // "DBA_VIEWS" -const uint64_t OB_ALL_VIEWS_TID = 25069; // "ALL_VIEWS" -const uint64_t OB_USER_VIEWS_TID = 25070; // "USER_VIEWS" -const uint64_t OB_ALL_TAB_PARTITIONS_ORA_TID = 25071; // "ALL_TAB_PARTITIONS_ORA" -const uint64_t OB_ALL_TAB_SUBPARTITIONS_ORA_TID = 25072; // "ALL_TAB_SUBPARTITIONS_ORA" -const uint64_t OB_ALL_PART_TABLES_ORA_TID = 25073; // "ALL_PART_TABLES_ORA" -const uint64_t OB_DBA_PART_TABLES_ORA_TID = 25074; // "DBA_PART_TABLES_ORA" -const uint64_t OB_USER_PART_TABLES_ORA_TID = 25075; // "USER_PART_TABLES_ORA" -const uint64_t OB_DBA_TAB_PARTITIONS_ORA_TID = 25076; // "DBA_TAB_PARTITIONS_ORA" -const uint64_t OB_USER_TAB_PARTITIONS_ORA_TID = 25077; // "USER_TAB_PARTITIONS_ORA" -const uint64_t OB_DBA_TAB_SUBPARTITIONS_ORA_TID = 25078; // "DBA_TAB_SUBPARTITIONS_ORA" -const uint64_t OB_USER_TAB_SUBPARTITIONS_ORA_TID = 25079; // "USER_TAB_SUBPARTITIONS_ORA" -const uint64_t OB_DBA_SUBPARTITION_TEMPLATES_ORA_TID = 25080; // "DBA_SUBPARTITION_TEMPLATES_ORA" -const uint64_t OB_ALL_SUBPARTITION_TEMPLATES_ORA_TID = 25081; // "ALL_SUBPARTITION_TEMPLATES_ORA" -const uint64_t OB_USER_SUBPARTITION_TEMPLATES_ORA_TID = 25082; // "USER_SUBPARTITION_TEMPLATES_ORA" -const uint64_t OB_DBA_PART_INDEXES_TID = 25083; // "DBA_PART_INDEXES" -const uint64_t OB_ALL_PART_INDEXES_TID = 25084; // "ALL_PART_INDEXES" -const uint64_t OB_USER_PART_INDEXES_TID = 25085; // "USER_PART_INDEXES" -const uint64_t OB_ALL_ALL_TABLES_ORA_TID = 25086; // "ALL_ALL_TABLES_ORA" -const uint64_t OB_DBA_ALL_TABLES_ORA_TID = 25087; // "DBA_ALL_TABLES_ORA" -const uint64_t OB_USER_ALL_TABLES_ORA_TID = 25088; // "USER_ALL_TABLES_ORA" -const uint64_t OB_DBA_PROFILES_ORA_TID = 25089; // "DBA_PROFILES_ORA" -const uint64_t OB_USER_PROFILES_ORA_TID = 25090; // "USER_PROFILES_ORA" -const uint64_t OB_ALL_PROFILES_ORA_TID = 25091; // "ALL_PROFILES_ORA" -const uint64_t OB_ALL_MVIEW_COMMENTS_ORA_TID = 25092; // "ALL_MVIEW_COMMENTS_ORA" -const uint64_t OB_USER_MVIEW_COMMENTS_ORA_TID = 25093; // "USER_MVIEW_COMMENTS_ORA" -const uint64_t OB_DBA_MVIEW_COMMENTS_ORA_TID = 25094; // "DBA_MVIEW_COMMENTS_ORA" -const uint64_t OB_ALL_SCHEDULER_PROGRAM_ARGS_ORA_TID = 25095; // "ALL_SCHEDULER_PROGRAM_ARGS_ORA" -const uint64_t OB_DBA_SCHEDULER_PROGRAM_ARGS_ORA_TID = 25096; // "DBA_SCHEDULER_PROGRAM_ARGS_ORA" -const uint64_t OB_USER_SCHEDULER_PROGRAM_ARGS_ORA_TID = 25097; // "USER_SCHEDULER_PROGRAM_ARGS_ORA" -const uint64_t OB_ALL_SCHEDULER_JOB_ARGS_ORA_TID = 25098; // "ALL_SCHEDULER_JOB_ARGS_ORA" -const uint64_t OB_DBA_SCHEDULER_JOB_ARGS_ORA_TID = 25099; // "DBA_SCHEDULER_JOB_ARGS_ORA" -const uint64_t OB_USER_SCHEDULER_JOB_ARGS_ORA_TID = 25100; // "USER_SCHEDULER_JOB_ARGS_ORA" -const uint64_t OB_ALL_ERRORS_ORA_TID = 25101; // "ALL_ERRORS_ORA" -const uint64_t OB_DBA_ERRORS_ORA_TID = 25102; // "DBA_ERRORS_ORA" -const uint64_t OB_USER_ERRORS_ORA_TID = 25103; // "USER_ERRORS_ORA" -const uint64_t OB_ALL_TYPE_METHODS_ORA_TID = 25104; // "ALL_TYPE_METHODS_ORA" -const uint64_t OB_DBA_TYPE_METHODS_ORA_TID = 25105; // "DBA_TYPE_METHODS_ORA" -const uint64_t OB_USER_TYPE_METHODS_ORA_TID = 25106; // "USER_TYPE_METHODS_ORA" -const uint64_t OB_ALL_METHOD_PARAMS_ORA_TID = 25107; // "ALL_METHOD_PARAMS_ORA" -const uint64_t OB_DBA_METHOD_PARAMS_ORA_TID = 25108; // "DBA_METHOD_PARAMS_ORA" -const uint64_t OB_USER_METHOD_PARAMS_ORA_TID = 25109; // "USER_METHOD_PARAMS_ORA" -const uint64_t OB_DBA_TABLESPACES_ORA_TID = 25110; // "DBA_TABLESPACES_ORA" -const uint64_t OB_USER_TABLESPACES_ORA_TID = 25111; // "USER_TABLESPACES_ORA" -const uint64_t OB_DBA_IND_EXPRESSIONS_TID = 25112; // "DBA_IND_EXPRESSIONS" -const uint64_t OB_USER_IND_EXPRESSIONS_TID = 25113; // "USER_IND_EXPRESSIONS" -const uint64_t OB_ALL_IND_EXPRESSIONS_TID = 25114; // "ALL_IND_EXPRESSIONS" -const uint64_t OB_ALL_IND_PARTITIONS_TID = 25115; // "ALL_IND_PARTITIONS" -const uint64_t OB_USER_IND_PARTITIONS_TID = 25116; // "USER_IND_PARTITIONS" -const uint64_t OB_DBA_IND_PARTITIONS_TID = 25117; // "DBA_IND_PARTITIONS" -const uint64_t OB_DBA_IND_SUBPARTITIONS_TID = 25118; // "DBA_IND_SUBPARTITIONS" -const uint64_t OB_ALL_IND_SUBPARTITIONS_TID = 25119; // "ALL_IND_SUBPARTITIONS" -const uint64_t OB_USER_IND_SUBPARTITIONS_TID = 25120; // "USER_IND_SUBPARTITIONS" -const uint64_t OB_DBA_ROLES_TID = 25121; // "DBA_ROLES" -const uint64_t OB_DBA_ROLE_PRIVS_TID = 25122; // "DBA_ROLE_PRIVS" -const uint64_t OB_USER_ROLE_PRIVS_TID = 25123; // "USER_ROLE_PRIVS" -const uint64_t OB_DBA_TAB_PRIVS_TID = 25124; // "DBA_TAB_PRIVS" -const uint64_t OB_ALL_TAB_PRIVS_TID = 25125; // "ALL_TAB_PRIVS" -const uint64_t OB_USER_TAB_PRIVS_TID = 25126; // "USER_TAB_PRIVS" -const uint64_t OB_DBA_SYS_PRIVS_TID = 25127; // "DBA_SYS_PRIVS" -const uint64_t OB_USER_SYS_PRIVS_TID = 25128; // "USER_SYS_PRIVS" -const uint64_t OB_DBA_COL_PRIVS_ORA_TID = 25143; // "DBA_COL_PRIVS_ORA" -const uint64_t OB_USER_COL_PRIVS_ORA_TID = 25144; // "USER_COL_PRIVS_ORA" -const uint64_t OB_ALL_COL_PRIVS_ORA_TID = 25145; // "ALL_COL_PRIVS_ORA" -const uint64_t OB_ROLE_TAB_PRIVS_ORA_TID = 25146; // "ROLE_TAB_PRIVS_ORA" -const uint64_t OB_ROLE_SYS_PRIVS_ORA_TID = 25147; // "ROLE_SYS_PRIVS_ORA" -const uint64_t OB_ROLE_ROLE_PRIVS_ORA_TID = 25148; // "ROLE_ROLE_PRIVS_ORA" -const uint64_t OB_DICTIONARY_ORA_TID = 25149; // "DICTIONARY_ORA" -const uint64_t OB_DICT_ORA_TID = 25150; // "DICT_ORA" -const uint64_t OB_ALL_TRIGGERS_TID = 25151; // "ALL_TRIGGERS" -const uint64_t OB_DBA_TRIGGERS_TID = 25152; // "DBA_TRIGGERS" -const uint64_t OB_USER_TRIGGERS_TID = 25153; // "USER_TRIGGERS" -const uint64_t OB_ALL_DEPENDENCIES_ORA_TID = 25154; // "ALL_DEPENDENCIES_ORA" -const uint64_t OB_DBA_DEPENDENCIES_ORA_TID = 25155; // "DBA_DEPENDENCIES_ORA" -const uint64_t OB_USER_DEPENDENCIES_ORA_TID = 25156; // "USER_DEPENDENCIES_ORA" -const uint64_t OB_DBA_RSRC_PLANS_TID = 25157; // "DBA_RSRC_PLANS" -const uint64_t OB_DBA_RSRC_PLAN_DIRECTIVES_TID = 25158; // "DBA_RSRC_PLAN_DIRECTIVES" -const uint64_t OB_DBA_RSRC_GROUP_MAPPINGS_TID = 25159; // "DBA_RSRC_GROUP_MAPPINGS" -const uint64_t OB_DBA_RECYCLEBIN_ORA_TID = 25160; // "DBA_RECYCLEBIN_ORA" -const uint64_t OB_USER_RECYCLEBIN_ORA_TID = 25161; // "USER_RECYCLEBIN_ORA" -const uint64_t OB_DBA_RSRC_CONSUMER_GROUPS_TID = 25162; // "DBA_RSRC_CONSUMER_GROUPS" -const uint64_t OB_GV_OUTLINE_ORA_TID = 28001; // "GV$OUTLINE_ORA" -const uint64_t OB_GV_SQL_AUDIT_ORA_TID = 28002; // "GV$SQL_AUDIT_ORA" -const uint64_t OB_V_SQL_AUDIT_ORA_TID = 28003; // "V$SQL_AUDIT_ORA" -const uint64_t OB_GV_INSTANCE_TID = 28004; // "GV$INSTANCE" -const uint64_t OB_V_INSTANCE_TID = 28005; // "V$INSTANCE" -const uint64_t OB_GV_PLAN_CACHE_PLAN_STAT_ORA_TID = 28006; // "GV$PLAN_CACHE_PLAN_STAT_ORA" -const uint64_t OB_V_PLAN_CACHE_PLAN_STAT_ORA_TID = 28007; // "V$PLAN_CACHE_PLAN_STAT_ORA" -const uint64_t OB_GV_PLAN_CACHE_PLAN_EXPLAIN_ORA_TID = 28008; // "GV$PLAN_CACHE_PLAN_EXPLAIN_ORA" -const uint64_t OB_V_PLAN_CACHE_PLAN_EXPLAIN_ORA_TID = 28009; // "V$PLAN_CACHE_PLAN_EXPLAIN_ORA" -const uint64_t OB_GV_SESSION_WAIT_ORA_TID = 28010; // "GV$SESSION_WAIT_ORA" -const uint64_t OB_V_SESSION_WAIT_ORA_TID = 28011; // "V$SESSION_WAIT_ORA" -const uint64_t OB_GV_SESSION_WAIT_HISTORY_ORA_TID = 28012; // "GV$SESSION_WAIT_HISTORY_ORA" -const uint64_t OB_V_SESSION_WAIT_HISTORY_ORA_TID = 28013; // "V$SESSION_WAIT_HISTORY_ORA" -const uint64_t OB_GV_MEMORY_ORA_TID = 28014; // "GV$MEMORY_ORA" -const uint64_t OB_V_MEMORY_ORA_TID = 28015; // "V$MEMORY_ORA" -const uint64_t OB_GV_MEMSTORE_ORA_TID = 28016; // "GV$MEMSTORE_ORA" -const uint64_t OB_V_MEMSTORE_ORA_TID = 28017; // "V$MEMSTORE_ORA" -const uint64_t OB_GV_MEMSTORE_INFO_ORA_TID = 28018; // "GV$MEMSTORE_INFO_ORA" -const uint64_t OB_V_MEMSTORE_INFO_ORA_TID = 28019; // "V$MEMSTORE_INFO_ORA" -const uint64_t OB_GV_SERVER_MEMSTORE_ORA_TID = 28020; // "GV$SERVER_MEMSTORE_ORA" -const uint64_t OB_GV_SESSTAT_ORA_TID = 28021; // "GV$SESSTAT_ORA" -const uint64_t OB_V_SESSTAT_ORA_TID = 28022; // "V$SESSTAT_ORA" -const uint64_t OB_GV_SYSSTAT_ORA_TID = 28023; // "GV$SYSSTAT_ORA" -const uint64_t OB_V_SYSSTAT_ORA_TID = 28024; // "V$SYSSTAT_ORA" -const uint64_t OB_GV_SYSTEM_EVENT_ORA_TID = 28025; // "GV$SYSTEM_EVENT_ORA" -const uint64_t OB_V_SYSTEM_EVENT_ORA_TID = 28026; // "V$SYSTEM_EVENT_ORA" -const uint64_t OB_GV_TENANT_MEMSTORE_ALLOCATOR_INFO_ORA_TID = 28027; // "GV$TENANT_MEMSTORE_ALLOCATOR_INFO_ORA" -const uint64_t OB_V_TENANT_MEMSTORE_ALLOCATOR_INFO_ORA_TID = 28028; // "V$TENANT_MEMSTORE_ALLOCATOR_INFO_ORA" -const uint64_t OB_GV_PLAN_CACHE_STAT_ORA_TID = 28029; // "GV$PLAN_CACHE_STAT_ORA" -const uint64_t OB_V_PLAN_CACHE_STAT_ORA_TID = 28030; // "V$PLAN_CACHE_STAT_ORA" -const uint64_t OB_GV_CONCURRENT_LIMIT_SQL_ORA_TID = 28031; // "GV$CONCURRENT_LIMIT_SQL_ORA" -const uint64_t OB_NLS_SESSION_PARAMETERS_ORA_TID = 28032; // "NLS_SESSION_PARAMETERS_ORA" -const uint64_t OB_NLS_INSTANCE_PARAMETERS_ORA_TID = 28033; // "NLS_INSTANCE_PARAMETERS_ORA" -const uint64_t OB_NLS_DATABASE_PARAMETERS_ORA_TID = 28034; // "NLS_DATABASE_PARAMETERS_ORA" -const uint64_t OB_V_NLS_PARAMETERS_ORA_TID = 28035; // "V$NLS_PARAMETERS_ORA" -const uint64_t OB_V_VERSION_ORA_TID = 28036; // "V$VERSION_ORA" -const uint64_t OB_GV_TENANT_PX_WORKER_STAT_ORA_TID = 28037; // "GV$TENANT_PX_WORKER_STAT_ORA" -const uint64_t OB_V_TENANT_PX_WORKER_STAT_ORA_TID = 28038; // "V$TENANT_PX_WORKER_STAT_ORA" -const uint64_t OB_GV_PS_STAT_ORA_TID = 28039; // "GV$PS_STAT_ORA" -const uint64_t OB_V_PS_STAT_ORA_TID = 28040; // "V$PS_STAT_ORA" -const uint64_t OB_GV_PS_ITEM_INFO_ORA_TID = 28041; // "GV$PS_ITEM_INFO_ORA" -const uint64_t OB_V_PS_ITEM_INFO_ORA_TID = 28042; // "V$PS_ITEM_INFO_ORA" -const uint64_t OB_GV_SQL_WORKAREA_ACTIVE_ORA_TID = 28045; // "GV$SQL_WORKAREA_ACTIVE_ORA" -const uint64_t OB_V_SQL_WORKAREA_ACTIVE_ORA_TID = 28046; // "V$SQL_WORKAREA_ACTIVE_ORA" -const uint64_t OB_GV_SQL_WORKAREA_HISTOGRAM_ORA_TID = 28047; // "GV$SQL_WORKAREA_HISTOGRAM_ORA" -const uint64_t OB_V_SQL_WORKAREA_HISTOGRAM_ORA_TID = 28048; // "V$SQL_WORKAREA_HISTOGRAM_ORA" -const uint64_t OB_GV_OB_SQL_WORKAREA_MEMORY_INFO_ORA_TID = 28049; // "GV$OB_SQL_WORKAREA_MEMORY_INFO_ORA" -const uint64_t OB_V_OB_SQL_WORKAREA_MEMORY_INFO_ORA_TID = 28050; // "V$OB_SQL_WORKAREA_MEMORY_INFO_ORA" -const uint64_t OB_GV_PLAN_CACHE_REFERENCE_INFO_ORA_TID = 28051; // "GV$PLAN_CACHE_REFERENCE_INFO_ORA" -const uint64_t OB_V_PLAN_CACHE_REFERENCE_INFO_ORA_TID = 28052; // "V$PLAN_CACHE_REFERENCE_INFO_ORA" -const uint64_t OB_GV_SQL_WORKAREA_ORA_TID = 28053; // "GV$SQL_WORKAREA_ORA" -const uint64_t OB_V_SQL_WORKAREA_ORA_TID = 28054; // "V$SQL_WORKAREA_ORA" -const uint64_t OB_GV_SSTABLE_ORA_TID = 28055; // "GV$SSTABLE_ORA" -const uint64_t OB_V_SSTABLE_ORA_TID = 28056; // "V$SSTABLE_ORA" -const uint64_t OB_GV_SERVER_SCHEMA_INFO_ORA_TID = 28057; // "GV$SERVER_SCHEMA_INFO_ORA" -const uint64_t OB_V_SERVER_SCHEMA_INFO_ORA_TID = 28058; // "V$SERVER_SCHEMA_INFO_ORA" -const uint64_t OB_GV_SQL_PLAN_MONITOR_ORA_TID = 28059; // "GV$SQL_PLAN_MONITOR_ORA" -const uint64_t OB_V_SQL_PLAN_MONITOR_ORA_TID = 28060; // "V$SQL_PLAN_MONITOR_ORA" -const uint64_t OB_V_SQL_MONITOR_STATNAME_ORA_TID = 28061; // "V$SQL_MONITOR_STATNAME_ORA" -const uint64_t OB_GV_LOCK_ORA_TID = 28062; // "GV$LOCK_ORA" -const uint64_t OB_V_LOCK_ORA_TID = 28063; // "V$LOCK_ORA" -const uint64_t OB_GV_OPEN_CURSOR_ORA_TID = 28064; // "GV$OPEN_CURSOR_ORA" -const uint64_t OB_V_OPEN_CURSOR_ORA_TID = 28065; // "V$OPEN_CURSOR_ORA" -const uint64_t OB_V_TIMEZONE_NAMES_ORA_TID = 28066; // "V$TIMEZONE_NAMES_ORA" -const uint64_t OB_GV_GLOBAL_TRANSACTION_ORA_TID = 28067; // "GV$GLOBAL_TRANSACTION_ORA" -const uint64_t OB_V_GLOBAL_TRANSACTION_ORA_TID = 28068; // "V$GLOBAL_TRANSACTION_ORA" -const uint64_t OB_V_RESTORE_POINT_ORA_TID = 28069; // "V$RESTORE_POINT_ORA" -const uint64_t OB_V_RSRC_PLAN_ORA_TID = 28070; // "V$RSRC_PLAN_ORA" -const uint64_t OB_TRIGGERS_TID = 28071; // "TRIGGERS" -const uint64_t OB_ALL_TABLE_V2_HISTORY_IDX_DATA_TABLE_ID_TID = 9998; // "__all_table_v2_history" -const uint64_t OB_ALL_TABLE_HISTORY_IDX_DATA_TABLE_ID_TID = 9999; // "__all_table_history" -const uint64_t OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TID = - 14999; // "__all_virtual_plan_cache_stat" -const uint64_t OB_ALL_VIRTUAL_SESSION_EVENT_ALL_VIRTUAL_SESSION_EVENT_I1_TID = 14998; // "__all_virtual_session_event" -const uint64_t OB_ALL_VIRTUAL_SESSION_WAIT_ALL_VIRTUAL_SESSION_WAIT_I1_TID = 14997; // "__all_virtual_session_wait" -const uint64_t OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TID = - 14996; // "__all_virtual_session_wait_history" -const uint64_t OB_ALL_VIRTUAL_SYSTEM_EVENT_ALL_VIRTUAL_SYSTEM_EVENT_I1_TID = 14995; // "__all_virtual_system_event" -const uint64_t OB_ALL_VIRTUAL_SESSTAT_ALL_VIRTUAL_SESSTAT_I1_TID = 14994; // "__all_virtual_sesstat" -const uint64_t OB_ALL_VIRTUAL_SYSSTAT_ALL_VIRTUAL_SYSSTAT_I1_TID = 14993; // "__all_virtual_sysstat" -const uint64_t OB_ALL_VIRTUAL_SQL_AUDIT_ALL_VIRTUAL_SQL_AUDIT_I1_TID = 14992; // "__all_virtual_sql_audit" -const uint64_t OB_ALL_VIRTUAL_REPLICA_TASK_ALL_VIRTUAL_REPLICA_TASK_I1_TID = 14991; // "__all_virtual_replica_task" -const uint64_t OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TID = - 14990; // "__all_virtual_sql_plan_monitor" -const uint64_t OB_ALL_VIRTUAL_SQL_AUDIT_ORA_ALL_VIRTUAL_SQL_AUDIT_I1_TID = 19999; // "ALL_VIRTUAL_SQL_AUDIT_ORA" -const uint64_t OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TID = - 19998; // "ALL_VIRTUAL_PLAN_CACHE_STAT_ORA" -const uint64_t OB_ALL_VIRTUAL_SESSION_WAIT_ORA_ALL_VIRTUAL_SESSION_WAIT_I1_TID = - 19997; // "ALL_VIRTUAL_SESSION_WAIT_ORA" -const uint64_t OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TID = - 19996; // "ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA" -const uint64_t OB_ALL_VIRTUAL_SESSTAT_ORA_ALL_VIRTUAL_SESSTAT_I1_TID = 19995; // "ALL_VIRTUAL_SESSTAT_ORA" -const uint64_t OB_ALL_VIRTUAL_SYSSTAT_ORA_ALL_VIRTUAL_SYSSTAT_I1_TID = 19994; // "ALL_VIRTUAL_SYSSTAT_ORA" -const uint64_t OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_ALL_VIRTUAL_SYSTEM_EVENT_I1_TID = - 19993; // "ALL_VIRTUAL_SYSTEM_EVENT_ORA" -const uint64_t OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TID = - 19992; // "ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA" +namespace share +{ +const uint64_t OB_ALL_CORE_TABLE_TID = 1; // "__all_core_table" +const uint64_t OB_ALL_ROOT_TABLE_TID = 2; // "__all_root_table" +const uint64_t OB_ALL_TABLE_TID = 3; // "__all_table" +const uint64_t OB_ALL_COLUMN_TID = 4; // "__all_column" +const uint64_t OB_ALL_DDL_OPERATION_TID = 5; // "__all_ddl_operation" +const uint64_t OB_ALL_TABLE_V2_TID = 7; // "__all_table_v2" +const uint64_t OB_ALL_META_TABLE_TID = 101; // "__all_meta_table" +const uint64_t OB_ALL_USER_TID = 102; // "__all_user" +const uint64_t OB_ALL_USER_HISTORY_TID = 103; // "__all_user_history" +const uint64_t OB_ALL_DATABASE_TID = 104; // "__all_database" +const uint64_t OB_ALL_DATABASE_HISTORY_TID = 105; // "__all_database_history" +const uint64_t OB_ALL_TABLEGROUP_TID = 106; // "__all_tablegroup" +const uint64_t OB_ALL_TABLEGROUP_HISTORY_TID = 107; // "__all_tablegroup_history" +const uint64_t OB_ALL_TENANT_TID = 108; // "__all_tenant" +const uint64_t OB_ALL_TENANT_HISTORY_TID = 109; // "__all_tenant_history" +const uint64_t OB_ALL_TABLE_PRIVILEGE_TID = 110; // "__all_table_privilege" +const uint64_t OB_ALL_TABLE_PRIVILEGE_HISTORY_TID = 111; // "__all_table_privilege_history" +const uint64_t OB_ALL_DATABASE_PRIVILEGE_TID = 112; // "__all_database_privilege" +const uint64_t OB_ALL_DATABASE_PRIVILEGE_HISTORY_TID = 113; // "__all_database_privilege_history" +const uint64_t OB_ALL_TABLE_HISTORY_TID = 114; // "__all_table_history" +const uint64_t OB_ALL_COLUMN_HISTORY_TID = 115; // "__all_column_history" +const uint64_t OB_ALL_ZONE_TID = 116; // "__all_zone" +const uint64_t OB_ALL_SERVER_TID = 117; // "__all_server" +const uint64_t OB_ALL_SYS_PARAMETER_TID = 118; // "__all_sys_parameter" +const uint64_t OB_TENANT_PARAMETER_TID = 119; // "__tenant_parameter" +const uint64_t OB_ALL_SYS_VARIABLE_TID = 120; // "__all_sys_variable" +const uint64_t OB_ALL_SYS_STAT_TID = 121; // "__all_sys_stat" +const uint64_t OB_ALL_COLUMN_STATISTIC_TID = 122; // "__all_column_statistic" +const uint64_t OB_ALL_UNIT_TID = 123; // "__all_unit" +const uint64_t OB_ALL_UNIT_CONFIG_TID = 124; // "__all_unit_config" +const uint64_t OB_ALL_RESOURCE_POOL_TID = 125; // "__all_resource_pool" +const uint64_t OB_ALL_TENANT_RESOURCE_USAGE_TID = 126; // "__all_tenant_resource_usage" +const uint64_t OB_ALL_SEQUENCE_TID = 127; // "__all_sequence" +const uint64_t OB_ALL_CHARSET_TID = 128; // "__all_charset" +const uint64_t OB_ALL_COLLATION_TID = 129; // "__all_collation" +const uint64_t OB_ALL_LOCAL_INDEX_STATUS_TID = 134; // "__all_local_index_status" +const uint64_t OB_ALL_DUMMY_TID = 135; // "__all_dummy" +const uint64_t OB_ALL_FROZEN_MAP_TID = 136; // "__all_frozen_map" +const uint64_t OB_ALL_CLOG_HISTORY_INFO_TID = 137; // "__all_clog_history_info" +const uint64_t OB_ALL_CLOG_HISTORY_INFO_V2_TID = 139; // "__all_clog_history_info_v2" +const uint64_t OB_ALL_ROOTSERVICE_EVENT_HISTORY_TID = 140; // "__all_rootservice_event_history" +const uint64_t OB_ALL_PRIVILEGE_TID = 141; // "__all_privilege" +const uint64_t OB_ALL_OUTLINE_TID = 142; // "__all_outline" +const uint64_t OB_ALL_OUTLINE_HISTORY_TID = 143; // "__all_outline_history" +const uint64_t OB_ALL_ELECTION_EVENT_HISTORY_TID = 144; // "__all_election_event_history" +const uint64_t OB_ALL_RECYCLEBIN_TID = 145; // "__all_recyclebin" +const uint64_t OB_ALL_PART_TID = 146; // "__all_part" +const uint64_t OB_ALL_PART_HISTORY_TID = 147; // "__all_part_history" +const uint64_t OB_ALL_SUB_PART_TID = 148; // "__all_sub_part" +const uint64_t OB_ALL_SUB_PART_HISTORY_TID = 149; // "__all_sub_part_history" +const uint64_t OB_ALL_PART_INFO_TID = 150; // "__all_part_info" +const uint64_t OB_ALL_PART_INFO_HISTORY_TID = 151; // "__all_part_info_history" +const uint64_t OB_ALL_DEF_SUB_PART_TID = 152; // "__all_def_sub_part" +const uint64_t OB_ALL_DEF_SUB_PART_HISTORY_TID = 153; // "__all_def_sub_part_history" +const uint64_t OB_ALL_SERVER_EVENT_HISTORY_TID = 154; // "__all_server_event_history" +const uint64_t OB_ALL_ROOTSERVICE_JOB_TID = 155; // "__all_rootservice_job" +const uint64_t OB_ALL_UNIT_LOAD_HISTORY_TID = 156; // "__all_unit_load_history" +const uint64_t OB_ALL_SYS_VARIABLE_HISTORY_TID = 157; // "__all_sys_variable_history" +const uint64_t OB_ALL_RESTORE_JOB_TID = 158; // "__all_restore_job" +const uint64_t OB_ALL_RESTORE_TASK_TID = 159; // "__all_restore_task" +const uint64_t OB_ALL_RESTORE_JOB_HISTORY_TID = 160; // "__all_restore_job_history" +const uint64_t OB_ALL_TIME_ZONE_TID = 161; // "__all_time_zone" +const uint64_t OB_ALL_TIME_ZONE_NAME_TID = 162; // "__all_time_zone_name" +const uint64_t OB_ALL_TIME_ZONE_TRANSITION_TID = 163; // "__all_time_zone_transition" +const uint64_t OB_ALL_TIME_ZONE_TRANSITION_TYPE_TID = 164; // "__all_time_zone_transition_type" +const uint64_t OB_ALL_DDL_ID_TID = 165; // "__all_ddl_id" +const uint64_t OB_ALL_FOREIGN_KEY_TID = 166; // "__all_foreign_key" +const uint64_t OB_ALL_FOREIGN_KEY_HISTORY_TID = 167; // "__all_foreign_key_history" +const uint64_t OB_ALL_FOREIGN_KEY_COLUMN_TID = 168; // "__all_foreign_key_column" +const uint64_t OB_ALL_FOREIGN_KEY_COLUMN_HISTORY_TID = 169; // "__all_foreign_key_column_history" +const uint64_t OB_ALL_SYNONYM_TID = 180; // "__all_synonym" +const uint64_t OB_ALL_SYNONYM_HISTORY_TID = 181; // "__all_synonym_history" +const uint64_t OB_ALL_SEQUENCE_V2_TID = 182; // "__all_sequence_v2" +const uint64_t OB_ALL_TENANT_META_TABLE_TID = 183; // "__all_tenant_meta_table" +const uint64_t OB_ALL_INDEX_WAIT_TRANSACTION_STATUS_TID = 186; // "__all_index_wait_transaction_status" +const uint64_t OB_ALL_INDEX_SCHEDULE_TASK_TID = 187; // "__all_index_schedule_task" +const uint64_t OB_ALL_INDEX_CHECKSUM_TID = 188; // "__all_index_checksum" +const uint64_t OB_ALL_ROUTINE_TID = 189; // "__all_routine" +const uint64_t OB_ALL_ROUTINE_HISTORY_TID = 190; // "__all_routine_history" +const uint64_t OB_ALL_ROUTINE_PARAM_TID = 191; // "__all_routine_param" +const uint64_t OB_ALL_ROUTINE_PARAM_HISTORY_TID = 192; // "__all_routine_param_history" +const uint64_t OB_ALL_TABLE_STAT_TID = 193; // "__all_table_stat" +const uint64_t OB_ALL_COLUMN_STAT_TID = 194; // "__all_column_stat" +const uint64_t OB_ALL_HISTOGRAM_STAT_TID = 195; // "__all_histogram_stat" +const uint64_t OB_ALL_PACKAGE_TID = 196; // "__all_package" +const uint64_t OB_ALL_PACKAGE_HISTORY_TID = 197; // "__all_package_history" +const uint64_t OB_ALL_SQL_EXECUTE_TASK_TID = 198; // "__all_sql_execute_task" +const uint64_t OB_ALL_INDEX_BUILD_STAT_TID = 199; // "__all_index_build_stat" +const uint64_t OB_ALL_BUILD_INDEX_PARAM_TID = 200; // "__all_build_index_param" +const uint64_t OB_ALL_GLOBAL_INDEX_DATA_SRC_TID = 201; // "__all_global_index_data_src" +const uint64_t OB_ALL_ACQUIRED_SNAPSHOT_TID = 202; // "__all_acquired_snapshot" +const uint64_t OB_ALL_IMMEDIATE_EFFECT_INDEX_SSTABLE_TID = 203; // "__all_immediate_effect_index_sstable" +const uint64_t OB_ALL_SSTABLE_CHECKSUM_TID = 204; // "__all_sstable_checksum" +const uint64_t OB_ALL_TENANT_GC_PARTITION_INFO_TID = 205; // "__all_tenant_gc_partition_info" +const uint64_t OB_ALL_CONSTRAINT_TID = 206; // "__all_constraint" +const uint64_t OB_ALL_CONSTRAINT_HISTORY_TID = 207; // "__all_constraint_history" +const uint64_t OB_ALL_ORI_SCHEMA_VERSION_TID = 208; // "__all_ori_schema_version" +const uint64_t OB_ALL_FUNC_TID = 209; // "__all_func" +const uint64_t OB_ALL_FUNC_HISTORY_TID = 210; // "__all_func_history" +const uint64_t OB_ALL_TEMP_TABLE_TID = 211; // "__all_temp_table" +const uint64_t OB_ALL_SSTABLE_COLUMN_CHECKSUM_TID = 212; // "__all_sstable_column_checksum" +const uint64_t OB_ALL_SEQUENCE_OBJECT_TID = 213; // "__all_sequence_object" +const uint64_t OB_ALL_SEQUENCE_OBJECT_HISTORY_TID = 214; // "__all_sequence_object_history" +const uint64_t OB_ALL_SEQUENCE_VALUE_TID = 215; // "__all_sequence_value" +const uint64_t OB_ALL_TENANT_PLAN_BASELINE_TID = 216; // "__all_tenant_plan_baseline" +const uint64_t OB_ALL_TENANT_PLAN_BASELINE_HISTORY_TID = 217; // "__all_tenant_plan_baseline_history" +const uint64_t OB_ALL_DDL_HELPER_TID = 218; // "__all_ddl_helper" +const uint64_t OB_ALL_FREEZE_SCHEMA_VERSION_TID = 219; // "__all_freeze_schema_version" +const uint64_t OB_ALL_TYPE_TID = 220; // "__all_type" +const uint64_t OB_ALL_TYPE_HISTORY_TID = 221; // "__all_type_history" +const uint64_t OB_ALL_TYPE_ATTR_TID = 222; // "__all_type_attr" +const uint64_t OB_ALL_TYPE_ATTR_HISTORY_TID = 223; // "__all_type_attr_history" +const uint64_t OB_ALL_COLL_TYPE_TID = 224; // "__all_coll_type" +const uint64_t OB_ALL_COLL_TYPE_HISTORY_TID = 225; // "__all_coll_type_history" +const uint64_t OB_ALL_WEAK_READ_SERVICE_TID = 226; // "__all_weak_read_service" +const uint64_t OB_ALL_GTS_TID = 229; // "__all_gts" +const uint64_t OB_ALL_TENANT_GTS_TID = 230; // "__all_tenant_gts" +const uint64_t OB_ALL_PARTITION_MEMBER_LIST_TID = 231; // "__all_partition_member_list" +const uint64_t OB_ALL_DBLINK_TID = 232; // "__all_dblink" +const uint64_t OB_ALL_DBLINK_HISTORY_TID = 233; // "__all_dblink_history" +const uint64_t OB_ALL_TENANT_PARTITION_META_TABLE_TID = 234; // "__all_tenant_partition_meta_table" +const uint64_t OB_ALL_TENANT_ROLE_GRANTEE_MAP_TID = 235; // "__all_tenant_role_grantee_map" +const uint64_t OB_ALL_TENANT_ROLE_GRANTEE_MAP_HISTORY_TID = 236; // "__all_tenant_role_grantee_map_history" +const uint64_t OB_ALL_TENANT_KEYSTORE_TID = 237; // "__all_tenant_keystore" +const uint64_t OB_ALL_TENANT_KEYSTORE_HISTORY_TID = 238; // "__all_tenant_keystore_history" +const uint64_t OB_ALL_TENANT_TABLESPACE_TID = 247; // "__all_tenant_tablespace" +const uint64_t OB_ALL_TENANT_TABLESPACE_HISTORY_TID = 248; // "__all_tenant_tablespace_history" +const uint64_t OB_ALL_TENANT_USER_FAILED_LOGIN_STAT_TID = 249; // "__all_tenant_user_failed_login_stat" +const uint64_t OB_ALL_TENANT_PROFILE_TID = 250; // "__all_tenant_profile" +const uint64_t OB_ALL_TENANT_PROFILE_HISTORY_TID = 251; // "__all_tenant_profile_history" +const uint64_t OB_ALL_TENANT_SECURITY_AUDIT_TID = 252; // "__all_tenant_security_audit" +const uint64_t OB_ALL_TENANT_SECURITY_AUDIT_HISTORY_TID = 253; // "__all_tenant_security_audit_history" +const uint64_t OB_ALL_TENANT_TRIGGER_TID = 254; // "__all_tenant_trigger" +const uint64_t OB_ALL_TENANT_TRIGGER_HISTORY_TID = 255; // "__all_tenant_trigger_history" +const uint64_t OB_ALL_SEED_PARAMETER_TID = 256; // "__all_seed_parameter" +const uint64_t OB_ALL_TENANT_SSTABLE_COLUMN_CHECKSUM_TID = 258; // "__all_tenant_sstable_column_checksum" +const uint64_t OB_ALL_TENANT_SECURITY_AUDIT_RECORD_TID = 259; // "__all_tenant_security_audit_record" +const uint64_t OB_ALL_TENANT_SYSAUTH_TID = 260; // "__all_tenant_sysauth" +const uint64_t OB_ALL_TENANT_SYSAUTH_HISTORY_TID = 261; // "__all_tenant_sysauth_history" +const uint64_t OB_ALL_TENANT_OBJAUTH_TID = 262; // "__all_tenant_objauth" +const uint64_t OB_ALL_TENANT_OBJAUTH_HISTORY_TID = 263; // "__all_tenant_objauth_history" +const uint64_t OB_ALL_TENANT_BACKUP_INFO_TID = 264; // "__all_tenant_backup_info" +const uint64_t OB_ALL_RESTORE_INFO_TID = 265; // "__all_restore_info" +const uint64_t OB_ALL_TENANT_BACKUP_LOG_ARCHIVE_STATUS_TID = 266; // "__all_tenant_backup_log_archive_status" +const uint64_t OB_ALL_BACKUP_LOG_ARCHIVE_STATUS_HISTORY_TID = 267; // "__all_backup_log_archive_status_history" +const uint64_t OB_ALL_TENANT_BACKUP_TASK_TID = 268; // "__all_tenant_backup_task" +const uint64_t OB_ALL_BACKUP_TASK_HISTORY_TID = 269; // "__all_backup_task_history" +const uint64_t OB_ALL_TENANT_PG_BACKUP_TASK_TID = 270; // "__all_tenant_pg_backup_task" +const uint64_t OB_ALL_TENANT_ERROR_TID = 272; // "__all_tenant_error" +const uint64_t OB_ALL_SERVER_RECOVERY_STATUS_TID = 273; // "__all_server_recovery_status" +const uint64_t OB_ALL_DATAFILE_RECOVERY_STATUS_TID = 274; // "__all_datafile_recovery_status" +const uint64_t OB_ALL_TENANT_BACKUP_CLEAN_INFO_TID = 276; // "__all_tenant_backup_clean_info" +const uint64_t OB_ALL_BACKUP_CLEAN_INFO_HISTORY_TID = 277; // "__all_backup_clean_info_history" +const uint64_t OB_ALL_BACKUP_TASK_CLEAN_HISTORY_TID = 278; // "__all_backup_task_clean_history" +const uint64_t OB_ALL_RESTORE_PROGRESS_TID = 279; // "__all_restore_progress" +const uint64_t OB_ALL_RESTORE_HISTORY_TID = 280; // "__all_restore_history" +const uint64_t OB_ALL_TENANT_RESTORE_PG_INFO_TID = 281; // "__all_tenant_restore_pg_info" +const uint64_t OB_ALL_TABLE_V2_HISTORY_TID = 282; // "__all_table_v2_history" +const uint64_t OB_ALL_TENANT_OBJECT_TYPE_TID = 283; // "__all_tenant_object_type" +const uint64_t OB_ALL_TENANT_OBJECT_TYPE_HISTORY_TID = 284; // "__all_tenant_object_type_history" +const uint64_t OB_ALL_BACKUP_VALIDATION_JOB_TID = 285; // "__all_backup_validation_job" +const uint64_t OB_ALL_BACKUP_VALIDATION_JOB_HISTORY_TID = 286; // "__all_backup_validation_job_history" +const uint64_t OB_ALL_TENANT_BACKUP_VALIDATION_TASK_TID = 287; // "__all_tenant_backup_validation_task" +const uint64_t OB_ALL_BACKUP_VALIDATION_TASK_HISTORY_TID = 288; // "__all_backup_validation_task_history" +const uint64_t OB_ALL_TENANT_PG_BACKUP_VALIDATION_TASK_TID = 289; // "__all_tenant_pg_backup_validation_task" +const uint64_t OB_ALL_TENANT_TIME_ZONE_TID = 290; // "__all_tenant_time_zone" +const uint64_t OB_ALL_TENANT_TIME_ZONE_NAME_TID = 291; // "__all_tenant_time_zone_name" +const uint64_t OB_ALL_TENANT_TIME_ZONE_TRANSITION_TID = 292; // "__all_tenant_time_zone_transition" +const uint64_t OB_ALL_TENANT_TIME_ZONE_TRANSITION_TYPE_TID = 293; // "__all_tenant_time_zone_transition_type" +const uint64_t OB_ALL_TENANT_CONSTRAINT_COLUMN_TID = 294; // "__all_tenant_constraint_column" +const uint64_t OB_ALL_TENANT_CONSTRAINT_COLUMN_HISTORY_TID = 295; // "__all_tenant_constraint_column_history" +const uint64_t OB_ALL_TENANT_GLOBAL_TRANSACTION_TID = 296; // "__all_tenant_global_transaction" +const uint64_t OB_ALL_TENANT_DEPENDENCY_TID = 297; // "__all_tenant_dependency" +const uint64_t OB_ALL_BACKUP_BACKUPSET_JOB_TID = 298; // "__all_backup_backupset_job" +const uint64_t OB_ALL_BACKUP_BACKUPSET_JOB_HISTORY_TID = 299; // "__all_backup_backupset_job_history" +const uint64_t OB_ALL_TENANT_BACKUP_BACKUPSET_TASK_TID = 300; // "__all_tenant_backup_backupset_task" +const uint64_t OB_ALL_BACKUP_BACKUPSET_TASK_HISTORY_TID = 301; // "__all_backup_backupset_task_history" +const uint64_t OB_ALL_TENANT_PG_BACKUP_BACKUPSET_TASK_TID = 302; // "__all_tenant_pg_backup_backupset_task" +const uint64_t OB_ALL_TENANT_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TID = 303; // "__all_tenant_backup_backup_log_archive_status" +const uint64_t OB_ALL_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_HISTORY_TID = 304; // "__all_backup_backup_log_archive_status_history" +const uint64_t OB_ALL_RES_MGR_PLAN_TID = 305; // "__all_res_mgr_plan" +const uint64_t OB_ALL_RES_MGR_DIRECTIVE_TID = 306; // "__all_res_mgr_directive" +const uint64_t OB_ALL_RES_MGR_MAPPING_RULE_TID = 307; // "__all_res_mgr_mapping_rule" +const uint64_t OB_ALL_RES_MGR_CONSUMER_GROUP_TID = 316; // "__all_res_mgr_consumer_group" +const uint64_t OB_TENANT_VIRTUAL_ALL_TABLE_TID = 10001; // "__tenant_virtual_all_table" +const uint64_t OB_TENANT_VIRTUAL_TABLE_COLUMN_TID = 10002; // "__tenant_virtual_table_column" +const uint64_t OB_TENANT_VIRTUAL_TABLE_INDEX_TID = 10003; // "__tenant_virtual_table_index" +const uint64_t OB_TENANT_VIRTUAL_SHOW_CREATE_DATABASE_TID = 10004; // "__tenant_virtual_show_create_database" +const uint64_t OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_TID = 10005; // "__tenant_virtual_show_create_table" +const uint64_t OB_TENANT_VIRTUAL_SESSION_VARIABLE_TID = 10006; // "__tenant_virtual_session_variable" +const uint64_t OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_TID = 10007; // "__tenant_virtual_privilege_grant" +const uint64_t OB_ALL_VIRTUAL_PROCESSLIST_TID = 10008; // "__all_virtual_processlist" +const uint64_t OB_TENANT_VIRTUAL_WARNING_TID = 10009; // "__tenant_virtual_warning" +const uint64_t OB_TENANT_VIRTUAL_CURRENT_TENANT_TID = 10010; // "__tenant_virtual_current_tenant" +const uint64_t OB_TENANT_VIRTUAL_DATABASE_STATUS_TID = 10011; // "__tenant_virtual_database_status" +const uint64_t OB_TENANT_VIRTUAL_TENANT_STATUS_TID = 10012; // "__tenant_virtual_tenant_status" +const uint64_t OB_TENANT_VIRTUAL_INTERM_RESULT_TID = 10013; // "__tenant_virtual_interm_result" +const uint64_t OB_TENANT_VIRTUAL_PARTITION_STAT_TID = 10014; // "__tenant_virtual_partition_stat" +const uint64_t OB_TENANT_VIRTUAL_STATNAME_TID = 10015; // "__tenant_virtual_statname" +const uint64_t OB_TENANT_VIRTUAL_EVENT_NAME_TID = 10016; // "__tenant_virtual_event_name" +const uint64_t OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_TID = 10017; // "__tenant_virtual_global_variable" +const uint64_t OB_TENANT_VIRTUAL_SHOW_TABLES_TID = 10018; // "__tenant_virtual_show_tables" +const uint64_t OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_TID = 10019; // "__tenant_virtual_show_create_procedure" +const uint64_t OB_ALL_VIRTUAL_CORE_META_TABLE_TID = 11001; // "__all_virtual_core_meta_table" +const uint64_t OB_ALL_VIRTUAL_ZONE_STAT_TID = 11002; // "__all_virtual_zone_stat" +const uint64_t OB_ALL_VIRTUAL_PLAN_CACHE_STAT_TID = 11003; // "__all_virtual_plan_cache_stat" +const uint64_t OB_ALL_VIRTUAL_PLAN_STAT_TID = 11004; // "__all_virtual_plan_stat" +const uint64_t OB_ALL_VIRTUAL_MEM_LEAK_CHECKER_INFO_TID = 11006; // "__all_virtual_mem_leak_checker_info" +const uint64_t OB_ALL_VIRTUAL_LATCH_TID = 11007; // "__all_virtual_latch" +const uint64_t OB_ALL_VIRTUAL_KVCACHE_INFO_TID = 11008; // "__all_virtual_kvcache_info" +const uint64_t OB_ALL_VIRTUAL_DATA_TYPE_CLASS_TID = 11009; // "__all_virtual_data_type_class" +const uint64_t OB_ALL_VIRTUAL_DATA_TYPE_TID = 11010; // "__all_virtual_data_type" +const uint64_t OB_ALL_VIRTUAL_SERVER_STAT_TID = 11011; // "__all_virtual_server_stat" +const uint64_t OB_ALL_VIRTUAL_REBALANCE_TASK_STAT_TID = 11012; // "__all_virtual_rebalance_task_stat" +const uint64_t OB_ALL_VIRTUAL_SESSION_EVENT_TID = 11013; // "__all_virtual_session_event" +const uint64_t OB_ALL_VIRTUAL_SESSION_WAIT_TID = 11014; // "__all_virtual_session_wait" +const uint64_t OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_TID = 11015; // "__all_virtual_session_wait_history" +const uint64_t OB_ALL_VIRTUAL_SYSTEM_EVENT_TID = 11017; // "__all_virtual_system_event" +const uint64_t OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_TID = 11018; // "__all_virtual_tenant_memstore_info" +const uint64_t OB_ALL_VIRTUAL_CONCURRENCY_OBJECT_POOL_TID = 11019; // "__all_virtual_concurrency_object_pool" +const uint64_t OB_ALL_VIRTUAL_SESSTAT_TID = 11020; // "__all_virtual_sesstat" +const uint64_t OB_ALL_VIRTUAL_SYSSTAT_TID = 11021; // "__all_virtual_sysstat" +const uint64_t OB_ALL_VIRTUAL_STORAGE_STAT_TID = 11022; // "__all_virtual_storage_stat" +const uint64_t OB_ALL_VIRTUAL_DISK_STAT_TID = 11023; // "__all_virtual_disk_stat" +const uint64_t OB_ALL_VIRTUAL_MEMSTORE_INFO_TID = 11024; // "__all_virtual_memstore_info" +const uint64_t OB_ALL_VIRTUAL_PARTITION_INFO_TID = 11025; // "__all_virtual_partition_info" +const uint64_t OB_ALL_VIRTUAL_UPGRADE_INSPECTION_TID = 11026; // "__all_virtual_upgrade_inspection" +const uint64_t OB_ALL_VIRTUAL_TRANS_STAT_TID = 11027; // "__all_virtual_trans_stat" +const uint64_t OB_ALL_VIRTUAL_TRANS_MGR_STAT_TID = 11028; // "__all_virtual_trans_mgr_stat" +const uint64_t OB_ALL_VIRTUAL_ELECTION_INFO_TID = 11029; // "__all_virtual_election_info" +const uint64_t OB_ALL_VIRTUAL_ELECTION_MEM_STAT_TID = 11030; // "__all_virtual_election_mem_stat" +const uint64_t OB_ALL_VIRTUAL_SQL_AUDIT_TID = 11031; // "__all_virtual_sql_audit" +const uint64_t OB_ALL_VIRTUAL_TRANS_MEM_STAT_TID = 11032; // "__all_virtual_trans_mem_stat" +const uint64_t OB_ALL_VIRTUAL_PARTITION_SSTABLE_IMAGE_INFO_TID = 11033; // "__all_virtual_partition_sstable_image_info" +const uint64_t OB_ALL_VIRTUAL_CORE_ROOT_TABLE_TID = 11034; // "__all_virtual_core_root_table" +const uint64_t OB_ALL_VIRTUAL_CORE_ALL_TABLE_TID = 11035; // "__all_virtual_core_all_table" +const uint64_t OB_ALL_VIRTUAL_CORE_COLUMN_TABLE_TID = 11036; // "__all_virtual_core_column_table" +const uint64_t OB_ALL_VIRTUAL_MEMORY_INFO_TID = 11037; // "__all_virtual_memory_info" +const uint64_t OB_ALL_VIRTUAL_TENANT_STAT_TID = 11038; // "__all_virtual_tenant_stat" +const uint64_t OB_ALL_VIRTUAL_SYS_PARAMETER_STAT_TID = 11039; // "__all_virtual_sys_parameter_stat" +const uint64_t OB_ALL_VIRTUAL_PARTITION_REPLAY_STATUS_TID = 11040; // "__all_virtual_partition_replay_status" +const uint64_t OB_ALL_VIRTUAL_CLOG_STAT_TID = 11041; // "__all_virtual_clog_stat" +const uint64_t OB_ALL_VIRTUAL_TRACE_LOG_TID = 11042; // "__all_virtual_trace_log" +const uint64_t OB_ALL_VIRTUAL_ENGINE_TID = 11043; // "__all_virtual_engine" +const uint64_t OB_ALL_VIRTUAL_PROXY_SERVER_STAT_TID = 11045; // "__all_virtual_proxy_server_stat" +const uint64_t OB_ALL_VIRTUAL_PROXY_SYS_VARIABLE_TID = 11046; // "__all_virtual_proxy_sys_variable" +const uint64_t OB_ALL_VIRTUAL_PROXY_SCHEMA_TID = 11047; // "__all_virtual_proxy_schema" +const uint64_t OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_TID = 11048; // "__all_virtual_plan_cache_plan_explain" +const uint64_t OB_ALL_VIRTUAL_OBRPC_STAT_TID = 11049; // "__all_virtual_obrpc_stat" +const uint64_t OB_ALL_VIRTUAL_PARTITION_SSTABLE_MERGE_INFO_TID = 11051; // "__all_virtual_partition_sstable_merge_info" +const uint64_t OB_ALL_VIRTUAL_SQL_MONITOR_TID = 11052; // "__all_virtual_sql_monitor" +const uint64_t OB_TENANT_VIRTUAL_OUTLINE_TID = 11053; // "__tenant_virtual_outline" +const uint64_t OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_TID = 11054; // "__tenant_virtual_concurrent_limit_sql" +const uint64_t OB_ALL_VIRTUAL_SQL_PLAN_STATISTICS_TID = 11055; // "__all_virtual_sql_plan_statistics" +const uint64_t OB_ALL_VIRTUAL_PARTITION_SSTABLE_MACRO_INFO_TID = 11056; // "__all_virtual_partition_sstable_macro_info" +const uint64_t OB_ALL_VIRTUAL_PROXY_PARTITION_INFO_TID = 11057; // "__all_virtual_proxy_partition_info" +const uint64_t OB_ALL_VIRTUAL_PROXY_PARTITION_TID = 11058; // "__all_virtual_proxy_partition" +const uint64_t OB_ALL_VIRTUAL_PROXY_SUB_PARTITION_TID = 11059; // "__all_virtual_proxy_sub_partition" +const uint64_t OB_ALL_VIRTUAL_PROXY_ROUTE_TID = 11060; // "__all_virtual_proxy_route" +const uint64_t OB_ALL_VIRTUAL_REBALANCE_TENANT_STAT_TID = 11061; // "__all_virtual_rebalance_tenant_stat" +const uint64_t OB_ALL_VIRTUAL_REBALANCE_UNIT_STAT_TID = 11062; // "__all_virtual_rebalance_unit_stat" +const uint64_t OB_ALL_VIRTUAL_REBALANCE_REPLICA_STAT_TID = 11063; // "__all_virtual_rebalance_replica_stat" +const uint64_t OB_ALL_VIRTUAL_PARTITION_AMPLIFICATION_STAT_TID = 11064; // "__all_virtual_partition_amplification_stat" +const uint64_t OB_ALL_VIRTUAL_ELECTION_EVENT_HISTORY_TID = 11067; // "__all_virtual_election_event_history" +const uint64_t OB_ALL_VIRTUAL_PARTITION_STORE_INFO_TID = 11068; // "__all_virtual_partition_store_info" +const uint64_t OB_ALL_VIRTUAL_LEADER_STAT_TID = 11069; // "__all_virtual_leader_stat" +const uint64_t OB_ALL_VIRTUAL_PARTITION_MIGRATION_STATUS_TID = 11070; // "__all_virtual_partition_migration_status" +const uint64_t OB_ALL_VIRTUAL_SYS_TASK_STATUS_TID = 11071; // "__all_virtual_sys_task_status" +const uint64_t OB_ALL_VIRTUAL_MACRO_BLOCK_MARKER_STATUS_TID = 11072; // "__all_virtual_macro_block_marker_status" +const uint64_t OB_ALL_VIRTUAL_SERVER_CLOG_STAT_TID = 11073; // "__all_virtual_server_clog_stat" +const uint64_t OB_ALL_VIRTUAL_ROOTSERVICE_STAT_TID = 11074; // "__all_virtual_rootservice_stat" +const uint64_t OB_ALL_VIRTUAL_ELECTION_PRIORITY_TID = 11075; // "__all_virtual_election_priority" +const uint64_t OB_ALL_VIRTUAL_TENANT_DISK_STAT_TID = 11076; // "__all_virtual_tenant_disk_stat" +const uint64_t OB_ALL_VIRTUAL_REBALANCE_MAP_STAT_TID = 11078; // "__all_virtual_rebalance_map_stat" +const uint64_t OB_ALL_VIRTUAL_REBALANCE_MAP_ITEM_STAT_TID = 11079; // "__all_virtual_rebalance_map_item_stat" +const uint64_t OB_ALL_VIRTUAL_IO_STAT_TID = 11080; // "__all_virtual_io_stat" +const uint64_t OB_ALL_VIRTUAL_LONG_OPS_STATUS_TID = 11081; // "__all_virtual_long_ops_status" +const uint64_t OB_ALL_VIRTUAL_REBALANCE_UNIT_MIGRATE_STAT_TID = 11082; // "__all_virtual_rebalance_unit_migrate_stat" +const uint64_t OB_ALL_VIRTUAL_REBALANCE_UNIT_DISTRIBUTION_STAT_TID = 11083; // "__all_virtual_rebalance_unit_distribution_stat" +const uint64_t OB_ALL_VIRTUAL_SERVER_OBJECT_POOL_TID = 11084; // "__all_virtual_server_object_pool" +const uint64_t OB_ALL_VIRTUAL_TRANS_LOCK_STAT_TID = 11085; // "__all_virtual_trans_lock_stat" +const uint64_t OB_ALL_VIRTUAL_ELECTION_GROUP_INFO_TID = 11086; // "__all_virtual_election_group_info" +const uint64_t OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_TID = 11087; // "__tenant_virtual_show_create_tablegroup" +const uint64_t OB_ALL_VIRTUAL_SERVER_BLACKLIST_TID = 11088; // "__all_virtual_server_blacklist" +const uint64_t OB_ALL_VIRTUAL_PARTITION_SPLIT_INFO_TID = 11089; // "__all_virtual_partition_split_info" +const uint64_t OB_ALL_VIRTUAL_TRANS_RESULT_INFO_STAT_TID = 11090; // "__all_virtual_trans_result_info_stat" +const uint64_t OB_ALL_VIRTUAL_DUPLICATE_PARTITION_MGR_STAT_TID = 11091; // "__all_virtual_duplicate_partition_mgr_stat" +const uint64_t OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_TID = 11092; // "__all_virtual_tenant_parameter_stat" +const uint64_t OB_ALL_VIRTUAL_SERVER_SCHEMA_INFO_TID = 11093; // "__all_virtual_server_schema_info" +const uint64_t OB_ALL_VIRTUAL_MEMORY_CONTEXT_STAT_TID = 11094; // "__all_virtual_memory_context_stat" +const uint64_t OB_ALL_VIRTUAL_DUMP_TENANT_INFO_TID = 11095; // "__all_virtual_dump_tenant_info" +const uint64_t OB_ALL_VIRTUAL_TENANT_PARAMETER_INFO_TID = 11096; // "__all_virtual_tenant_parameter_info" +const uint64_t OB_ALL_VIRTUAL_DAG_WARNING_HISTORY_TID = 11099; // "__all_virtual_dag_warning_history" +const uint64_t OB_SESSION_VARIABLES_TID = 12001; // "SESSION_VARIABLES" +const uint64_t OB_TABLE_PRIVILEGES_TID = 12002; // "TABLE_PRIVILEGES" +const uint64_t OB_USER_PRIVILEGES_TID = 12003; // "USER_PRIVILEGES" +const uint64_t OB_SCHEMA_PRIVILEGES_TID = 12004; // "SCHEMA_PRIVILEGES" +const uint64_t OB_TABLE_CONSTRAINTS_TID = 12005; // "TABLE_CONSTRAINTS" +const uint64_t OB_GLOBAL_STATUS_TID = 12006; // "GLOBAL_STATUS" +const uint64_t OB_PARTITIONS_TID = 12007; // "PARTITIONS" +const uint64_t OB_SESSION_STATUS_TID = 12008; // "SESSION_STATUS" +const uint64_t OB_USER_TID = 12009; // "user" +const uint64_t OB_DB_TID = 12010; // "db" +const uint64_t OB_ALL_VIRTUAL_SERVER_MEMORY_INFO_TID = 12011; // "__all_virtual_server_memory_info" +const uint64_t OB_ALL_VIRTUAL_PARTITION_TABLE_TID = 12012; // "__all_virtual_partition_table" +const uint64_t OB_ALL_VIRTUAL_LOCK_WAIT_STAT_TID = 12013; // "__all_virtual_lock_wait_stat" +const uint64_t OB_ALL_VIRTUAL_PARTITION_ITEM_TID = 12014; // "__all_virtual_partition_item" +const uint64_t OB_ALL_VIRTUAL_REPLICA_TASK_TID = 12015; // "__all_virtual_replica_task" +const uint64_t OB_ALL_VIRTUAL_PARTITION_LOCATION_TID = 12016; // "__all_virtual_partition_location" +const uint64_t OB_PROC_TID = 12030; // "proc" +const uint64_t OB_TENANT_VIRTUAL_COLLATION_TID = 12031; // "__tenant_virtual_collation" +const uint64_t OB_TENANT_VIRTUAL_CHARSET_TID = 12032; // "__tenant_virtual_charset" +const uint64_t OB_ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_TID = 12033; // "__all_virtual_tenant_memstore_allocator_info" +const uint64_t OB_ALL_VIRTUAL_TABLE_MGR_TID = 12034; // "__all_virtual_table_mgr" +const uint64_t OB_ALL_VIRTUAL_META_TABLE_TID = 12035; // "__all_virtual_meta_table" +const uint64_t OB_ALL_VIRTUAL_FREEZE_INFO_TID = 12036; // "__all_virtual_freeze_info" +const uint64_t OB_PARAMETERS_TID = 12037; // "PARAMETERS" +const uint64_t OB_ALL_VIRTUAL_BAD_BLOCK_TABLE_TID = 12038; // "__all_virtual_bad_block_table" +const uint64_t OB_ALL_VIRTUAL_PX_WORKER_STAT_TID = 12039; // "__all_virtual_px_worker_stat" +const uint64_t OB_ALL_VIRTUAL_TRANS_AUDIT_TID = 12040; // "__all_virtual_trans_audit" +const uint64_t OB_ALL_VIRTUAL_TRANS_SQL_AUDIT_TID = 12041; // "__all_virtual_trans_sql_audit" +const uint64_t OB_ALL_VIRTUAL_WEAK_READ_STAT_TID = 12042; // "__all_virtual_weak_read_stat" +const uint64_t OB_ALL_VIRTUAL_PARTITION_AUDIT_TID = 12054; // "__all_virtual_partition_audit" +const uint64_t OB_ALL_VIRTUAL_SEQUENCE_V2_TID = 12055; // "__all_virtual_sequence_v2" +const uint64_t OB_ALL_VIRTUAL_SEQUENCE_VALUE_TID = 12056; // "__all_virtual_sequence_value" +const uint64_t OB_ALL_VIRTUAL_CLUSTER_TID = 12057; // "__all_virtual_cluster" +const uint64_t OB_ALL_VIRTUAL_PARTITION_TABLE_STORE_STAT_TID = 12058; // "__all_virtual_partition_table_store_stat" +const uint64_t OB_ALL_VIRTUAL_DDL_OPERATION_TID = 12059; // "__all_virtual_ddl_operation" +const uint64_t OB_ALL_VIRTUAL_OUTLINE_TID = 12060; // "__all_virtual_outline" +const uint64_t OB_ALL_VIRTUAL_OUTLINE_HISTORY_TID = 12061; // "__all_virtual_outline_history" +const uint64_t OB_ALL_VIRTUAL_SYNONYM_TID = 12062; // "__all_virtual_synonym" +const uint64_t OB_ALL_VIRTUAL_SYNONYM_HISTORY_TID = 12063; // "__all_virtual_synonym_history" +const uint64_t OB_ALL_VIRTUAL_DATABASE_PRIVILEGE_TID = 12064; // "__all_virtual_database_privilege" +const uint64_t OB_ALL_VIRTUAL_DATABASE_PRIVILEGE_HISTORY_TID = 12065; // "__all_virtual_database_privilege_history" +const uint64_t OB_ALL_VIRTUAL_TABLE_PRIVILEGE_TID = 12066; // "__all_virtual_table_privilege" +const uint64_t OB_ALL_VIRTUAL_TABLE_PRIVILEGE_HISTORY_TID = 12067; // "__all_virtual_table_privilege_history" +const uint64_t OB_ALL_VIRTUAL_DATABASE_TID = 12068; // "__all_virtual_database" +const uint64_t OB_ALL_VIRTUAL_DATABASE_HISTORY_TID = 12069; // "__all_virtual_database_history" +const uint64_t OB_ALL_VIRTUAL_TABLEGROUP_TID = 12070; // "__all_virtual_tablegroup" +const uint64_t OB_ALL_VIRTUAL_TABLEGROUP_HISTORY_TID = 12071; // "__all_virtual_tablegroup_history" +const uint64_t OB_ALL_VIRTUAL_TABLE_TID = 12072; // "__all_virtual_table" +const uint64_t OB_ALL_VIRTUAL_TABLE_HISTORY_TID = 12073; // "__all_virtual_table_history" +const uint64_t OB_ALL_VIRTUAL_COLUMN_TID = 12074; // "__all_virtual_column" +const uint64_t OB_ALL_VIRTUAL_COLUMN_HISTORY_TID = 12075; // "__all_virtual_column_history" +const uint64_t OB_ALL_VIRTUAL_PART_TID = 12076; // "__all_virtual_part" +const uint64_t OB_ALL_VIRTUAL_PART_HISTORY_TID = 12077; // "__all_virtual_part_history" +const uint64_t OB_ALL_VIRTUAL_PART_INFO_TID = 12078; // "__all_virtual_part_info" +const uint64_t OB_ALL_VIRTUAL_PART_INFO_HISTORY_TID = 12079; // "__all_virtual_part_info_history" +const uint64_t OB_ALL_VIRTUAL_DEF_SUB_PART_TID = 12080; // "__all_virtual_def_sub_part" +const uint64_t OB_ALL_VIRTUAL_DEF_SUB_PART_HISTORY_TID = 12081; // "__all_virtual_def_sub_part_history" +const uint64_t OB_ALL_VIRTUAL_SUB_PART_TID = 12082; // "__all_virtual_sub_part" +const uint64_t OB_ALL_VIRTUAL_SUB_PART_HISTORY_TID = 12083; // "__all_virtual_sub_part_history" +const uint64_t OB_ALL_VIRTUAL_CONSTRAINT_TID = 12084; // "__all_virtual_constraint" +const uint64_t OB_ALL_VIRTUAL_CONSTRAINT_HISTORY_TID = 12085; // "__all_virtual_constraint_history" +const uint64_t OB_ALL_VIRTUAL_FOREIGN_KEY_TID = 12086; // "__all_virtual_foreign_key" +const uint64_t OB_ALL_VIRTUAL_FOREIGN_KEY_HISTORY_TID = 12087; // "__all_virtual_foreign_key_history" +const uint64_t OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_TID = 12088; // "__all_virtual_foreign_key_column" +const uint64_t OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_HISTORY_TID = 12089; // "__all_virtual_foreign_key_column_history" +const uint64_t OB_ALL_VIRTUAL_TEMP_TABLE_TID = 12090; // "__all_virtual_temp_table" +const uint64_t OB_ALL_VIRTUAL_ORI_SCHEMA_VERSION_TID = 12091; // "__all_virtual_ori_schema_version" +const uint64_t OB_ALL_VIRTUAL_SYS_STAT_TID = 12092; // "__all_virtual_sys_stat" +const uint64_t OB_ALL_VIRTUAL_USER_TID = 12093; // "__all_virtual_user" +const uint64_t OB_ALL_VIRTUAL_USER_HISTORY_TID = 12094; // "__all_virtual_user_history" +const uint64_t OB_ALL_VIRTUAL_SYS_VARIABLE_TID = 12095; // "__all_virtual_sys_variable" +const uint64_t OB_ALL_VIRTUAL_SYS_VARIABLE_HISTORY_TID = 12096; // "__all_virtual_sys_variable_history" +const uint64_t OB_ALL_VIRTUAL_FUNC_TID = 12097; // "__all_virtual_func" +const uint64_t OB_ALL_VIRTUAL_FUNC_HISTORY_TID = 12098; // "__all_virtual_func_history" +const uint64_t OB_ALL_VIRTUAL_PACKAGE_TID = 12099; // "__all_virtual_package" +const uint64_t OB_ALL_VIRTUAL_PACKAGE_HISTORY_TID = 12100; // "__all_virtual_package_history" +const uint64_t OB_ALL_VIRTUAL_ROUTINE_TID = 12101; // "__all_virtual_routine" +const uint64_t OB_ALL_VIRTUAL_ROUTINE_HISTORY_TID = 12102; // "__all_virtual_routine_history" +const uint64_t OB_ALL_VIRTUAL_ROUTINE_PARAM_TID = 12103; // "__all_virtual_routine_param" +const uint64_t OB_ALL_VIRTUAL_ROUTINE_PARAM_HISTORY_TID = 12104; // "__all_virtual_routine_param_history" +const uint64_t OB_ALL_VIRTUAL_TYPE_TID = 12105; // "__all_virtual_type" +const uint64_t OB_ALL_VIRTUAL_TYPE_HISTORY_TID = 12106; // "__all_virtual_type_history" +const uint64_t OB_ALL_VIRTUAL_TYPE_ATTR_TID = 12107; // "__all_virtual_type_attr" +const uint64_t OB_ALL_VIRTUAL_TYPE_ATTR_HISTORY_TID = 12108; // "__all_virtual_type_attr_history" +const uint64_t OB_ALL_VIRTUAL_COLL_TYPE_TID = 12109; // "__all_virtual_coll_type" +const uint64_t OB_ALL_VIRTUAL_COLL_TYPE_HISTORY_TID = 12110; // "__all_virtual_coll_type_history" +const uint64_t OB_ALL_VIRTUAL_COLUMN_STAT_TID = 12111; // "__all_virtual_column_stat" +const uint64_t OB_ALL_VIRTUAL_TABLE_STAT_TID = 12112; // "__all_virtual_table_stat" +const uint64_t OB_ALL_VIRTUAL_HISTOGRAM_STAT_TID = 12113; // "__all_virtual_histogram_stat" +const uint64_t OB_ALL_VIRTUAL_COLUMN_STATISTIC_TID = 12114; // "__all_virtual_column_statistic" +const uint64_t OB_ALL_VIRTUAL_RECYCLEBIN_TID = 12115; // "__all_virtual_recyclebin" +const uint64_t OB_ALL_VIRTUAL_TENANT_GC_PARTITION_INFO_TID = 12116; // "__all_virtual_tenant_gc_partition_info" +const uint64_t OB_ALL_VIRTUAL_TENANT_PLAN_BASELINE_TID = 12117; // "__all_virtual_tenant_plan_baseline" +const uint64_t OB_ALL_VIRTUAL_TENANT_PLAN_BASELINE_HISTORY_TID = 12118; // "__all_virtual_tenant_plan_baseline_history" +const uint64_t OB_ALL_VIRTUAL_SEQUENCE_OBJECT_TID = 12119; // "__all_virtual_sequence_object" +const uint64_t OB_ALL_VIRTUAL_SEQUENCE_OBJECT_HISTORY_TID = 12120; // "__all_virtual_sequence_object_history" +const uint64_t OB_ALL_VIRTUAL_RAID_STAT_TID = 12121; // "__all_virtual_raid_stat" +const uint64_t OB_ALL_VIRTUAL_SERVER_LOG_META_TID = 12122; // "__all_virtual_server_log_meta" +const uint64_t OB_ALL_VIRTUAL_DTL_CHANNEL_TID = 12123; // "__all_virtual_dtl_channel" +const uint64_t OB_ALL_VIRTUAL_DTL_MEMORY_TID = 12124; // "__all_virtual_dtl_memory" +const uint64_t OB_ALL_VIRTUAL_DTL_FIRST_CACHED_BUFFER_TID = 12125; // "__all_virtual_dtl_first_cached_buffer" +const uint64_t OB_ALL_VIRTUAL_DBLINK_TID = 12126; // "__all_virtual_dblink" +const uint64_t OB_ALL_VIRTUAL_DBLINK_HISTORY_TID = 12127; // "__all_virtual_dblink_history" +const uint64_t OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_TID = 12128; // "__all_virtual_tenant_partition_meta_table" +const uint64_t OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_TID = 12129; // "__all_virtual_tenant_role_grantee_map" +const uint64_t OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_HISTORY_TID = 12130; // "__all_virtual_tenant_role_grantee_map_history" +const uint64_t OB_ALL_VIRTUAL_TENANT_KEYSTORE_TID = 12131; // "__all_virtual_tenant_keystore" +const uint64_t OB_ALL_VIRTUAL_TENANT_KEYSTORE_HISTORY_TID = 12132; // "__all_virtual_tenant_keystore_history" +const uint64_t OB_ALL_VIRTUAL_DEADLOCK_STAT_TID = 12141; // "__all_virtual_deadlock_stat" +const uint64_t OB_ALL_VIRTUAL_TENANT_TABLESPACE_TID = 12142; // "__all_virtual_tenant_tablespace" +const uint64_t OB_ALL_VIRTUAL_TENANT_TABLESPACE_HISTORY_TID = 12143; // "__all_virtual_tenant_tablespace_history" +const uint64_t OB_ALL_VIRTUAL_INFORMATION_COLUMNS_TID = 12144; // "__ALL_VIRTUAL_INFORMATION_COLUMNS" +const uint64_t OB_ALL_VIRTUAL_PG_PARTITION_INFO_TID = 12145; // "__all_virtual_pg_partition_info" +const uint64_t OB_ALL_VIRTUAL_TENANT_USER_FAILED_LOGIN_STAT_TID = 12146; // "__all_virtual_tenant_user_failed_login_stat" +const uint64_t OB_ALL_VIRTUAL_TENANT_PROFILE_TID = 12147; // "__all_virtual_tenant_profile" +const uint64_t OB_ALL_VIRTUAL_TENANT_PROFILE_HISTORY_TID = 12148; // "__all_virtual_tenant_profile_history" +const uint64_t OB_ALL_VIRTUAL_SECURITY_AUDIT_TID = 12149; // "__all_virtual_security_audit" +const uint64_t OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_TID = 12150; // "__all_virtual_security_audit_history" +const uint64_t OB_ALL_VIRTUAL_TRIGGER_TID = 12151; // "__all_virtual_trigger" +const uint64_t OB_ALL_VIRTUAL_TRIGGER_HISTORY_TID = 12152; // "__all_virtual_trigger_history" +const uint64_t OB_ALL_VIRTUAL_CLUSTER_STATS_TID = 12153; // "__all_virtual_cluster_stats" +const uint64_t OB_ALL_VIRTUAL_SSTABLE_COLUMN_CHECKSUM_TID = 12154; // "__all_virtual_sstable_column_checksum" +const uint64_t OB_ALL_VIRTUAL_PS_STAT_TID = 12155; // "__all_virtual_ps_stat" +const uint64_t OB_ALL_VIRTUAL_PS_ITEM_INFO_TID = 12156; // "__all_virtual_ps_item_info" +const uint64_t OB_ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_TID = 12158; // "__all_virtual_sql_workarea_history_stat" +const uint64_t OB_ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_TID = 12159; // "__all_virtual_sql_workarea_active" +const uint64_t OB_ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_TID = 12160; // "__all_virtual_sql_workarea_histogram" +const uint64_t OB_ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_TID = 12161; // "__all_virtual_sql_workarea_memory_info" +const uint64_t OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_TID = 12162; // "__all_virtual_security_audit_record" +const uint64_t OB_ALL_VIRTUAL_SYSAUTH_TID = 12163; // "__all_virtual_sysauth" +const uint64_t OB_ALL_VIRTUAL_SYSAUTH_HISTORY_TID = 12164; // "__all_virtual_sysauth_history" +const uint64_t OB_ALL_VIRTUAL_OBJAUTH_TID = 12165; // "__all_virtual_objauth" +const uint64_t OB_ALL_VIRTUAL_OBJAUTH_HISTORY_TID = 12166; // "__all_virtual_objauth_history" +const uint64_t OB_ALL_VIRTUAL_BACKUP_INFO_TID = 12167; // "__all_virtual_backup_info" +const uint64_t OB_ALL_VIRTUAL_BACKUP_LOG_ARCHIVE_STATUS_TID = 12168; // "__all_virtual_backup_log_archive_status" +const uint64_t OB_ALL_VIRTUAL_BACKUP_TASK_TID = 12170; // "__all_virtual_backup_task" +const uint64_t OB_ALL_VIRTUAL_PG_BACKUP_TASK_TID = 12171; // "__all_virtual_pg_backup_task" +const uint64_t OB_ALL_VIRTUAL_PG_BACKUP_LOG_ARCHIVE_STATUS_TID = 12173; // "__all_virtual_pg_backup_log_archive_status" +const uint64_t OB_ALL_VIRTUAL_SERVER_BACKUP_LOG_ARCHIVE_STATUS_TID = 12174; // "__all_virtual_server_backup_log_archive_status" +const uint64_t OB_ALL_VIRTUAL_ERROR_TID = 12175; // "__all_virtual_error" +const uint64_t OB_ALL_VIRTUAL_TIMESTAMP_SERVICE_TID = 12176; // "__all_virtual_timestamp_service" +const uint64_t OB_REFERENTIAL_CONSTRAINTS_TID = 12177; // "REFERENTIAL_CONSTRAINTS" +const uint64_t OB_ALL_VIRTUAL_TABLE_MODIFICATIONS_TID = 12179; // "__all_virtual_table_modifications" +const uint64_t OB_ALL_VIRTUAL_BACKUP_CLEAN_INFO_TID = 12180; // "__all_virtual_backup_clean_info" +const uint64_t OB_ALL_VIRTUAL_RESTORE_PG_INFO_TID = 12181; // "__all_virtual_restore_pg_info" +const uint64_t OB_ALL_VIRTUAL_OBJECT_TYPE_TID = 12182; // "__all_virtual_object_type" +const uint64_t OB_ALL_VIRTUAL_TRANS_TABLE_STATUS_TID = 12183; // "__all_virtual_trans_table_status" +const uint64_t OB_ALL_VIRTUAL_PG_LOG_ARCHIVE_STAT_TID = 12184; // "__all_virtual_pg_log_archive_stat" +const uint64_t OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_TID = 12185; // "__all_virtual_sql_plan_monitor" +const uint64_t OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_TID = 12186; // "__all_virtual_sql_monitor_statname" +const uint64_t OB_ALL_VIRTUAL_OPEN_CURSOR_TID = 12187; // "__all_virtual_open_cursor" +const uint64_t OB_ALL_VIRTUAL_BACKUP_VALIDATION_TASK_TID = 12188; // "__all_virtual_backup_validation_task" +const uint64_t OB_ALL_VIRTUAL_PG_BACKUP_VALIDATION_TASK_TID = 12189; // "__all_virtual_pg_backup_validation_task" +const uint64_t OB_ALL_VIRTUAL_TIME_ZONE_TID = 12190; // "__all_virtual_time_zone" +const uint64_t OB_ALL_VIRTUAL_TIME_ZONE_NAME_TID = 12191; // "__all_virtual_time_zone_name" +const uint64_t OB_ALL_VIRTUAL_TIME_ZONE_TRANSITION_TID = 12192; // "__all_virtual_time_zone_transition" +const uint64_t OB_ALL_VIRTUAL_TIME_ZONE_TRANSITION_TYPE_TID = 12193; // "__all_virtual_time_zone_transition_type" +const uint64_t OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_TID = 12194; // "__all_virtual_constraint_column" +const uint64_t OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_HISTORY_TID = 12195; // "__all_virtual_constraint_column_history" +const uint64_t OB_ALL_VIRTUAL_FILES_TID = 12196; // "__all_virtual_files" +const uint64_t OB_FILES_TID = 12197; // "FILES" +const uint64_t OB_ALL_VIRTUAL_DEPENDENCY_TID = 12198; // "__all_virtual_dependency" +const uint64_t OB_TENANT_VIRTUAL_OBJECT_DEFINITION_TID = 12199; // "__tenant_virtual_object_definition" +const uint64_t OB_ALL_VIRTUAL_RESERVED_TABLE_MGR_TID = 12200; // "__all_virtual_reserved_table_mgr" +const uint64_t OB_ALL_VIRTUAL_BACKUPSET_HISTORY_MGR_TID = 12201; // "__all_virtual_backupset_history_mgr" +const uint64_t OB_ALL_VIRTUAL_BACKUP_BACKUPSET_TASK_TID = 12202; // "__all_virtual_backup_backupset_task" +const uint64_t OB_ALL_VIRTUAL_PG_BACKUP_BACKUPSET_TASK_TID = 12203; // "__all_virtual_pg_backup_backupset_task" +const uint64_t OB_ALL_VIRTUAL_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TID = 12204; // "__all_virtual_backup_backup_log_archive_status" +const uint64_t OB_ALL_VIRTUAL_GLOBAL_TRANSACTION_TID = 12206; // "__all_virtual_global_transaction" +const uint64_t OB_ALL_VIRTUAL_TABLE_AGENT_TID = 15001; // "ALL_VIRTUAL_TABLE_AGENT" +const uint64_t OB_ALL_VIRTUAL_COLUMN_AGENT_TID = 15002; // "ALL_VIRTUAL_COLUMN_AGENT" +const uint64_t OB_ALL_VIRTUAL_DATABASE_AGENT_TID = 15003; // "ALL_VIRTUAL_DATABASE_AGENT" +const uint64_t OB_ALL_VIRTUAL_SEQUENCE_V2_AGENT_TID = 15004; // "ALL_VIRTUAL_SEQUENCE_V2_AGENT" +const uint64_t OB_ALL_VIRTUAL_PART_AGENT_TID = 15005; // "ALL_VIRTUAL_PART_AGENT" +const uint64_t OB_ALL_VIRTUAL_SUB_PART_AGENT_TID = 15006; // "ALL_VIRTUAL_SUB_PART_AGENT" +const uint64_t OB_ALL_VIRTUAL_PACKAGE_AGENT_TID = 15007; // "ALL_VIRTUAL_PACKAGE_AGENT" +const uint64_t OB_ALL_VIRTUAL_TENANT_META_TABLE_AGENT_TID = 15008; // "ALL_VIRTUAL_TENANT_META_TABLE_AGENT" +const uint64_t OB_ALL_VIRTUAL_SQL_AUDIT_ORA_TID = 15009; // "ALL_VIRTUAL_SQL_AUDIT_ORA" +const uint64_t OB_ALL_VIRTUAL_PLAN_STAT_ORA_TID = 15010; // "ALL_VIRTUAL_PLAN_STAT_ORA" +const uint64_t OB_ALL_VIRTUAL_SQL_PLAN_STATISTICS_AGENT_TID = 15011; // "ALL_VIRTUAL_SQL_PLAN_STATISTICS_AGENT" +const uint64_t OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_ORA_TID = 15012; // "ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_ORA" +const uint64_t OB_ALL_VIRTUAL_SEQUENCE_VALUE_AGENT_TID = 15013; // "ALL_VIRTUAL_SEQUENCE_VALUE_AGENT" +const uint64_t OB_ALL_VIRTUAL_SEQUENCE_OBJECT_AGENT_TID = 15014; // "ALL_VIRTUAL_SEQUENCE_OBJECT_AGENT" +const uint64_t OB_ALL_VIRTUAL_USER_AGENT_TID = 15015; // "ALL_VIRTUAL_USER_AGENT" +const uint64_t OB_ALL_VIRTUAL_SYNONYM_AGENT_TID = 15016; // "ALL_VIRTUAL_SYNONYM_AGENT" +const uint64_t OB_ALL_VIRTUAL_FOREIGN_KEY_AGENT_TID = 15017; // "ALL_VIRTUAL_FOREIGN_KEY_AGENT" +const uint64_t OB_ALL_VIRTUAL_COLUMN_STAT_AGENT_TID = 15018; // "ALL_VIRTUAL_COLUMN_STAT_AGENT" +const uint64_t OB_ALL_VIRTUAL_COLUMN_STATISTIC_AGENT_TID = 15019; // "ALL_VIRTUAL_COLUMN_STATISTIC_AGENT" +const uint64_t OB_ALL_VIRTUAL_PARTITION_TABLE_AGENT_TID = 15020; // "ALL_VIRTUAL_PARTITION_TABLE_AGENT" +const uint64_t OB_ALL_VIRTUAL_TABLE_STAT_AGENT_TID = 15021; // "ALL_VIRTUAL_TABLE_STAT_AGENT" +const uint64_t OB_ALL_VIRTUAL_RECYCLEBIN_AGENT_TID = 15022; // "ALL_VIRTUAL_RECYCLEBIN_AGENT" +const uint64_t OB_TENANT_VIRTUAL_OUTLINE_AGENT_TID = 15023; // "TENANT_VIRTUAL_OUTLINE_AGENT" +const uint64_t OB_ALL_VIRTUAL_ROUTINE_AGENT_TID = 15024; // "ALL_VIRTUAL_ROUTINE_AGENT" +const uint64_t OB_ALL_VIRTUAL_TABLEGROUP_AGENT_TID = 15025; // "ALL_VIRTUAL_TABLEGROUP_AGENT" +const uint64_t OB_ALL_VIRTUAL_PRIVILEGE_AGENT_TID = 15026; // "ALL_VIRTUAL_PRIVILEGE_AGENT" +const uint64_t OB_ALL_VIRTUAL_SYS_PARAMETER_STAT_AGENT_TID = 15027; // "ALL_VIRTUAL_SYS_PARAMETER_STAT_AGENT" +const uint64_t OB_TENANT_VIRTUAL_TABLE_INDEX_AGENT_TID = 15028; // "TENANT_VIRTUAL_TABLE_INDEX_AGENT" +const uint64_t OB_TENANT_VIRTUAL_CHARSET_AGENT_TID = 15029; // "TENANT_VIRTUAL_CHARSET_AGENT" +const uint64_t OB_TENANT_VIRTUAL_ALL_TABLE_AGENT_TID = 15030; // "TENANT_VIRTUAL_ALL_TABLE_AGENT" +const uint64_t OB_TENANT_VIRTUAL_COLLATION_AGENT_TID = 15031; // "TENANT_VIRTUAL_COLLATION_AGENT" +const uint64_t OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_AGENT_TID = 15032; // "ALL_VIRTUAL_FOREIGN_KEY_COLUMN_AGENT" +const uint64_t OB_ALL_VIRTUAL_SERVER_AGENT_TID = 15033; // "ALL_VIRTUAL_SERVER_AGENT" +const uint64_t OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_TID = 15034; // "ALL_VIRTUAL_PLAN_CACHE_STAT_ORA" +const uint64_t OB_ALL_VIRTUAL_PROCESSLIST_ORA_TID = 15035; // "ALL_VIRTUAL_PROCESSLIST_ORA" +const uint64_t OB_ALL_VIRTUAL_SESSION_WAIT_ORA_TID = 15036; // "ALL_VIRTUAL_SESSION_WAIT_ORA" +const uint64_t OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_TID = 15037; // "ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA" +const uint64_t OB_ALL_VIRTUAL_MEMORY_INFO_ORA_TID = 15038; // "ALL_VIRTUAL_MEMORY_INFO_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_ORA_TID = 15039; // "ALL_VIRTUAL_TENANT_MEMSTORE_INFO_ORA" +const uint64_t OB_ALL_VIRTUAL_MEMSTORE_INFO_ORA_TID = 15040; // "ALL_VIRTUAL_MEMSTORE_INFO_ORA" +const uint64_t OB_ALL_VIRTUAL_SERVER_MEMORY_INFO_AGENT_TID = 15041; // "ALL_VIRTUAL_SERVER_MEMORY_INFO_AGENT" +const uint64_t OB_ALL_VIRTUAL_SESSTAT_ORA_TID = 15042; // "ALL_VIRTUAL_SESSTAT_ORA" +const uint64_t OB_ALL_VIRTUAL_SYSSTAT_ORA_TID = 15043; // "ALL_VIRTUAL_SYSSTAT_ORA" +const uint64_t OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_TID = 15044; // "ALL_VIRTUAL_SYSTEM_EVENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_AGENT_TID = 15045; // "ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_AGENT" +const uint64_t OB_TENANT_VIRTUAL_SESSION_VARIABLE_ORA_TID = 15046; // "TENANT_VIRTUAL_SESSION_VARIABLE_ORA" +const uint64_t OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_ORA_TID = 15047; // "TENANT_VIRTUAL_GLOBAL_VARIABLE_ORA" +const uint64_t OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_ORA_TID = 15048; // "TENANT_VIRTUAL_SHOW_CREATE_TABLE_ORA" +const uint64_t OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_ORA_TID = 15049; // "TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_ORA" +const uint64_t OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_ORA_TID = 15050; // "TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_ORA" +const uint64_t OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_ORA_TID = 15051; // "TENANT_VIRTUAL_PRIVILEGE_GRANT_ORA" +const uint64_t OB_TENANT_VIRTUAL_TABLE_COLUMN_ORA_TID = 15052; // "TENANT_VIRTUAL_TABLE_COLUMN_ORA" +const uint64_t OB_ALL_VIRTUAL_TRACE_LOG_ORA_TID = 15053; // "ALL_VIRTUAL_TRACE_LOG_ORA" +const uint64_t OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_AGENT_TID = 15054; // "TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_AGENT" +const uint64_t OB_ALL_VIRTUAL_CONSTRAINT_AGENT_TID = 15055; // "ALL_VIRTUAL_CONSTRAINT_AGENT" +const uint64_t OB_ALL_VIRTUAL_TYPE_AGENT_TID = 15056; // "ALL_VIRTUAL_TYPE_AGENT" +const uint64_t OB_ALL_VIRTUAL_TYPE_ATTR_AGENT_TID = 15057; // "ALL_VIRTUAL_TYPE_ATTR_AGENT" +const uint64_t OB_ALL_VIRTUAL_COLL_TYPE_AGENT_TID = 15058; // "ALL_VIRTUAL_COLL_TYPE_AGENT" +const uint64_t OB_ALL_VIRTUAL_ROUTINE_PARAM_AGENT_TID = 15059; // "ALL_VIRTUAL_ROUTINE_PARAM_AGENT" +const uint64_t OB_ALL_VIRTUAL_DATA_TYPE_ORA_TID = 15060; // "ALL_VIRTUAL_DATA_TYPE_ORA" +const uint64_t OB_ALL_VIRTUAL_TABLE_SYS_AGENT_TID = 15062; // "ALL_VIRTUAL_TABLE_SYS_AGENT" +const uint64_t OB_ALL_VIRTUAL_SSTABLE_CHECKSUM_AGENT_TID = 15063; // "ALL_VIRTUAL_SSTABLE_CHECKSUM_AGENT" +const uint64_t OB_ALL_VIRTUAL_PARTITION_INFO_AGENT_TID = 15064; // "ALL_VIRTUAL_PARTITION_INFO_AGENT" +const uint64_t OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_AGENT_TID = 15065; // "ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_AGENT" +const uint64_t OB_ALL_VIRTUAL_TENANT_KEYSTORE_AGENT_TID = 15066; // "ALL_VIRTUAL_TENANT_KEYSTORE_AGENT" +const uint64_t OB_ALL_VIRTUAL_TENANT_TABLESPACE_AGENT_TID = 15071; // "ALL_VIRTUAL_TENANT_TABLESPACE_AGENT" +const uint64_t OB_ALL_VIRTUAL_TENANT_PROFILE_AGENT_TID = 15072; // "ALL_VIRTUAL_TENANT_PROFILE_AGENT" +const uint64_t OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT_TID = 15073; // "ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT" +const uint64_t OB_ALL_VIRTUAL_TABLE_PRIVILEGE_AGENT_TID = 15074; // "ALL_VIRTUAL_TABLE_PRIVILEGE_AGENT" +const uint64_t OB_ALL_VIRTUAL_SECURITY_AUDIT_AGENT_TID = 15075; // "ALL_VIRTUAL_SECURITY_AUDIT_AGENT" +const uint64_t OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_AGENT_TID = 15076; // "ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_AGENT" +const uint64_t OB_ALL_VIRTUAL_TRIGGER_AGENT_TID = 15079; // "ALL_VIRTUAL_TRIGGER_AGENT" +const uint64_t OB_ALL_VIRTUAL_PX_WORKER_STAT_ORA_TID = 15080; // "ALL_VIRTUAL_PX_WORKER_STAT_ORA" +const uint64_t OB_ALL_VIRTUAL_PS_STAT_ORA_TID = 15081; // "ALL_VIRTUAL_PS_STAT_ORA" +const uint64_t OB_ALL_VIRTUAL_PS_ITEM_INFO_ORA_TID = 15082; // "ALL_VIRTUAL_PS_ITEM_INFO_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_ORA_TID = 15083; // "ALL_VIRTUAL_TENANT_PARAMETER_STAT_ORA" +const uint64_t OB_ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT_TID = 15084; // "ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT" +const uint64_t OB_ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT_TID = 15085; // "ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT" +const uint64_t OB_ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT_TID = 15086; // "ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT" +const uint64_t OB_ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT_TID = 15087; // "ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT" +const uint64_t OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_AGENT_TID = 15088; // "ALL_VIRTUAL_SECURITY_AUDIT_RECORD_AGENT" +const uint64_t OB_ALL_VIRTUAL_SYSAUTH_AGENT_TID = 15089; // "ALL_VIRTUAL_SYSAUTH_AGENT" +const uint64_t OB_ALL_VIRTUAL_SYSAUTH_HISTORY_AGENT_TID = 15090; // "ALL_VIRTUAL_SYSAUTH_HISTORY_AGENT" +const uint64_t OB_ALL_VIRTUAL_OBJAUTH_AGENT_TID = 15091; // "ALL_VIRTUAL_OBJAUTH_AGENT" +const uint64_t OB_ALL_VIRTUAL_OBJAUTH_HISTORY_AGENT_TID = 15092; // "ALL_VIRTUAL_OBJAUTH_HISTORY_AGENT" +const uint64_t OB_ALL_VIRTUAL_ERROR_AGENT_TID = 15093; // "ALL_VIRTUAL_ERROR_AGENT" +const uint64_t OB_ALL_VIRTUAL_TABLE_MGR_AGENT_TID = 15094; // "ALL_VIRTUAL_TABLE_MGR_AGENT" +const uint64_t OB_ALL_VIRTUAL_DEF_SUB_PART_AGENT_TID = 15095; // "ALL_VIRTUAL_DEF_SUB_PART_AGENT" +const uint64_t OB_ALL_VIRTUAL_OBJECT_TYPE_AGENT_TID = 15096; // "ALL_VIRTUAL_OBJECT_TYPE_AGENT" +const uint64_t OB_ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT_TID = 15097; // "ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT" +const uint64_t OB_ALL_VIRTUAL_DBLINK_AGENT_TID = 15098; // "ALL_VIRTUAL_DBLINK_AGENT" +const uint64_t OB_ALL_VIRTUAL_DBLINK_HISTORY_AGENT_TID = 15099; // "ALL_VIRTUAL_DBLINK_HISTORY_AGENT" +const uint64_t OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_TID = 15100; // "ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA" +const uint64_t OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_ORA_TID = 15101; // "ALL_VIRTUAL_SQL_MONITOR_STATNAME_ORA" +const uint64_t OB_ALL_VIRTUAL_LOCK_WAIT_STAT_ORA_TID = 15102; // "ALL_VIRTUAL_LOCK_WAIT_STAT_ORA" +const uint64_t OB_ALL_VIRTUAL_OPEN_CURSOR_ORA_TID = 15103; // "ALL_VIRTUAL_OPEN_CURSOR_ORA" +const uint64_t OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_AGENT_TID = 15104; // "ALL_VIRTUAL_CONSTRAINT_COLUMN_AGENT" +const uint64_t OB_ALL_VIRTUAL_DEPENDENCY_AGENT_TID = 15105; // "ALL_VIRTUAL_DEPENDENCY_AGENT" +const uint64_t OB_ALL_VIRTUAL_TENANT_TIME_ZONE_AGENT_TID = 15106; // "ALL_VIRTUAL_TENANT_TIME_ZONE_AGENT" +const uint64_t OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_AGENT_TID = 15107; // "ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_AGENT" +const uint64_t OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_AGENT_TID = 15108; // "ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_AGENT" +const uint64_t OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_AGENT_TID = 15109; // "ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_AGENT" +const uint64_t OB_TENANT_VIRTUAL_OBJECT_DEFINITION_ORA_TID = 15110; // "TENANT_VIRTUAL_OBJECT_DEFINITION_ORA" +const uint64_t OB_ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT_TID = 15111; // "ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT" +const uint64_t OB_ALL_VIRTUAL_TYPE_SYS_AGENT_TID = 15112; // "ALL_VIRTUAL_TYPE_SYS_AGENT" +const uint64_t OB_ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT_TID = 15113; // "ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT" +const uint64_t OB_ALL_VIRTUAL_COLL_TYPE_SYS_AGENT_TID = 15114; // "ALL_VIRTUAL_COLL_TYPE_SYS_AGENT" +const uint64_t OB_ALL_VIRTUAL_PACKAGE_SYS_AGENT_TID = 15115; // "ALL_VIRTUAL_PACKAGE_SYS_AGENT" +const uint64_t OB_ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT_TID = 15116; // "ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT" +const uint64_t OB_ALL_VIRTUAL_ROUTINE_SYS_AGENT_TID = 15117; // "ALL_VIRTUAL_ROUTINE_SYS_AGENT" +const uint64_t OB_ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT_TID = 15118; // "ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT" +const uint64_t OB_ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT_TID = 15119; // "ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT" +const uint64_t OB_ALL_VIRTUAL_TABLE_REAL_AGENT_ORA_TID = 15120; // "ALL_VIRTUAL_TABLE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_COLUMN_REAL_AGENT_ORA_TID = 15121; // "ALL_VIRTUAL_COLUMN_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_DATABASE_REAL_AGENT_ORA_TID = 15122; // "ALL_VIRTUAL_DATABASE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_SEQUENCE_V2_REAL_AGENT_ORA_TID = 15123; // "ALL_VIRTUAL_SEQUENCE_V2_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_PART_REAL_AGENT_ORA_TID = 15124; // "ALL_VIRTUAL_PART_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_SUB_PART_REAL_AGENT_ORA_TID = 15125; // "ALL_VIRTUAL_SUB_PART_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_PACKAGE_REAL_AGENT_ORA_TID = 15126; // "ALL_VIRTUAL_PACKAGE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT_ORA_TID = 15127; // "ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT_ORA_TID = 15128; // "ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_USER_REAL_AGENT_ORA_TID = 15129; // "ALL_VIRTUAL_USER_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_SYNONYM_REAL_AGENT_ORA_TID = 15130; // "ALL_VIRTUAL_SYNONYM_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT_ORA_TID = 15131; // "ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_COLUMN_STAT_REAL_AGENT_ORA_TID = 15132; // "ALL_VIRTUAL_COLUMN_STAT_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_COLUMN_STATISTIC_REAL_AGENT_ORA_TID = 15133; // "ALL_VIRTUAL_COLUMN_STATISTIC_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TABLE_STAT_REAL_AGENT_ORA_TID = 15134; // "ALL_VIRTUAL_TABLE_STAT_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT_ORA_TID = 15135; // "ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_ROUTINE_REAL_AGENT_ORA_TID = 15136; // "ALL_VIRTUAL_ROUTINE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TABLEGROUP_REAL_AGENT_ORA_TID = 15137; // "ALL_VIRTUAL_TABLEGROUP_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT_ORA_TID = 15138; // "ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_CONSTRAINT_REAL_AGENT_ORA_TID = 15139; // "ALL_VIRTUAL_CONSTRAINT_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TYPE_REAL_AGENT_ORA_TID = 15140; // "ALL_VIRTUAL_TYPE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT_ORA_TID = 15141; // "ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_COLL_TYPE_REAL_AGENT_ORA_TID = 15142; // "ALL_VIRTUAL_COLL_TYPE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT_ORA_TID = 15143; // "ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT_ORA_TID = 15144; // "ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_KEYSTORE_REAL_AGENT_ORA_TID = 15145; // "ALL_VIRTUAL_TENANT_KEYSTORE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT_ORA_TID = 15150; // "ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT_ORA_TID = 15151; // "ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_REAL_AGENT_ORA_TID = 15152; // "ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TABLE_PRIVILEGE_REAL_AGENT_ORA_TID = 15153; // "ALL_VIRTUAL_TABLE_PRIVILEGE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_REAL_AGENT_ORA_TID = 15154; // "ALL_VIRTUAL_TENANT_SECURITY_AUDIT_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_HISTORY_REAL_AGENT_ORA_TID = 15155; // "ALL_VIRTUAL_TENANT_SECURITY_AUDIT_HISTORY_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT_ORA_TID = 15156; // "ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_RECORD_REAL_AGENT_ORA_TID = 15157; // "ALL_VIRTUAL_TENANT_SECURITY_AUDIT_RECORD_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT_ORA_TID = 15158; // "ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_SYSAUTH_HISTORY_REAL_AGENT_ORA_TID = 15159; // "ALL_VIRTUAL_TENANT_SYSAUTH_HISTORY_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT_ORA_TID = 15160; // "ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_OBJAUTH_HISTORY_REAL_AGENT_ORA_TID = 15161; // "ALL_VIRTUAL_TENANT_OBJAUTH_HISTORY_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT_ORA_TID = 15162; // "ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT_ORA_TID = 15163; // "ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_OBJECT_TYPE_REAL_AGENT_ORA_TID = 15164; // "ALL_VIRTUAL_TENANT_OBJECT_TYPE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_DBLINK_REAL_AGENT_ORA_TID = 15165; // "ALL_VIRTUAL_DBLINK_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_DBLINK_HISTORY_REAL_AGENT_ORA_TID = 15166; // "ALL_VIRTUAL_DBLINK_HISTORY_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_CONSTRAINT_COLUMN_REAL_AGENT_ORA_TID = 15167; // "ALL_VIRTUAL_TENANT_CONSTRAINT_COLUMN_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_DEPENDENCY_REAL_AGENT_ORA_TID = 15168; // "ALL_VIRTUAL_TENANT_DEPENDENCY_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT_ORA_TID = 15169; // "ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_TIME_ZONE_REAL_AGENT_ORA_TID = 15170; // "ALL_VIRTUAL_TENANT_TIME_ZONE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_REAL_AGENT_ORA_TID = 15171; // "ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_REAL_AGENT_ORA_TID = 15172; // "ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT_ORA_TID = 15173; // "ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_RES_MGR_PLAN_REAL_AGENT_ORA_TID = 15174; // "ALL_VIRTUAL_RES_MGR_PLAN_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_RES_MGR_DIRECTIVE_REAL_AGENT_ORA_TID = 15175; // "ALL_VIRTUAL_RES_MGR_DIRECTIVE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_TRANS_LOCK_STAT_ORA_TID = 15176; // "ALL_VIRTUAL_TRANS_LOCK_STAT_ORA" +const uint64_t OB_ALL_VIRTUAL_RES_MGR_MAPPING_RULE_REAL_AGENT_ORA_TID = 15177; // "ALL_VIRTUAL_RES_MGR_MAPPING_RULE_REAL_AGENT_ORA" +const uint64_t OB_ALL_VIRTUAL_RES_MGR_CONSUMER_GROUP_REAL_AGENT_ORA_TID = 15179; // "ALL_VIRTUAL_RES_MGR_CONSUMER_GROUP_REAL_AGENT_ORA" +const uint64_t OB_GV_PLAN_CACHE_STAT_TID = 20001; // "gv$plan_cache_stat" +const uint64_t OB_GV_PLAN_CACHE_PLAN_STAT_TID = 20002; // "gv$plan_cache_plan_stat" +const uint64_t OB_SCHEMATA_TID = 20003; // "SCHEMATA" +const uint64_t OB_CHARACTER_SETS_TID = 20004; // "CHARACTER_SETS" +const uint64_t OB_GLOBAL_VARIABLES_TID = 20005; // "GLOBAL_VARIABLES" +const uint64_t OB_STATISTICS_TID = 20006; // "STATISTICS" +const uint64_t OB_VIEWS_TID = 20007; // "VIEWS" +const uint64_t OB_TABLES_TID = 20008; // "TABLES" +const uint64_t OB_COLLATIONS_TID = 20009; // "COLLATIONS" +const uint64_t OB_COLLATION_CHARACTER_SET_APPLICABILITY_TID = 20010; // "COLLATION_CHARACTER_SET_APPLICABILITY" +const uint64_t OB_PROCESSLIST_TID = 20011; // "PROCESSLIST" +const uint64_t OB_KEY_COLUMN_USAGE_TID = 20012; // "KEY_COLUMN_USAGE" +const uint64_t OB_DBA_OUTLINES_TID = 20013; // "DBA_OUTLINES" +const uint64_t OB_ENGINES_TID = 20014; // "ENGINES" +const uint64_t OB_ROUTINES_TID = 20015; // "ROUTINES" +const uint64_t OB_GV_SESSION_EVENT_TID = 21000; // "gv$session_event" +const uint64_t OB_GV_SESSION_WAIT_TID = 21001; // "gv$session_wait" +const uint64_t OB_GV_SESSION_WAIT_HISTORY_TID = 21002; // "gv$session_wait_history" +const uint64_t OB_GV_SYSTEM_EVENT_TID = 21003; // "gv$system_event" +const uint64_t OB_GV_SESSTAT_TID = 21004; // "gv$sesstat" +const uint64_t OB_GV_SYSSTAT_TID = 21005; // "gv$sysstat" +const uint64_t OB_V_STATNAME_TID = 21006; // "v$statname" +const uint64_t OB_V_EVENT_NAME_TID = 21007; // "v$event_name" +const uint64_t OB_V_SESSION_EVENT_TID = 21008; // "v$session_event" +const uint64_t OB_V_SESSION_WAIT_TID = 21009; // "v$session_wait" +const uint64_t OB_V_SESSION_WAIT_HISTORY_TID = 21010; // "v$session_wait_history" +const uint64_t OB_V_SESSTAT_TID = 21011; // "v$sesstat" +const uint64_t OB_V_SYSSTAT_TID = 21012; // "v$sysstat" +const uint64_t OB_V_SYSTEM_EVENT_TID = 21013; // "v$system_event" +const uint64_t OB_GV_SQL_AUDIT_TID = 21014; // "gv$sql_audit" +const uint64_t OB_GV_LATCH_TID = 21015; // "gv$latch" +const uint64_t OB_GV_MEMORY_TID = 21016; // "gv$memory" +const uint64_t OB_V_MEMORY_TID = 21017; // "v$memory" +const uint64_t OB_GV_MEMSTORE_TID = 21018; // "gv$memstore" +const uint64_t OB_V_MEMSTORE_TID = 21019; // "v$memstore" +const uint64_t OB_GV_MEMSTORE_INFO_TID = 21020; // "gv$memstore_info" +const uint64_t OB_V_MEMSTORE_INFO_TID = 21021; // "v$memstore_info" +const uint64_t OB_V_PLAN_CACHE_STAT_TID = 21022; // "v$plan_cache_stat" +const uint64_t OB_V_PLAN_CACHE_PLAN_STAT_TID = 21023; // "v$plan_cache_plan_stat" +const uint64_t OB_GV_PLAN_CACHE_PLAN_EXPLAIN_TID = 21024; // "gv$plan_cache_plan_explain" +const uint64_t OB_V_PLAN_CACHE_PLAN_EXPLAIN_TID = 21025; // "v$plan_cache_plan_explain" +const uint64_t OB_V_SQL_AUDIT_TID = 21026; // "v$sql_audit" +const uint64_t OB_V_LATCH_TID = 21027; // "v$latch" +const uint64_t OB_GV_OBRPC_OUTGOING_TID = 21028; // "gv$obrpc_outgoing" +const uint64_t OB_V_OBRPC_OUTGOING_TID = 21029; // "v$obrpc_outgoing" +const uint64_t OB_GV_OBRPC_INCOMING_TID = 21030; // "gv$obrpc_incoming" +const uint64_t OB_V_OBRPC_INCOMING_TID = 21031; // "v$obrpc_incoming" +const uint64_t OB_GV_SQL_TID = 21032; // "gv$sql" +const uint64_t OB_V_SQL_TID = 21033; // "v$sql" +const uint64_t OB_GV_SQL_MONITOR_TID = 21034; // "gv$sql_monitor" +const uint64_t OB_V_SQL_MONITOR_TID = 21035; // "v$sql_monitor" +const uint64_t OB_GV_SQL_PLAN_MONITOR_TID = 21036; // "gv$sql_plan_monitor" +const uint64_t OB_V_SQL_PLAN_MONITOR_TID = 21037; // "v$sql_plan_monitor" +const uint64_t OB_USER_RECYCLEBIN_TID = 21038; // "USER_RECYCLEBIN" +const uint64_t OB_GV_OUTLINE_TID = 21039; // "gv$outline" +const uint64_t OB_GV_CONCURRENT_LIMIT_SQL_TID = 21040; // "gv$concurrent_limit_sql" +const uint64_t OB_GV_SQL_PLAN_STATISTICS_TID = 21041; // "gv$sql_plan_statistics" +const uint64_t OB_V_SQL_PLAN_STATISTICS_TID = 21042; // "v$sql_plan_statistics" +const uint64_t OB_GV_SERVER_MEMSTORE_TID = 21043; // "gv$server_memstore" +const uint64_t OB_GV_UNIT_LOAD_BALANCE_EVENT_HISTORY_TID = 21044; // "gv$unit_load_balance_event_history" +const uint64_t OB_GV_TENANT_TID = 21045; // "gv$tenant" +const uint64_t OB_GV_DATABASE_TID = 21046; // "gv$database" +const uint64_t OB_GV_TABLE_TID = 21047; // "gv$table" +const uint64_t OB_GV_UNIT_TID = 21048; // "gv$unit" +const uint64_t OB_V_UNIT_TID = 21049; // "v$unit" +const uint64_t OB_GV_PARTITION_TID = 21050; // "gv$partition" +const uint64_t OB_V_PARTITION_TID = 21051; // "v$partition" +const uint64_t OB_GV_LOCK_WAIT_STAT_TID = 21052; // "gv$lock_wait_stat" +const uint64_t OB_V_LOCK_WAIT_STAT_TID = 21053; // "v$lock_wait_stat" +const uint64_t OB_TIME_ZONE_TID = 21054; // "time_zone" +const uint64_t OB_TIME_ZONE_NAME_TID = 21055; // "time_zone_name" +const uint64_t OB_TIME_ZONE_TRANSITION_TID = 21056; // "time_zone_transition" +const uint64_t OB_TIME_ZONE_TRANSITION_TYPE_TID = 21057; // "time_zone_transition_type" +const uint64_t OB_GV_SESSION_LONGOPS_TID = 21059; // "gv$session_longops" +const uint64_t OB_V_SESSION_LONGOPS_TID = 21060; // "v$session_longops" +const uint64_t OB_GV_TENANT_MEMSTORE_ALLOCATOR_INFO_TID = 21064; // "gv$tenant_memstore_allocator_info" +const uint64_t OB_V_TENANT_MEMSTORE_ALLOCATOR_INFO_TID = 21065; // "v$tenant_memstore_allocator_info" +const uint64_t OB_GV_TENANT_SEQUENCE_OBJECT_TID = 21066; // "gv$tenant_sequence_object" +const uint64_t OB_COLUMNS_TID = 21068; // "COLUMNS" +const uint64_t OB_GV_MINOR_MERGE_INFO_TID = 21069; // "gv$minor_merge_info" +const uint64_t OB_GV_TENANT_PX_WORKER_STAT_TID = 21071; // "gv$tenant_px_worker_stat" +const uint64_t OB_V_TENANT_PX_WORKER_STAT_TID = 21072; // "v$tenant_px_worker_stat" +const uint64_t OB_GV_PARTITION_AUDIT_TID = 21073; // "gv$partition_audit" +const uint64_t OB_V_PARTITION_AUDIT_TID = 21074; // "v$partition_audit" +const uint64_t OB_V_OB_CLUSTER_TID = 21075; // "v$ob_cluster" +const uint64_t OB_GV_PS_STAT_TID = 21079; // "gv$ps_stat" +const uint64_t OB_V_PS_STAT_TID = 21080; // "v$ps_stat" +const uint64_t OB_GV_PS_ITEM_INFO_TID = 21081; // "gv$ps_item_info" +const uint64_t OB_V_PS_ITEM_INFO_TID = 21082; // "v$ps_item_info" +const uint64_t OB_GV_SQL_WORKAREA_TID = 21083; // "gv$sql_workarea" +const uint64_t OB_V_SQL_WORKAREA_TID = 21084; // "v$sql_workarea" +const uint64_t OB_GV_SQL_WORKAREA_ACTIVE_TID = 21085; // "gv$sql_workarea_active" +const uint64_t OB_V_SQL_WORKAREA_ACTIVE_TID = 21086; // "v$sql_workarea_active" +const uint64_t OB_GV_SQL_WORKAREA_HISTOGRAM_TID = 21087; // "gv$sql_workarea_histogram" +const uint64_t OB_V_SQL_WORKAREA_HISTOGRAM_TID = 21088; // "v$sql_workarea_histogram" +const uint64_t OB_GV_OB_SQL_WORKAREA_MEMORY_INFO_TID = 21089; // "gv$ob_sql_workarea_memory_info" +const uint64_t OB_V_OB_SQL_WORKAREA_MEMORY_INFO_TID = 21090; // "v$ob_sql_workarea_memory_info" +const uint64_t OB_GV_PLAN_CACHE_REFERENCE_INFO_TID = 21097; // "gv$plan_cache_reference_info" +const uint64_t OB_V_PLAN_CACHE_REFERENCE_INFO_TID = 21098; // "v$plan_cache_reference_info" +const uint64_t OB_V_OB_TIMESTAMP_SERVICE_TID = 21099; // "v$ob_timestamp_service" +const uint64_t OB_GV_SSTABLE_TID = 21100; // "gv$sstable" +const uint64_t OB_V_SSTABLE_TID = 21101; // "v$sstable" +const uint64_t OB_CDB_OB_BACKUP_ARCHIVELOG_SUMMARY_TID = 21102; // "CDB_OB_BACKUP_ARCHIVELOG_SUMMARY" +const uint64_t OB_CDB_OB_BACKUP_JOB_DETAILS_TID = 21103; // "CDB_OB_BACKUP_JOB_DETAILS" +const uint64_t OB_CDB_OB_BACKUP_SET_DETAILS_TID = 21104; // "CDB_OB_BACKUP_SET_DETAILS" +const uint64_t OB_CDB_OB_BACKUP_SET_EXPIRED_TID = 21105; // "CDB_OB_BACKUP_SET_EXPIRED" +const uint64_t OB_CDB_OB_BACKUP_PROGRESS_TID = 21106; // "CDB_OB_BACKUP_PROGRESS" +const uint64_t OB_CDB_OB_BACKUP_ARCHIVELOG_PROGRESS_TID = 21107; // "CDB_OB_BACKUP_ARCHIVELOG_PROGRESS" +const uint64_t OB_CDB_OB_BACKUP_CLEAN_HISTORY_TID = 21108; // "CDB_OB_BACKUP_CLEAN_HISTORY" +const uint64_t OB_CDB_OB_BACKUP_TASK_CLEAN_HISTORY_TID = 21109; // "CDB_OB_BACKUP_TASK_CLEAN_HISTORY" +const uint64_t OB_CDB_OB_RESTORE_PROGRESS_TID = 21110; // "CDB_OB_RESTORE_PROGRESS" +const uint64_t OB_CDB_OB_RESTORE_HISTORY_TID = 21111; // "CDB_OB_RESTORE_HISTORY" +const uint64_t OB_GV_SERVER_SCHEMA_INFO_TID = 21112; // "gv$server_schema_info" +const uint64_t OB_V_SERVER_SCHEMA_INFO_TID = 21113; // "v$server_schema_info" +const uint64_t OB_CDB_CKPT_HISTORY_TID = 21114; // "CDB_CKPT_HISTORY" +const uint64_t OB_GV_OB_TRANS_TABLE_STATUS_TID = 21115; // "gv$ob_trans_table_status" +const uint64_t OB_V_OB_TRANS_TABLE_STATUS_TID = 21116; // "v$ob_trans_table_status" +const uint64_t OB_V_SQL_MONITOR_STATNAME_TID = 21117; // "v$sql_monitor_statname" +const uint64_t OB_GV_MERGE_INFO_TID = 21118; // "gv$merge_info" +const uint64_t OB_V_MERGE_INFO_TID = 21119; // "v$merge_info" +const uint64_t OB_GV_LOCK_TID = 21120; // "gv$lock" +const uint64_t OB_V_LOCK_TID = 21121; // "v$lock" +const uint64_t OB_CDB_OB_BACKUP_VALIDATION_JOB_TID = 21122; // "CDB_OB_BACKUP_VALIDATION_JOB" +const uint64_t OB_CDB_OB_BACKUP_VALIDATION_JOB_HISTORY_TID = 21123; // "CDB_OB_BACKUP_VALIDATION_JOB_HISTORY" +const uint64_t OB_CDB_OB_TENANT_BACKUP_VALIDATION_TASK_TID = 21124; // "CDB_OB_TENANT_BACKUP_VALIDATION_TASK" +const uint64_t OB_CDB_OB_BACKUP_VALIDATION_TASK_HISTORY_TID = 21125; // "CDB_OB_BACKUP_VALIDATION_TASK_HISTORY" +const uint64_t OB_V_RESTORE_POINT_TID = 21126; // "v$restore_point" +const uint64_t OB_CDB_OB_BACKUP_SET_OBSOLETE_TID = 21127; // "CDB_OB_BACKUP_SET_OBSOLETE" +const uint64_t OB_CDB_OB_BACKUP_BACKUPSET_JOB_TID = 21128; // "CDB_OB_BACKUP_BACKUPSET_JOB" +const uint64_t OB_CDB_OB_BACKUP_BACKUPSET_JOB_HISTORY_TID = 21129; // "CDB_OB_BACKUP_BACKUPSET_JOB_HISTORY" +const uint64_t OB_CDB_OB_BACKUP_BACKUPSET_TASK_TID = 21130; // "CDB_OB_BACKUP_BACKUPSET_TASK" +const uint64_t OB_CDB_OB_BACKUP_BACKUPSET_TASK_HISTORY_TID = 21131; // "CDB_OB_BACKUP_BACKUPSET_TASK_HISTORY" +const uint64_t OB_CDB_OB_BACKUP_BACKUP_ARCHIVELOG_SUMMARY_TID = 21132; // "CDB_OB_BACKUP_BACKUP_ARCHIVELOG_SUMMARY" +const uint64_t OB_DBA_SYNONYMS_TID = 25001; // "DBA_SYNONYMS" +const uint64_t OB_DBA_OBJECTS_TID = 25002; // "DBA_OBJECTS" +const uint64_t OB_ALL_OBJECTS_TID = 25003; // "ALL_OBJECTS" +const uint64_t OB_USER_OBJECTS_TID = 25004; // "USER_OBJECTS" +const uint64_t OB_DBA_SEQUENCES_TID = 25005; // "DBA_SEQUENCES" +const uint64_t OB_ALL_SEQUENCES_TID = 25006; // "ALL_SEQUENCES" +const uint64_t OB_USER_SEQUENCES_TID = 25007; // "USER_SEQUENCES" +const uint64_t OB_DBA_USERS_TID = 25008; // "DBA_USERS" +const uint64_t OB_ALL_USERS_TID = 25009; // "ALL_USERS" +const uint64_t OB_ALL_SYNONYMS_TID = 25010; // "ALL_SYNONYMS" +const uint64_t OB_USER_SYNONYMS_TID = 25011; // "USER_SYNONYMS" +const uint64_t OB_DBA_IND_COLUMNS_TID = 25012; // "DBA_IND_COLUMNS" +const uint64_t OB_ALL_IND_COLUMNS_TID = 25013; // "ALL_IND_COLUMNS" +const uint64_t OB_USER_IND_COLUMNS_TID = 25014; // "USER_IND_COLUMNS" +const uint64_t OB_DBA_CONSTRAINTS_TID = 25015; // "DBA_CONSTRAINTS" +const uint64_t OB_ALL_CONSTRAINTS_TID = 25016; // "ALL_CONSTRAINTS" +const uint64_t OB_USER_CONSTRAINTS_TID = 25017; // "USER_CONSTRAINTS" +const uint64_t OB_ALL_TAB_COLS_V_TID = 25018; // "ALL_TAB_COLS_V$" +const uint64_t OB_DBA_TAB_COLS_V_TID = 25019; // "DBA_TAB_COLS_V$" +const uint64_t OB_USER_TAB_COLS_V_TID = 25020; // "USER_TAB_COLS_V$" +const uint64_t OB_ALL_TAB_COLS_TID = 25021; // "ALL_TAB_COLS" +const uint64_t OB_DBA_TAB_COLS_TID = 25022; // "DBA_TAB_COLS" +const uint64_t OB_USER_TAB_COLS_TID = 25023; // "USER_TAB_COLS" +const uint64_t OB_ALL_TAB_COLUMNS_TID = 25024; // "ALL_TAB_COLUMNS" +const uint64_t OB_DBA_TAB_COLUMNS_TID = 25025; // "DBA_TAB_COLUMNS" +const uint64_t OB_USER_TAB_COLUMNS_TID = 25026; // "USER_TAB_COLUMNS" +const uint64_t OB_ALL_TABLES_TID = 25027; // "ALL_TABLES" +const uint64_t OB_DBA_TABLES_TID = 25028; // "DBA_TABLES" +const uint64_t OB_USER_TABLES_TID = 25029; // "USER_TABLES" +const uint64_t OB_DBA_TAB_COMMENTS_TID = 25030; // "DBA_TAB_COMMENTS" +const uint64_t OB_ALL_TAB_COMMENTS_TID = 25031; // "ALL_TAB_COMMENTS" +const uint64_t OB_USER_TAB_COMMENTS_TID = 25032; // "USER_TAB_COMMENTS" +const uint64_t OB_DBA_COL_COMMENTS_TID = 25033; // "DBA_COL_COMMENTS" +const uint64_t OB_ALL_COL_COMMENTS_TID = 25034; // "ALL_COL_COMMENTS" +const uint64_t OB_USER_COL_COMMENTS_TID = 25035; // "USER_COL_COMMENTS" +const uint64_t OB_DBA_INDEXES_TID = 25036; // "DBA_INDEXES" +const uint64_t OB_ALL_INDEXES_TID = 25037; // "ALL_INDEXES" +const uint64_t OB_USER_INDEXES_TID = 25038; // "USER_INDEXES" +const uint64_t OB_DBA_CONS_COLUMNS_TID = 25039; // "DBA_CONS_COLUMNS" +const uint64_t OB_ALL_CONS_COLUMNS_TID = 25040; // "ALL_CONS_COLUMNS" +const uint64_t OB_USER_CONS_COLUMNS_TID = 25041; // "USER_CONS_COLUMNS" +const uint64_t OB_USER_SEGMENTS_TID = 25042; // "USER_SEGMENTS" +const uint64_t OB_DBA_SEGMENTS_TID = 25043; // "DBA_SEGMENTS" +const uint64_t OB_DBA_TYPES_TID = 25044; // "DBA_TYPES" +const uint64_t OB_ALL_TYPES_TID = 25045; // "ALL_TYPES" +const uint64_t OB_USER_TYPES_TID = 25046; // "USER_TYPES" +const uint64_t OB_DBA_TYPE_ATTRS_TID = 25047; // "DBA_TYPE_ATTRS" +const uint64_t OB_ALL_TYPE_ATTRS_TID = 25048; // "ALL_TYPE_ATTRS" +const uint64_t OB_USER_TYPE_ATTRS_TID = 25049; // "USER_TYPE_ATTRS" +const uint64_t OB_DBA_COLL_TYPES_TID = 25050; // "DBA_COLL_TYPES" +const uint64_t OB_ALL_COLL_TYPES_TID = 25051; // "ALL_COLL_TYPES" +const uint64_t OB_USER_COLL_TYPES_TID = 25052; // "USER_COLL_TYPES" +const uint64_t OB_DBA_PROCEDURES_TID = 25053; // "DBA_PROCEDURES" +const uint64_t OB_DBA_ARGUMENTS_TID = 25054; // "DBA_ARGUMENTS" +const uint64_t OB_DBA_SOURCE_TID = 25055; // "DBA_SOURCE" +const uint64_t OB_ALL_PROCEDURES_TID = 25056; // "ALL_PROCEDURES" +const uint64_t OB_ALL_ARGUMENTS_TID = 25057; // "ALL_ARGUMENTS" +const uint64_t OB_ALL_SOURCE_TID = 25058; // "ALL_SOURCE" +const uint64_t OB_USER_PROCEDURES_TID = 25059; // "USER_PROCEDURES" +const uint64_t OB_USER_ARGUMENTS_TID = 25060; // "USER_ARGUMENTS" +const uint64_t OB_USER_SOURCE_TID = 25061; // "USER_SOURCE" +const uint64_t OB_DBA_PART_KEY_COLUMNS_TID = 25062; // "DBA_PART_KEY_COLUMNS" +const uint64_t OB_ALL_PART_KEY_COLUMNS_TID = 25063; // "ALL_PART_KEY_COLUMNS" +const uint64_t OB_USER_PART_KEY_COLUMNS_TID = 25064; // "USER_PART_KEY_COLUMNS" +const uint64_t OB_DBA_SUBPART_KEY_COLUMNS_TID = 25065; // "DBA_SUBPART_KEY_COLUMNS" +const uint64_t OB_ALL_SUBPART_KEY_COLUMNS_TID = 25066; // "ALL_SUBPART_KEY_COLUMNS" +const uint64_t OB_USER_SUBPART_KEY_COLUMNS_TID = 25067; // "USER_SUBPART_KEY_COLUMNS" +const uint64_t OB_DBA_VIEWS_TID = 25068; // "DBA_VIEWS" +const uint64_t OB_ALL_VIEWS_TID = 25069; // "ALL_VIEWS" +const uint64_t OB_USER_VIEWS_TID = 25070; // "USER_VIEWS" +const uint64_t OB_ALL_TAB_PARTITIONS_ORA_TID = 25071; // "ALL_TAB_PARTITIONS_ORA" +const uint64_t OB_ALL_TAB_SUBPARTITIONS_ORA_TID = 25072; // "ALL_TAB_SUBPARTITIONS_ORA" +const uint64_t OB_ALL_PART_TABLES_ORA_TID = 25073; // "ALL_PART_TABLES_ORA" +const uint64_t OB_DBA_PART_TABLES_ORA_TID = 25074; // "DBA_PART_TABLES_ORA" +const uint64_t OB_USER_PART_TABLES_ORA_TID = 25075; // "USER_PART_TABLES_ORA" +const uint64_t OB_DBA_TAB_PARTITIONS_ORA_TID = 25076; // "DBA_TAB_PARTITIONS_ORA" +const uint64_t OB_USER_TAB_PARTITIONS_ORA_TID = 25077; // "USER_TAB_PARTITIONS_ORA" +const uint64_t OB_DBA_TAB_SUBPARTITIONS_ORA_TID = 25078; // "DBA_TAB_SUBPARTITIONS_ORA" +const uint64_t OB_USER_TAB_SUBPARTITIONS_ORA_TID = 25079; // "USER_TAB_SUBPARTITIONS_ORA" +const uint64_t OB_DBA_SUBPARTITION_TEMPLATES_ORA_TID = 25080; // "DBA_SUBPARTITION_TEMPLATES_ORA" +const uint64_t OB_ALL_SUBPARTITION_TEMPLATES_ORA_TID = 25081; // "ALL_SUBPARTITION_TEMPLATES_ORA" +const uint64_t OB_USER_SUBPARTITION_TEMPLATES_ORA_TID = 25082; // "USER_SUBPARTITION_TEMPLATES_ORA" +const uint64_t OB_DBA_PART_INDEXES_TID = 25083; // "DBA_PART_INDEXES" +const uint64_t OB_ALL_PART_INDEXES_TID = 25084; // "ALL_PART_INDEXES" +const uint64_t OB_USER_PART_INDEXES_TID = 25085; // "USER_PART_INDEXES" +const uint64_t OB_ALL_ALL_TABLES_ORA_TID = 25086; // "ALL_ALL_TABLES_ORA" +const uint64_t OB_DBA_ALL_TABLES_ORA_TID = 25087; // "DBA_ALL_TABLES_ORA" +const uint64_t OB_USER_ALL_TABLES_ORA_TID = 25088; // "USER_ALL_TABLES_ORA" +const uint64_t OB_DBA_PROFILES_ORA_TID = 25089; // "DBA_PROFILES_ORA" +const uint64_t OB_USER_PROFILES_ORA_TID = 25090; // "USER_PROFILES_ORA" +const uint64_t OB_ALL_PROFILES_ORA_TID = 25091; // "ALL_PROFILES_ORA" +const uint64_t OB_ALL_MVIEW_COMMENTS_ORA_TID = 25092; // "ALL_MVIEW_COMMENTS_ORA" +const uint64_t OB_USER_MVIEW_COMMENTS_ORA_TID = 25093; // "USER_MVIEW_COMMENTS_ORA" +const uint64_t OB_DBA_MVIEW_COMMENTS_ORA_TID = 25094; // "DBA_MVIEW_COMMENTS_ORA" +const uint64_t OB_ALL_SCHEDULER_PROGRAM_ARGS_ORA_TID = 25095; // "ALL_SCHEDULER_PROGRAM_ARGS_ORA" +const uint64_t OB_DBA_SCHEDULER_PROGRAM_ARGS_ORA_TID = 25096; // "DBA_SCHEDULER_PROGRAM_ARGS_ORA" +const uint64_t OB_USER_SCHEDULER_PROGRAM_ARGS_ORA_TID = 25097; // "USER_SCHEDULER_PROGRAM_ARGS_ORA" +const uint64_t OB_ALL_SCHEDULER_JOB_ARGS_ORA_TID = 25098; // "ALL_SCHEDULER_JOB_ARGS_ORA" +const uint64_t OB_DBA_SCHEDULER_JOB_ARGS_ORA_TID = 25099; // "DBA_SCHEDULER_JOB_ARGS_ORA" +const uint64_t OB_USER_SCHEDULER_JOB_ARGS_ORA_TID = 25100; // "USER_SCHEDULER_JOB_ARGS_ORA" +const uint64_t OB_ALL_ERRORS_ORA_TID = 25101; // "ALL_ERRORS_ORA" +const uint64_t OB_DBA_ERRORS_ORA_TID = 25102; // "DBA_ERRORS_ORA" +const uint64_t OB_USER_ERRORS_ORA_TID = 25103; // "USER_ERRORS_ORA" +const uint64_t OB_ALL_TYPE_METHODS_ORA_TID = 25104; // "ALL_TYPE_METHODS_ORA" +const uint64_t OB_DBA_TYPE_METHODS_ORA_TID = 25105; // "DBA_TYPE_METHODS_ORA" +const uint64_t OB_USER_TYPE_METHODS_ORA_TID = 25106; // "USER_TYPE_METHODS_ORA" +const uint64_t OB_ALL_METHOD_PARAMS_ORA_TID = 25107; // "ALL_METHOD_PARAMS_ORA" +const uint64_t OB_DBA_METHOD_PARAMS_ORA_TID = 25108; // "DBA_METHOD_PARAMS_ORA" +const uint64_t OB_USER_METHOD_PARAMS_ORA_TID = 25109; // "USER_METHOD_PARAMS_ORA" +const uint64_t OB_DBA_TABLESPACES_ORA_TID = 25110; // "DBA_TABLESPACES_ORA" +const uint64_t OB_USER_TABLESPACES_ORA_TID = 25111; // "USER_TABLESPACES_ORA" +const uint64_t OB_DBA_IND_EXPRESSIONS_TID = 25112; // "DBA_IND_EXPRESSIONS" +const uint64_t OB_USER_IND_EXPRESSIONS_TID = 25113; // "USER_IND_EXPRESSIONS" +const uint64_t OB_ALL_IND_EXPRESSIONS_TID = 25114; // "ALL_IND_EXPRESSIONS" +const uint64_t OB_ALL_IND_PARTITIONS_TID = 25115; // "ALL_IND_PARTITIONS" +const uint64_t OB_USER_IND_PARTITIONS_TID = 25116; // "USER_IND_PARTITIONS" +const uint64_t OB_DBA_IND_PARTITIONS_TID = 25117; // "DBA_IND_PARTITIONS" +const uint64_t OB_DBA_IND_SUBPARTITIONS_TID = 25118; // "DBA_IND_SUBPARTITIONS" +const uint64_t OB_ALL_IND_SUBPARTITIONS_TID = 25119; // "ALL_IND_SUBPARTITIONS" +const uint64_t OB_USER_IND_SUBPARTITIONS_TID = 25120; // "USER_IND_SUBPARTITIONS" +const uint64_t OB_DBA_ROLES_TID = 25121; // "DBA_ROLES" +const uint64_t OB_DBA_ROLE_PRIVS_TID = 25122; // "DBA_ROLE_PRIVS" +const uint64_t OB_USER_ROLE_PRIVS_TID = 25123; // "USER_ROLE_PRIVS" +const uint64_t OB_DBA_TAB_PRIVS_TID = 25124; // "DBA_TAB_PRIVS" +const uint64_t OB_ALL_TAB_PRIVS_TID = 25125; // "ALL_TAB_PRIVS" +const uint64_t OB_USER_TAB_PRIVS_TID = 25126; // "USER_TAB_PRIVS" +const uint64_t OB_DBA_SYS_PRIVS_TID = 25127; // "DBA_SYS_PRIVS" +const uint64_t OB_USER_SYS_PRIVS_TID = 25128; // "USER_SYS_PRIVS" +const uint64_t OB_DBA_COL_PRIVS_ORA_TID = 25143; // "DBA_COL_PRIVS_ORA" +const uint64_t OB_USER_COL_PRIVS_ORA_TID = 25144; // "USER_COL_PRIVS_ORA" +const uint64_t OB_ALL_COL_PRIVS_ORA_TID = 25145; // "ALL_COL_PRIVS_ORA" +const uint64_t OB_ROLE_TAB_PRIVS_ORA_TID = 25146; // "ROLE_TAB_PRIVS_ORA" +const uint64_t OB_ROLE_SYS_PRIVS_ORA_TID = 25147; // "ROLE_SYS_PRIVS_ORA" +const uint64_t OB_ROLE_ROLE_PRIVS_ORA_TID = 25148; // "ROLE_ROLE_PRIVS_ORA" +const uint64_t OB_DICTIONARY_ORA_TID = 25149; // "DICTIONARY_ORA" +const uint64_t OB_DICT_ORA_TID = 25150; // "DICT_ORA" +const uint64_t OB_ALL_TRIGGERS_TID = 25151; // "ALL_TRIGGERS" +const uint64_t OB_DBA_TRIGGERS_TID = 25152; // "DBA_TRIGGERS" +const uint64_t OB_USER_TRIGGERS_TID = 25153; // "USER_TRIGGERS" +const uint64_t OB_ALL_DEPENDENCIES_ORA_TID = 25154; // "ALL_DEPENDENCIES_ORA" +const uint64_t OB_DBA_DEPENDENCIES_ORA_TID = 25155; // "DBA_DEPENDENCIES_ORA" +const uint64_t OB_USER_DEPENDENCIES_ORA_TID = 25156; // "USER_DEPENDENCIES_ORA" +const uint64_t OB_DBA_RSRC_PLANS_TID = 25157; // "DBA_RSRC_PLANS" +const uint64_t OB_DBA_RSRC_PLAN_DIRECTIVES_TID = 25158; // "DBA_RSRC_PLAN_DIRECTIVES" +const uint64_t OB_DBA_RSRC_GROUP_MAPPINGS_TID = 25159; // "DBA_RSRC_GROUP_MAPPINGS" +const uint64_t OB_DBA_RECYCLEBIN_ORA_TID = 25160; // "DBA_RECYCLEBIN_ORA" +const uint64_t OB_USER_RECYCLEBIN_ORA_TID = 25161; // "USER_RECYCLEBIN_ORA" +const uint64_t OB_DBA_RSRC_CONSUMER_GROUPS_TID = 25162; // "DBA_RSRC_CONSUMER_GROUPS" +const uint64_t OB_GV_OUTLINE_ORA_TID = 28001; // "GV$OUTLINE_ORA" +const uint64_t OB_GV_SQL_AUDIT_ORA_TID = 28002; // "GV$SQL_AUDIT_ORA" +const uint64_t OB_V_SQL_AUDIT_ORA_TID = 28003; // "V$SQL_AUDIT_ORA" +const uint64_t OB_GV_INSTANCE_TID = 28004; // "GV$INSTANCE" +const uint64_t OB_V_INSTANCE_TID = 28005; // "V$INSTANCE" +const uint64_t OB_GV_PLAN_CACHE_PLAN_STAT_ORA_TID = 28006; // "GV$PLAN_CACHE_PLAN_STAT_ORA" +const uint64_t OB_V_PLAN_CACHE_PLAN_STAT_ORA_TID = 28007; // "V$PLAN_CACHE_PLAN_STAT_ORA" +const uint64_t OB_GV_PLAN_CACHE_PLAN_EXPLAIN_ORA_TID = 28008; // "GV$PLAN_CACHE_PLAN_EXPLAIN_ORA" +const uint64_t OB_V_PLAN_CACHE_PLAN_EXPLAIN_ORA_TID = 28009; // "V$PLAN_CACHE_PLAN_EXPLAIN_ORA" +const uint64_t OB_GV_SESSION_WAIT_ORA_TID = 28010; // "GV$SESSION_WAIT_ORA" +const uint64_t OB_V_SESSION_WAIT_ORA_TID = 28011; // "V$SESSION_WAIT_ORA" +const uint64_t OB_GV_SESSION_WAIT_HISTORY_ORA_TID = 28012; // "GV$SESSION_WAIT_HISTORY_ORA" +const uint64_t OB_V_SESSION_WAIT_HISTORY_ORA_TID = 28013; // "V$SESSION_WAIT_HISTORY_ORA" +const uint64_t OB_GV_MEMORY_ORA_TID = 28014; // "GV$MEMORY_ORA" +const uint64_t OB_V_MEMORY_ORA_TID = 28015; // "V$MEMORY_ORA" +const uint64_t OB_GV_MEMSTORE_ORA_TID = 28016; // "GV$MEMSTORE_ORA" +const uint64_t OB_V_MEMSTORE_ORA_TID = 28017; // "V$MEMSTORE_ORA" +const uint64_t OB_GV_MEMSTORE_INFO_ORA_TID = 28018; // "GV$MEMSTORE_INFO_ORA" +const uint64_t OB_V_MEMSTORE_INFO_ORA_TID = 28019; // "V$MEMSTORE_INFO_ORA" +const uint64_t OB_GV_SERVER_MEMSTORE_ORA_TID = 28020; // "GV$SERVER_MEMSTORE_ORA" +const uint64_t OB_GV_SESSTAT_ORA_TID = 28021; // "GV$SESSTAT_ORA" +const uint64_t OB_V_SESSTAT_ORA_TID = 28022; // "V$SESSTAT_ORA" +const uint64_t OB_GV_SYSSTAT_ORA_TID = 28023; // "GV$SYSSTAT_ORA" +const uint64_t OB_V_SYSSTAT_ORA_TID = 28024; // "V$SYSSTAT_ORA" +const uint64_t OB_GV_SYSTEM_EVENT_ORA_TID = 28025; // "GV$SYSTEM_EVENT_ORA" +const uint64_t OB_V_SYSTEM_EVENT_ORA_TID = 28026; // "V$SYSTEM_EVENT_ORA" +const uint64_t OB_GV_TENANT_MEMSTORE_ALLOCATOR_INFO_ORA_TID = 28027; // "GV$TENANT_MEMSTORE_ALLOCATOR_INFO_ORA" +const uint64_t OB_V_TENANT_MEMSTORE_ALLOCATOR_INFO_ORA_TID = 28028; // "V$TENANT_MEMSTORE_ALLOCATOR_INFO_ORA" +const uint64_t OB_GV_PLAN_CACHE_STAT_ORA_TID = 28029; // "GV$PLAN_CACHE_STAT_ORA" +const uint64_t OB_V_PLAN_CACHE_STAT_ORA_TID = 28030; // "V$PLAN_CACHE_STAT_ORA" +const uint64_t OB_GV_CONCURRENT_LIMIT_SQL_ORA_TID = 28031; // "GV$CONCURRENT_LIMIT_SQL_ORA" +const uint64_t OB_NLS_SESSION_PARAMETERS_ORA_TID = 28032; // "NLS_SESSION_PARAMETERS_ORA" +const uint64_t OB_NLS_INSTANCE_PARAMETERS_ORA_TID = 28033; // "NLS_INSTANCE_PARAMETERS_ORA" +const uint64_t OB_NLS_DATABASE_PARAMETERS_ORA_TID = 28034; // "NLS_DATABASE_PARAMETERS_ORA" +const uint64_t OB_V_NLS_PARAMETERS_ORA_TID = 28035; // "V$NLS_PARAMETERS_ORA" +const uint64_t OB_V_VERSION_ORA_TID = 28036; // "V$VERSION_ORA" +const uint64_t OB_GV_TENANT_PX_WORKER_STAT_ORA_TID = 28037; // "GV$TENANT_PX_WORKER_STAT_ORA" +const uint64_t OB_V_TENANT_PX_WORKER_STAT_ORA_TID = 28038; // "V$TENANT_PX_WORKER_STAT_ORA" +const uint64_t OB_GV_PS_STAT_ORA_TID = 28039; // "GV$PS_STAT_ORA" +const uint64_t OB_V_PS_STAT_ORA_TID = 28040; // "V$PS_STAT_ORA" +const uint64_t OB_GV_PS_ITEM_INFO_ORA_TID = 28041; // "GV$PS_ITEM_INFO_ORA" +const uint64_t OB_V_PS_ITEM_INFO_ORA_TID = 28042; // "V$PS_ITEM_INFO_ORA" +const uint64_t OB_GV_SQL_WORKAREA_ACTIVE_ORA_TID = 28045; // "GV$SQL_WORKAREA_ACTIVE_ORA" +const uint64_t OB_V_SQL_WORKAREA_ACTIVE_ORA_TID = 28046; // "V$SQL_WORKAREA_ACTIVE_ORA" +const uint64_t OB_GV_SQL_WORKAREA_HISTOGRAM_ORA_TID = 28047; // "GV$SQL_WORKAREA_HISTOGRAM_ORA" +const uint64_t OB_V_SQL_WORKAREA_HISTOGRAM_ORA_TID = 28048; // "V$SQL_WORKAREA_HISTOGRAM_ORA" +const uint64_t OB_GV_OB_SQL_WORKAREA_MEMORY_INFO_ORA_TID = 28049; // "GV$OB_SQL_WORKAREA_MEMORY_INFO_ORA" +const uint64_t OB_V_OB_SQL_WORKAREA_MEMORY_INFO_ORA_TID = 28050; // "V$OB_SQL_WORKAREA_MEMORY_INFO_ORA" +const uint64_t OB_GV_PLAN_CACHE_REFERENCE_INFO_ORA_TID = 28051; // "GV$PLAN_CACHE_REFERENCE_INFO_ORA" +const uint64_t OB_V_PLAN_CACHE_REFERENCE_INFO_ORA_TID = 28052; // "V$PLAN_CACHE_REFERENCE_INFO_ORA" +const uint64_t OB_GV_SQL_WORKAREA_ORA_TID = 28053; // "GV$SQL_WORKAREA_ORA" +const uint64_t OB_V_SQL_WORKAREA_ORA_TID = 28054; // "V$SQL_WORKAREA_ORA" +const uint64_t OB_GV_SSTABLE_ORA_TID = 28055; // "GV$SSTABLE_ORA" +const uint64_t OB_V_SSTABLE_ORA_TID = 28056; // "V$SSTABLE_ORA" +const uint64_t OB_GV_SERVER_SCHEMA_INFO_ORA_TID = 28057; // "GV$SERVER_SCHEMA_INFO_ORA" +const uint64_t OB_V_SERVER_SCHEMA_INFO_ORA_TID = 28058; // "V$SERVER_SCHEMA_INFO_ORA" +const uint64_t OB_GV_SQL_PLAN_MONITOR_ORA_TID = 28059; // "GV$SQL_PLAN_MONITOR_ORA" +const uint64_t OB_V_SQL_PLAN_MONITOR_ORA_TID = 28060; // "V$SQL_PLAN_MONITOR_ORA" +const uint64_t OB_V_SQL_MONITOR_STATNAME_ORA_TID = 28061; // "V$SQL_MONITOR_STATNAME_ORA" +const uint64_t OB_GV_LOCK_ORA_TID = 28062; // "GV$LOCK_ORA" +const uint64_t OB_V_LOCK_ORA_TID = 28063; // "V$LOCK_ORA" +const uint64_t OB_GV_OPEN_CURSOR_ORA_TID = 28064; // "GV$OPEN_CURSOR_ORA" +const uint64_t OB_V_OPEN_CURSOR_ORA_TID = 28065; // "V$OPEN_CURSOR_ORA" +const uint64_t OB_V_TIMEZONE_NAMES_ORA_TID = 28066; // "V$TIMEZONE_NAMES_ORA" +const uint64_t OB_GV_GLOBAL_TRANSACTION_ORA_TID = 28067; // "GV$GLOBAL_TRANSACTION_ORA" +const uint64_t OB_V_GLOBAL_TRANSACTION_ORA_TID = 28068; // "V$GLOBAL_TRANSACTION_ORA" +const uint64_t OB_V_RESTORE_POINT_ORA_TID = 28069; // "V$RESTORE_POINT_ORA" +const uint64_t OB_V_RSRC_PLAN_ORA_TID = 28070; // "V$RSRC_PLAN_ORA" +const uint64_t OB_TRIGGERS_TID = 28071; // "TRIGGERS" +const uint64_t OB_ALL_TABLE_V2_HISTORY_IDX_DATA_TABLE_ID_TID = 9998; // "__all_table_v2_history" +const uint64_t OB_ALL_TABLE_HISTORY_IDX_DATA_TABLE_ID_TID = 9999; // "__all_table_history" +const uint64_t OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TID = 14999; // "__all_virtual_plan_cache_stat" +const uint64_t OB_ALL_VIRTUAL_SESSION_EVENT_ALL_VIRTUAL_SESSION_EVENT_I1_TID = 14998; // "__all_virtual_session_event" +const uint64_t OB_ALL_VIRTUAL_SESSION_WAIT_ALL_VIRTUAL_SESSION_WAIT_I1_TID = 14997; // "__all_virtual_session_wait" +const uint64_t OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TID = 14996; // "__all_virtual_session_wait_history" +const uint64_t OB_ALL_VIRTUAL_SYSTEM_EVENT_ALL_VIRTUAL_SYSTEM_EVENT_I1_TID = 14995; // "__all_virtual_system_event" +const uint64_t OB_ALL_VIRTUAL_SESSTAT_ALL_VIRTUAL_SESSTAT_I1_TID = 14994; // "__all_virtual_sesstat" +const uint64_t OB_ALL_VIRTUAL_SYSSTAT_ALL_VIRTUAL_SYSSTAT_I1_TID = 14993; // "__all_virtual_sysstat" +const uint64_t OB_ALL_VIRTUAL_SQL_AUDIT_ALL_VIRTUAL_SQL_AUDIT_I1_TID = 14992; // "__all_virtual_sql_audit" +const uint64_t OB_ALL_VIRTUAL_REPLICA_TASK_ALL_VIRTUAL_REPLICA_TASK_I1_TID = 14991; // "__all_virtual_replica_task" +const uint64_t OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TID = 14990; // "__all_virtual_sql_plan_monitor" +const uint64_t OB_ALL_VIRTUAL_SQL_AUDIT_ORA_ALL_VIRTUAL_SQL_AUDIT_I1_TID = 19999; // "ALL_VIRTUAL_SQL_AUDIT_ORA" +const uint64_t OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TID = 19998; // "ALL_VIRTUAL_PLAN_CACHE_STAT_ORA" +const uint64_t OB_ALL_VIRTUAL_SESSION_WAIT_ORA_ALL_VIRTUAL_SESSION_WAIT_I1_TID = 19997; // "ALL_VIRTUAL_SESSION_WAIT_ORA" +const uint64_t OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TID = 19996; // "ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA" +const uint64_t OB_ALL_VIRTUAL_SESSTAT_ORA_ALL_VIRTUAL_SESSTAT_I1_TID = 19995; // "ALL_VIRTUAL_SESSTAT_ORA" +const uint64_t OB_ALL_VIRTUAL_SYSSTAT_ORA_ALL_VIRTUAL_SYSSTAT_I1_TID = 19994; // "ALL_VIRTUAL_SYSSTAT_ORA" +const uint64_t OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_ALL_VIRTUAL_SYSTEM_EVENT_I1_TID = 19993; // "ALL_VIRTUAL_SYSTEM_EVENT_ORA" +const uint64_t OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TID = 19992; // "ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA" -const char* const OB_ALL_CORE_TABLE_TNAME = "__all_core_table"; -const char* const OB_ALL_ROOT_TABLE_TNAME = "__all_root_table"; -const char* const OB_ALL_TABLE_TNAME = "__all_table"; -const char* const OB_ALL_COLUMN_TNAME = "__all_column"; -const char* const OB_ALL_DDL_OPERATION_TNAME = "__all_ddl_operation"; -const char* const OB_ALL_TABLE_V2_TNAME = "__all_table_v2"; -const char* const OB_ALL_META_TABLE_TNAME = "__all_meta_table"; -const char* const OB_ALL_USER_TNAME = "__all_user"; -const char* const OB_ALL_USER_HISTORY_TNAME = "__all_user_history"; -const char* const OB_ALL_DATABASE_TNAME = "__all_database"; -const char* const OB_ALL_DATABASE_HISTORY_TNAME = "__all_database_history"; -const char* const OB_ALL_TABLEGROUP_TNAME = "__all_tablegroup"; -const char* const OB_ALL_TABLEGROUP_HISTORY_TNAME = "__all_tablegroup_history"; -const char* const OB_ALL_TENANT_TNAME = "__all_tenant"; -const char* const OB_ALL_TENANT_HISTORY_TNAME = "__all_tenant_history"; -const char* const OB_ALL_TABLE_PRIVILEGE_TNAME = "__all_table_privilege"; -const char* const OB_ALL_TABLE_PRIVILEGE_HISTORY_TNAME = "__all_table_privilege_history"; -const char* const OB_ALL_DATABASE_PRIVILEGE_TNAME = "__all_database_privilege"; -const char* const OB_ALL_DATABASE_PRIVILEGE_HISTORY_TNAME = "__all_database_privilege_history"; -const char* const OB_ALL_TABLE_HISTORY_TNAME = "__all_table_history"; -const char* const OB_ALL_COLUMN_HISTORY_TNAME = "__all_column_history"; -const char* const OB_ALL_ZONE_TNAME = "__all_zone"; -const char* const OB_ALL_SERVER_TNAME = "__all_server"; -const char* const OB_ALL_SYS_PARAMETER_TNAME = "__all_sys_parameter"; -const char* const OB_TENANT_PARAMETER_TNAME = "__tenant_parameter"; -const char* const OB_ALL_SYS_VARIABLE_TNAME = "__all_sys_variable"; -const char* const OB_ALL_SYS_STAT_TNAME = "__all_sys_stat"; -const char* const OB_ALL_COLUMN_STATISTIC_TNAME = "__all_column_statistic"; -const char* const OB_ALL_UNIT_TNAME = "__all_unit"; -const char* const OB_ALL_UNIT_CONFIG_TNAME = "__all_unit_config"; -const char* const OB_ALL_RESOURCE_POOL_TNAME = "__all_resource_pool"; -const char* const OB_ALL_TENANT_RESOURCE_USAGE_TNAME = "__all_tenant_resource_usage"; -const char* const OB_ALL_SEQUENCE_TNAME = "__all_sequence"; -const char* const OB_ALL_CHARSET_TNAME = "__all_charset"; -const char* const OB_ALL_COLLATION_TNAME = "__all_collation"; -const char* const OB_ALL_LOCAL_INDEX_STATUS_TNAME = "__all_local_index_status"; -const char* const OB_ALL_DUMMY_TNAME = "__all_dummy"; -const char* const OB_ALL_FROZEN_MAP_TNAME = "__all_frozen_map"; -const char* const OB_ALL_CLOG_HISTORY_INFO_TNAME = "__all_clog_history_info"; -const char* const OB_ALL_CLOG_HISTORY_INFO_V2_TNAME = "__all_clog_history_info_v2"; -const char* const OB_ALL_ROOTSERVICE_EVENT_HISTORY_TNAME = "__all_rootservice_event_history"; -const char* const OB_ALL_PRIVILEGE_TNAME = "__all_privilege"; -const char* const OB_ALL_OUTLINE_TNAME = "__all_outline"; -const char* const OB_ALL_OUTLINE_HISTORY_TNAME = "__all_outline_history"; -const char* const OB_ALL_ELECTION_EVENT_HISTORY_TNAME = "__all_election_event_history"; -const char* const OB_ALL_RECYCLEBIN_TNAME = "__all_recyclebin"; -const char* const OB_ALL_PART_TNAME = "__all_part"; -const char* const OB_ALL_PART_HISTORY_TNAME = "__all_part_history"; -const char* const OB_ALL_SUB_PART_TNAME = "__all_sub_part"; -const char* const OB_ALL_SUB_PART_HISTORY_TNAME = "__all_sub_part_history"; -const char* const OB_ALL_PART_INFO_TNAME = "__all_part_info"; -const char* const OB_ALL_PART_INFO_HISTORY_TNAME = "__all_part_info_history"; -const char* const OB_ALL_DEF_SUB_PART_TNAME = "__all_def_sub_part"; -const char* const OB_ALL_DEF_SUB_PART_HISTORY_TNAME = "__all_def_sub_part_history"; -const char* const OB_ALL_SERVER_EVENT_HISTORY_TNAME = "__all_server_event_history"; -const char* const OB_ALL_ROOTSERVICE_JOB_TNAME = "__all_rootservice_job"; -const char* const OB_ALL_UNIT_LOAD_HISTORY_TNAME = "__all_unit_load_history"; -const char* const OB_ALL_SYS_VARIABLE_HISTORY_TNAME = "__all_sys_variable_history"; -const char* const OB_ALL_RESTORE_JOB_TNAME = "__all_restore_job"; -const char* const OB_ALL_RESTORE_TASK_TNAME = "__all_restore_task"; -const char* const OB_ALL_RESTORE_JOB_HISTORY_TNAME = "__all_restore_job_history"; -const char* const OB_ALL_TIME_ZONE_TNAME = "__all_time_zone"; -const char* const OB_ALL_TIME_ZONE_NAME_TNAME = "__all_time_zone_name"; -const char* const OB_ALL_TIME_ZONE_TRANSITION_TNAME = "__all_time_zone_transition"; -const char* const OB_ALL_TIME_ZONE_TRANSITION_TYPE_TNAME = "__all_time_zone_transition_type"; -const char* const OB_ALL_DDL_ID_TNAME = "__all_ddl_id"; -const char* const OB_ALL_FOREIGN_KEY_TNAME = "__all_foreign_key"; -const char* const OB_ALL_FOREIGN_KEY_HISTORY_TNAME = "__all_foreign_key_history"; -const char* const OB_ALL_FOREIGN_KEY_COLUMN_TNAME = "__all_foreign_key_column"; -const char* const OB_ALL_FOREIGN_KEY_COLUMN_HISTORY_TNAME = "__all_foreign_key_column_history"; -const char* const OB_ALL_SYNONYM_TNAME = "__all_synonym"; -const char* const OB_ALL_SYNONYM_HISTORY_TNAME = "__all_synonym_history"; -const char* const OB_ALL_SEQUENCE_V2_TNAME = "__all_sequence_v2"; -const char* const OB_ALL_TENANT_META_TABLE_TNAME = "__all_tenant_meta_table"; -const char* const OB_ALL_INDEX_WAIT_TRANSACTION_STATUS_TNAME = "__all_index_wait_transaction_status"; -const char* const OB_ALL_INDEX_SCHEDULE_TASK_TNAME = "__all_index_schedule_task"; -const char* const OB_ALL_INDEX_CHECKSUM_TNAME = "__all_index_checksum"; -const char* const OB_ALL_ROUTINE_TNAME = "__all_routine"; -const char* const OB_ALL_ROUTINE_HISTORY_TNAME = "__all_routine_history"; -const char* const OB_ALL_ROUTINE_PARAM_TNAME = "__all_routine_param"; -const char* const OB_ALL_ROUTINE_PARAM_HISTORY_TNAME = "__all_routine_param_history"; -const char* const OB_ALL_TABLE_STAT_TNAME = "__all_table_stat"; -const char* const OB_ALL_COLUMN_STAT_TNAME = "__all_column_stat"; -const char* const OB_ALL_HISTOGRAM_STAT_TNAME = "__all_histogram_stat"; -const char* const OB_ALL_PACKAGE_TNAME = "__all_package"; -const char* const OB_ALL_PACKAGE_HISTORY_TNAME = "__all_package_history"; -const char* const OB_ALL_SQL_EXECUTE_TASK_TNAME = "__all_sql_execute_task"; -const char* const OB_ALL_INDEX_BUILD_STAT_TNAME = "__all_index_build_stat"; -const char* const OB_ALL_BUILD_INDEX_PARAM_TNAME = "__all_build_index_param"; -const char* const OB_ALL_GLOBAL_INDEX_DATA_SRC_TNAME = "__all_global_index_data_src"; -const char* const OB_ALL_ACQUIRED_SNAPSHOT_TNAME = "__all_acquired_snapshot"; -const char* const OB_ALL_IMMEDIATE_EFFECT_INDEX_SSTABLE_TNAME = "__all_immediate_effect_index_sstable"; -const char* const OB_ALL_SSTABLE_CHECKSUM_TNAME = "__all_sstable_checksum"; -const char* const OB_ALL_TENANT_GC_PARTITION_INFO_TNAME = "__all_tenant_gc_partition_info"; -const char* const OB_ALL_CONSTRAINT_TNAME = "__all_constraint"; -const char* const OB_ALL_CONSTRAINT_HISTORY_TNAME = "__all_constraint_history"; -const char* const OB_ALL_ORI_SCHEMA_VERSION_TNAME = "__all_ori_schema_version"; -const char* const OB_ALL_FUNC_TNAME = "__all_func"; -const char* const OB_ALL_FUNC_HISTORY_TNAME = "__all_func_history"; -const char* const OB_ALL_TEMP_TABLE_TNAME = "__all_temp_table"; -const char* const OB_ALL_SSTABLE_COLUMN_CHECKSUM_TNAME = "__all_sstable_column_checksum"; -const char* const OB_ALL_SEQUENCE_OBJECT_TNAME = "__all_sequence_object"; -const char* const OB_ALL_SEQUENCE_OBJECT_HISTORY_TNAME = "__all_sequence_object_history"; -const char* const OB_ALL_SEQUENCE_VALUE_TNAME = "__all_sequence_value"; -const char* const OB_ALL_TENANT_PLAN_BASELINE_TNAME = "__all_tenant_plan_baseline"; -const char* const OB_ALL_TENANT_PLAN_BASELINE_HISTORY_TNAME = "__all_tenant_plan_baseline_history"; -const char* const OB_ALL_DDL_HELPER_TNAME = "__all_ddl_helper"; -const char* const OB_ALL_FREEZE_SCHEMA_VERSION_TNAME = "__all_freeze_schema_version"; -const char* const OB_ALL_TYPE_TNAME = "__all_type"; -const char* const OB_ALL_TYPE_HISTORY_TNAME = "__all_type_history"; -const char* const OB_ALL_TYPE_ATTR_TNAME = "__all_type_attr"; -const char* const OB_ALL_TYPE_ATTR_HISTORY_TNAME = "__all_type_attr_history"; -const char* const OB_ALL_COLL_TYPE_TNAME = "__all_coll_type"; -const char* const OB_ALL_COLL_TYPE_HISTORY_TNAME = "__all_coll_type_history"; -const char* const OB_ALL_WEAK_READ_SERVICE_TNAME = "__all_weak_read_service"; -const char* const OB_ALL_GTS_TNAME = "__all_gts"; -const char* const OB_ALL_TENANT_GTS_TNAME = "__all_tenant_gts"; -const char* const OB_ALL_PARTITION_MEMBER_LIST_TNAME = "__all_partition_member_list"; -const char* const OB_ALL_DBLINK_TNAME = "__all_dblink"; -const char* const OB_ALL_DBLINK_HISTORY_TNAME = "__all_dblink_history"; -const char* const OB_ALL_TENANT_PARTITION_META_TABLE_TNAME = "__all_tenant_partition_meta_table"; -const char* const OB_ALL_TENANT_ROLE_GRANTEE_MAP_TNAME = "__all_tenant_role_grantee_map"; -const char* const OB_ALL_TENANT_ROLE_GRANTEE_MAP_HISTORY_TNAME = "__all_tenant_role_grantee_map_history"; -const char* const OB_ALL_TENANT_KEYSTORE_TNAME = "__all_tenant_keystore"; -const char* const OB_ALL_TENANT_KEYSTORE_HISTORY_TNAME = "__all_tenant_keystore_history"; -const char* const OB_ALL_TENANT_TABLESPACE_TNAME = "__all_tenant_tablespace"; -const char* const OB_ALL_TENANT_TABLESPACE_HISTORY_TNAME = "__all_tenant_tablespace_history"; -const char* const OB_ALL_TENANT_USER_FAILED_LOGIN_STAT_TNAME = "__all_tenant_user_failed_login_stat"; -const char* const OB_ALL_TENANT_PROFILE_TNAME = "__all_tenant_profile"; -const char* const OB_ALL_TENANT_PROFILE_HISTORY_TNAME = "__all_tenant_profile_history"; -const char* const OB_ALL_TENANT_SECURITY_AUDIT_TNAME = "__all_tenant_security_audit"; -const char* const OB_ALL_TENANT_SECURITY_AUDIT_HISTORY_TNAME = "__all_tenant_security_audit_history"; -const char* const OB_ALL_TENANT_TRIGGER_TNAME = "__all_tenant_trigger"; -const char* const OB_ALL_TENANT_TRIGGER_HISTORY_TNAME = "__all_tenant_trigger_history"; -const char* const OB_ALL_SEED_PARAMETER_TNAME = "__all_seed_parameter"; -const char* const OB_ALL_TENANT_SSTABLE_COLUMN_CHECKSUM_TNAME = "__all_tenant_sstable_column_checksum"; -const char* const OB_ALL_TENANT_SECURITY_AUDIT_RECORD_TNAME = "__all_tenant_security_audit_record"; -const char* const OB_ALL_TENANT_SYSAUTH_TNAME = "__all_tenant_sysauth"; -const char* const OB_ALL_TENANT_SYSAUTH_HISTORY_TNAME = "__all_tenant_sysauth_history"; -const char* const OB_ALL_TENANT_OBJAUTH_TNAME = "__all_tenant_objauth"; -const char* const OB_ALL_TENANT_OBJAUTH_HISTORY_TNAME = "__all_tenant_objauth_history"; -const char* const OB_ALL_TENANT_BACKUP_INFO_TNAME = "__all_tenant_backup_info"; -const char* const OB_ALL_RESTORE_INFO_TNAME = "__all_restore_info"; -const char* const OB_ALL_TENANT_BACKUP_LOG_ARCHIVE_STATUS_TNAME = "__all_tenant_backup_log_archive_status"; -const char* const OB_ALL_BACKUP_LOG_ARCHIVE_STATUS_HISTORY_TNAME = "__all_backup_log_archive_status_history"; -const char* const OB_ALL_TENANT_BACKUP_TASK_TNAME = "__all_tenant_backup_task"; -const char* const OB_ALL_BACKUP_TASK_HISTORY_TNAME = "__all_backup_task_history"; -const char* const OB_ALL_TENANT_PG_BACKUP_TASK_TNAME = "__all_tenant_pg_backup_task"; -const char* const OB_ALL_TENANT_ERROR_TNAME = "__all_tenant_error"; -const char* const OB_ALL_SERVER_RECOVERY_STATUS_TNAME = "__all_server_recovery_status"; -const char* const OB_ALL_DATAFILE_RECOVERY_STATUS_TNAME = "__all_datafile_recovery_status"; -const char* const OB_ALL_TENANT_BACKUP_CLEAN_INFO_TNAME = "__all_tenant_backup_clean_info"; -const char* const OB_ALL_BACKUP_CLEAN_INFO_HISTORY_TNAME = "__all_backup_clean_info_history"; -const char* const OB_ALL_BACKUP_TASK_CLEAN_HISTORY_TNAME = "__all_backup_task_clean_history"; -const char* const OB_ALL_RESTORE_PROGRESS_TNAME = "__all_restore_progress"; -const char* const OB_ALL_RESTORE_HISTORY_TNAME = "__all_restore_history"; -const char* const OB_ALL_TENANT_RESTORE_PG_INFO_TNAME = "__all_tenant_restore_pg_info"; -const char* const OB_ALL_TABLE_V2_HISTORY_TNAME = "__all_table_v2_history"; -const char* const OB_ALL_TENANT_OBJECT_TYPE_TNAME = "__all_tenant_object_type"; -const char* const OB_ALL_TENANT_OBJECT_TYPE_HISTORY_TNAME = "__all_tenant_object_type_history"; -const char* const OB_ALL_BACKUP_VALIDATION_JOB_TNAME = "__all_backup_validation_job"; -const char* const OB_ALL_BACKUP_VALIDATION_JOB_HISTORY_TNAME = "__all_backup_validation_job_history"; -const char* const OB_ALL_TENANT_BACKUP_VALIDATION_TASK_TNAME = "__all_tenant_backup_validation_task"; -const char* const OB_ALL_BACKUP_VALIDATION_TASK_HISTORY_TNAME = "__all_backup_validation_task_history"; -const char* const OB_ALL_TENANT_PG_BACKUP_VALIDATION_TASK_TNAME = "__all_tenant_pg_backup_validation_task"; -const char* const OB_ALL_TENANT_TIME_ZONE_TNAME = "__all_tenant_time_zone"; -const char* const OB_ALL_TENANT_TIME_ZONE_NAME_TNAME = "__all_tenant_time_zone_name"; -const char* const OB_ALL_TENANT_TIME_ZONE_TRANSITION_TNAME = "__all_tenant_time_zone_transition"; -const char* const OB_ALL_TENANT_TIME_ZONE_TRANSITION_TYPE_TNAME = "__all_tenant_time_zone_transition_type"; -const char* const OB_ALL_TENANT_CONSTRAINT_COLUMN_TNAME = "__all_tenant_constraint_column"; -const char* const OB_ALL_TENANT_CONSTRAINT_COLUMN_HISTORY_TNAME = "__all_tenant_constraint_column_history"; -const char* const OB_ALL_TENANT_GLOBAL_TRANSACTION_TNAME = "__all_tenant_global_transaction"; -const char* const OB_ALL_TENANT_DEPENDENCY_TNAME = "__all_tenant_dependency"; -const char* const OB_ALL_BACKUP_BACKUPSET_JOB_TNAME = "__all_backup_backupset_job"; -const char* const OB_ALL_BACKUP_BACKUPSET_JOB_HISTORY_TNAME = "__all_backup_backupset_job_history"; -const char* const OB_ALL_TENANT_BACKUP_BACKUPSET_TASK_TNAME = "__all_tenant_backup_backupset_task"; -const char* const OB_ALL_BACKUP_BACKUPSET_TASK_HISTORY_TNAME = "__all_backup_backupset_task_history"; -const char* const OB_ALL_TENANT_PG_BACKUP_BACKUPSET_TASK_TNAME = "__all_tenant_pg_backup_backupset_task"; -const char* const OB_ALL_TENANT_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TNAME = - "__all_tenant_backup_backup_log_archive_status"; -const char* const OB_ALL_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_HISTORY_TNAME = - "__all_backup_backup_log_archive_status_history"; -const char* const OB_ALL_RES_MGR_PLAN_TNAME = "__all_res_mgr_plan"; -const char* const OB_ALL_RES_MGR_DIRECTIVE_TNAME = "__all_res_mgr_directive"; -const char* const OB_ALL_RES_MGR_MAPPING_RULE_TNAME = "__all_res_mgr_mapping_rule"; -const char* const OB_ALL_RES_MGR_CONSUMER_GROUP_TNAME = "__all_res_mgr_consumer_group"; -const char* const OB_TENANT_VIRTUAL_ALL_TABLE_TNAME = "__tenant_virtual_all_table"; -const char* const OB_TENANT_VIRTUAL_TABLE_COLUMN_TNAME = "__tenant_virtual_table_column"; -const char* const OB_TENANT_VIRTUAL_TABLE_INDEX_TNAME = "__tenant_virtual_table_index"; -const char* const OB_TENANT_VIRTUAL_SHOW_CREATE_DATABASE_TNAME = "__tenant_virtual_show_create_database"; -const char* const OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_TNAME = "__tenant_virtual_show_create_table"; -const char* const OB_TENANT_VIRTUAL_SESSION_VARIABLE_TNAME = "__tenant_virtual_session_variable"; -const char* const OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_TNAME = "__tenant_virtual_privilege_grant"; -const char* const OB_ALL_VIRTUAL_PROCESSLIST_TNAME = "__all_virtual_processlist"; -const char* const OB_TENANT_VIRTUAL_WARNING_TNAME = "__tenant_virtual_warning"; -const char* const OB_TENANT_VIRTUAL_CURRENT_TENANT_TNAME = "__tenant_virtual_current_tenant"; -const char* const OB_TENANT_VIRTUAL_DATABASE_STATUS_TNAME = "__tenant_virtual_database_status"; -const char* const OB_TENANT_VIRTUAL_TENANT_STATUS_TNAME = "__tenant_virtual_tenant_status"; -const char* const OB_TENANT_VIRTUAL_INTERM_RESULT_TNAME = "__tenant_virtual_interm_result"; -const char* const OB_TENANT_VIRTUAL_PARTITION_STAT_TNAME = "__tenant_virtual_partition_stat"; -const char* const OB_TENANT_VIRTUAL_STATNAME_TNAME = "__tenant_virtual_statname"; -const char* const OB_TENANT_VIRTUAL_EVENT_NAME_TNAME = "__tenant_virtual_event_name"; -const char* const OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_TNAME = "__tenant_virtual_global_variable"; -const char* const OB_TENANT_VIRTUAL_SHOW_TABLES_TNAME = "__tenant_virtual_show_tables"; -const char* const OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_TNAME = "__tenant_virtual_show_create_procedure"; -const char* const OB_ALL_VIRTUAL_CORE_META_TABLE_TNAME = "__all_virtual_core_meta_table"; -const char* const OB_ALL_VIRTUAL_ZONE_STAT_TNAME = "__all_virtual_zone_stat"; -const char* const OB_ALL_VIRTUAL_PLAN_CACHE_STAT_TNAME = "__all_virtual_plan_cache_stat"; -const char* const OB_ALL_VIRTUAL_PLAN_STAT_TNAME = "__all_virtual_plan_stat"; -const char* const OB_ALL_VIRTUAL_MEM_LEAK_CHECKER_INFO_TNAME = "__all_virtual_mem_leak_checker_info"; -const char* const OB_ALL_VIRTUAL_LATCH_TNAME = "__all_virtual_latch"; -const char* const OB_ALL_VIRTUAL_KVCACHE_INFO_TNAME = "__all_virtual_kvcache_info"; -const char* const OB_ALL_VIRTUAL_DATA_TYPE_CLASS_TNAME = "__all_virtual_data_type_class"; -const char* const OB_ALL_VIRTUAL_DATA_TYPE_TNAME = "__all_virtual_data_type"; -const char* const OB_ALL_VIRTUAL_SERVER_STAT_TNAME = "__all_virtual_server_stat"; -const char* const OB_ALL_VIRTUAL_REBALANCE_TASK_STAT_TNAME = "__all_virtual_rebalance_task_stat"; -const char* const OB_ALL_VIRTUAL_SESSION_EVENT_TNAME = "__all_virtual_session_event"; -const char* const OB_ALL_VIRTUAL_SESSION_WAIT_TNAME = "__all_virtual_session_wait"; -const char* const OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_TNAME = "__all_virtual_session_wait_history"; -const char* const OB_ALL_VIRTUAL_SYSTEM_EVENT_TNAME = "__all_virtual_system_event"; -const char* const OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_TNAME = "__all_virtual_tenant_memstore_info"; -const char* const OB_ALL_VIRTUAL_CONCURRENCY_OBJECT_POOL_TNAME = "__all_virtual_concurrency_object_pool"; -const char* const OB_ALL_VIRTUAL_SESSTAT_TNAME = "__all_virtual_sesstat"; -const char* const OB_ALL_VIRTUAL_SYSSTAT_TNAME = "__all_virtual_sysstat"; -const char* const OB_ALL_VIRTUAL_STORAGE_STAT_TNAME = "__all_virtual_storage_stat"; -const char* const OB_ALL_VIRTUAL_DISK_STAT_TNAME = "__all_virtual_disk_stat"; -const char* const OB_ALL_VIRTUAL_MEMSTORE_INFO_TNAME = "__all_virtual_memstore_info"; -const char* const OB_ALL_VIRTUAL_PARTITION_INFO_TNAME = "__all_virtual_partition_info"; -const char* const OB_ALL_VIRTUAL_UPGRADE_INSPECTION_TNAME = "__all_virtual_upgrade_inspection"; -const char* const OB_ALL_VIRTUAL_TRANS_STAT_TNAME = "__all_virtual_trans_stat"; -const char* const OB_ALL_VIRTUAL_TRANS_MGR_STAT_TNAME = "__all_virtual_trans_mgr_stat"; -const char* const OB_ALL_VIRTUAL_ELECTION_INFO_TNAME = "__all_virtual_election_info"; -const char* const OB_ALL_VIRTUAL_ELECTION_MEM_STAT_TNAME = "__all_virtual_election_mem_stat"; -const char* const OB_ALL_VIRTUAL_SQL_AUDIT_TNAME = "__all_virtual_sql_audit"; -const char* const OB_ALL_VIRTUAL_TRANS_MEM_STAT_TNAME = "__all_virtual_trans_mem_stat"; -const char* const OB_ALL_VIRTUAL_PARTITION_SSTABLE_IMAGE_INFO_TNAME = "__all_virtual_partition_sstable_image_info"; -const char* const OB_ALL_VIRTUAL_CORE_ROOT_TABLE_TNAME = "__all_virtual_core_root_table"; -const char* const OB_ALL_VIRTUAL_CORE_ALL_TABLE_TNAME = "__all_virtual_core_all_table"; -const char* const OB_ALL_VIRTUAL_CORE_COLUMN_TABLE_TNAME = "__all_virtual_core_column_table"; -const char* const OB_ALL_VIRTUAL_MEMORY_INFO_TNAME = "__all_virtual_memory_info"; -const char* const OB_ALL_VIRTUAL_TENANT_STAT_TNAME = "__all_virtual_tenant_stat"; -const char* const OB_ALL_VIRTUAL_SYS_PARAMETER_STAT_TNAME = "__all_virtual_sys_parameter_stat"; -const char* const OB_ALL_VIRTUAL_PARTITION_REPLAY_STATUS_TNAME = "__all_virtual_partition_replay_status"; -const char* const OB_ALL_VIRTUAL_CLOG_STAT_TNAME = "__all_virtual_clog_stat"; -const char* const OB_ALL_VIRTUAL_TRACE_LOG_TNAME = "__all_virtual_trace_log"; -const char* const OB_ALL_VIRTUAL_ENGINE_TNAME = "__all_virtual_engine"; -const char* const OB_ALL_VIRTUAL_PROXY_SERVER_STAT_TNAME = "__all_virtual_proxy_server_stat"; -const char* const OB_ALL_VIRTUAL_PROXY_SYS_VARIABLE_TNAME = "__all_virtual_proxy_sys_variable"; -const char* const OB_ALL_VIRTUAL_PROXY_SCHEMA_TNAME = "__all_virtual_proxy_schema"; -const char* const OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_TNAME = "__all_virtual_plan_cache_plan_explain"; -const char* const OB_ALL_VIRTUAL_OBRPC_STAT_TNAME = "__all_virtual_obrpc_stat"; -const char* const OB_ALL_VIRTUAL_PARTITION_SSTABLE_MERGE_INFO_TNAME = "__all_virtual_partition_sstable_merge_info"; -const char* const OB_ALL_VIRTUAL_SQL_MONITOR_TNAME = "__all_virtual_sql_monitor"; -const char* const OB_TENANT_VIRTUAL_OUTLINE_TNAME = "__tenant_virtual_outline"; -const char* const OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_TNAME = "__tenant_virtual_concurrent_limit_sql"; -const char* const OB_ALL_VIRTUAL_SQL_PLAN_STATISTICS_TNAME = "__all_virtual_sql_plan_statistics"; -const char* const OB_ALL_VIRTUAL_PARTITION_SSTABLE_MACRO_INFO_TNAME = "__all_virtual_partition_sstable_macro_info"; -const char* const OB_ALL_VIRTUAL_PROXY_PARTITION_INFO_TNAME = "__all_virtual_proxy_partition_info"; -const char* const OB_ALL_VIRTUAL_PROXY_PARTITION_TNAME = "__all_virtual_proxy_partition"; -const char* const OB_ALL_VIRTUAL_PROXY_SUB_PARTITION_TNAME = "__all_virtual_proxy_sub_partition"; -const char* const OB_ALL_VIRTUAL_PROXY_ROUTE_TNAME = "__all_virtual_proxy_route"; -const char* const OB_ALL_VIRTUAL_REBALANCE_TENANT_STAT_TNAME = "__all_virtual_rebalance_tenant_stat"; -const char* const OB_ALL_VIRTUAL_REBALANCE_UNIT_STAT_TNAME = "__all_virtual_rebalance_unit_stat"; -const char* const OB_ALL_VIRTUAL_REBALANCE_REPLICA_STAT_TNAME = "__all_virtual_rebalance_replica_stat"; -const char* const OB_ALL_VIRTUAL_PARTITION_AMPLIFICATION_STAT_TNAME = "__all_virtual_partition_amplification_stat"; -const char* const OB_ALL_VIRTUAL_ELECTION_EVENT_HISTORY_TNAME = "__all_virtual_election_event_history"; -const char* const OB_ALL_VIRTUAL_PARTITION_STORE_INFO_TNAME = "__all_virtual_partition_store_info"; -const char* const OB_ALL_VIRTUAL_LEADER_STAT_TNAME = "__all_virtual_leader_stat"; -const char* const OB_ALL_VIRTUAL_PARTITION_MIGRATION_STATUS_TNAME = "__all_virtual_partition_migration_status"; -const char* const OB_ALL_VIRTUAL_SYS_TASK_STATUS_TNAME = "__all_virtual_sys_task_status"; -const char* const OB_ALL_VIRTUAL_MACRO_BLOCK_MARKER_STATUS_TNAME = "__all_virtual_macro_block_marker_status"; -const char* const OB_ALL_VIRTUAL_SERVER_CLOG_STAT_TNAME = "__all_virtual_server_clog_stat"; -const char* const OB_ALL_VIRTUAL_ROOTSERVICE_STAT_TNAME = "__all_virtual_rootservice_stat"; -const char* const OB_ALL_VIRTUAL_ELECTION_PRIORITY_TNAME = "__all_virtual_election_priority"; -const char* const OB_ALL_VIRTUAL_TENANT_DISK_STAT_TNAME = "__all_virtual_tenant_disk_stat"; -const char* const OB_ALL_VIRTUAL_REBALANCE_MAP_STAT_TNAME = "__all_virtual_rebalance_map_stat"; -const char* const OB_ALL_VIRTUAL_REBALANCE_MAP_ITEM_STAT_TNAME = "__all_virtual_rebalance_map_item_stat"; -const char* const OB_ALL_VIRTUAL_IO_STAT_TNAME = "__all_virtual_io_stat"; -const char* const OB_ALL_VIRTUAL_LONG_OPS_STATUS_TNAME = "__all_virtual_long_ops_status"; -const char* const OB_ALL_VIRTUAL_REBALANCE_UNIT_MIGRATE_STAT_TNAME = "__all_virtual_rebalance_unit_migrate_stat"; -const char* const OB_ALL_VIRTUAL_REBALANCE_UNIT_DISTRIBUTION_STAT_TNAME = - "__all_virtual_rebalance_unit_distribution_stat"; -const char* const OB_ALL_VIRTUAL_SERVER_OBJECT_POOL_TNAME = "__all_virtual_server_object_pool"; -const char* const OB_ALL_VIRTUAL_TRANS_LOCK_STAT_TNAME = "__all_virtual_trans_lock_stat"; -const char* const OB_ALL_VIRTUAL_ELECTION_GROUP_INFO_TNAME = "__all_virtual_election_group_info"; -const char* const OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_TNAME = "__tenant_virtual_show_create_tablegroup"; -const char* const OB_ALL_VIRTUAL_SERVER_BLACKLIST_TNAME = "__all_virtual_server_blacklist"; -const char* const OB_ALL_VIRTUAL_PARTITION_SPLIT_INFO_TNAME = "__all_virtual_partition_split_info"; -const char* const OB_ALL_VIRTUAL_TRANS_RESULT_INFO_STAT_TNAME = "__all_virtual_trans_result_info_stat"; -const char* const OB_ALL_VIRTUAL_DUPLICATE_PARTITION_MGR_STAT_TNAME = "__all_virtual_duplicate_partition_mgr_stat"; -const char* const OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_TNAME = "__all_virtual_tenant_parameter_stat"; -const char* const OB_ALL_VIRTUAL_SERVER_SCHEMA_INFO_TNAME = "__all_virtual_server_schema_info"; -const char* const OB_ALL_VIRTUAL_MEMORY_CONTEXT_STAT_TNAME = "__all_virtual_memory_context_stat"; -const char* const OB_ALL_VIRTUAL_DUMP_TENANT_INFO_TNAME = "__all_virtual_dump_tenant_info"; -const char* const OB_ALL_VIRTUAL_TENANT_PARAMETER_INFO_TNAME = "__all_virtual_tenant_parameter_info"; -const char* const OB_ALL_VIRTUAL_DAG_WARNING_HISTORY_TNAME = "__all_virtual_dag_warning_history"; -const char* const OB_SESSION_VARIABLES_TNAME = "SESSION_VARIABLES"; -const char* const OB_TABLE_PRIVILEGES_TNAME = "TABLE_PRIVILEGES"; -const char* const OB_USER_PRIVILEGES_TNAME = "USER_PRIVILEGES"; -const char* const OB_SCHEMA_PRIVILEGES_TNAME = "SCHEMA_PRIVILEGES"; -const char* const OB_TABLE_CONSTRAINTS_TNAME = "TABLE_CONSTRAINTS"; -const char* const OB_GLOBAL_STATUS_TNAME = "GLOBAL_STATUS"; -const char* const OB_PARTITIONS_TNAME = "PARTITIONS"; -const char* const OB_SESSION_STATUS_TNAME = "SESSION_STATUS"; -const char* const OB_USER_TNAME = "user"; -const char* const OB_DB_TNAME = "db"; -const char* const OB_ALL_VIRTUAL_SERVER_MEMORY_INFO_TNAME = "__all_virtual_server_memory_info"; -const char* const OB_ALL_VIRTUAL_PARTITION_TABLE_TNAME = "__all_virtual_partition_table"; -const char* const OB_ALL_VIRTUAL_LOCK_WAIT_STAT_TNAME = "__all_virtual_lock_wait_stat"; -const char* const OB_ALL_VIRTUAL_PARTITION_ITEM_TNAME = "__all_virtual_partition_item"; -const char* const OB_ALL_VIRTUAL_REPLICA_TASK_TNAME = "__all_virtual_replica_task"; -const char* const OB_ALL_VIRTUAL_PARTITION_LOCATION_TNAME = "__all_virtual_partition_location"; -const char* const OB_PROC_TNAME = "proc"; -const char* const OB_TENANT_VIRTUAL_COLLATION_TNAME = "__tenant_virtual_collation"; -const char* const OB_TENANT_VIRTUAL_CHARSET_TNAME = "__tenant_virtual_charset"; -const char* const OB_ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_TNAME = "__all_virtual_tenant_memstore_allocator_info"; -const char* const OB_ALL_VIRTUAL_TABLE_MGR_TNAME = "__all_virtual_table_mgr"; -const char* const OB_ALL_VIRTUAL_META_TABLE_TNAME = "__all_virtual_meta_table"; -const char* const OB_ALL_VIRTUAL_FREEZE_INFO_TNAME = "__all_virtual_freeze_info"; -const char* const OB_PARAMETERS_TNAME = "PARAMETERS"; -const char* const OB_ALL_VIRTUAL_BAD_BLOCK_TABLE_TNAME = "__all_virtual_bad_block_table"; -const char* const OB_ALL_VIRTUAL_PX_WORKER_STAT_TNAME = "__all_virtual_px_worker_stat"; -const char* const OB_ALL_VIRTUAL_TRANS_AUDIT_TNAME = "__all_virtual_trans_audit"; -const char* const OB_ALL_VIRTUAL_TRANS_SQL_AUDIT_TNAME = "__all_virtual_trans_sql_audit"; -const char* const OB_ALL_VIRTUAL_WEAK_READ_STAT_TNAME = "__all_virtual_weak_read_stat"; -const char* const OB_ALL_VIRTUAL_PARTITION_AUDIT_TNAME = "__all_virtual_partition_audit"; -const char* const OB_ALL_VIRTUAL_SEQUENCE_V2_TNAME = "__all_virtual_sequence_v2"; -const char* const OB_ALL_VIRTUAL_SEQUENCE_VALUE_TNAME = "__all_virtual_sequence_value"; -const char* const OB_ALL_VIRTUAL_CLUSTER_TNAME = "__all_virtual_cluster"; -const char* const OB_ALL_VIRTUAL_PARTITION_TABLE_STORE_STAT_TNAME = "__all_virtual_partition_table_store_stat"; -const char* const OB_ALL_VIRTUAL_DDL_OPERATION_TNAME = "__all_virtual_ddl_operation"; -const char* const OB_ALL_VIRTUAL_OUTLINE_TNAME = "__all_virtual_outline"; -const char* const OB_ALL_VIRTUAL_OUTLINE_HISTORY_TNAME = "__all_virtual_outline_history"; -const char* const OB_ALL_VIRTUAL_SYNONYM_TNAME = "__all_virtual_synonym"; -const char* const OB_ALL_VIRTUAL_SYNONYM_HISTORY_TNAME = "__all_virtual_synonym_history"; -const char* const OB_ALL_VIRTUAL_DATABASE_PRIVILEGE_TNAME = "__all_virtual_database_privilege"; -const char* const OB_ALL_VIRTUAL_DATABASE_PRIVILEGE_HISTORY_TNAME = "__all_virtual_database_privilege_history"; -const char* const OB_ALL_VIRTUAL_TABLE_PRIVILEGE_TNAME = "__all_virtual_table_privilege"; -const char* const OB_ALL_VIRTUAL_TABLE_PRIVILEGE_HISTORY_TNAME = "__all_virtual_table_privilege_history"; -const char* const OB_ALL_VIRTUAL_DATABASE_TNAME = "__all_virtual_database"; -const char* const OB_ALL_VIRTUAL_DATABASE_HISTORY_TNAME = "__all_virtual_database_history"; -const char* const OB_ALL_VIRTUAL_TABLEGROUP_TNAME = "__all_virtual_tablegroup"; -const char* const OB_ALL_VIRTUAL_TABLEGROUP_HISTORY_TNAME = "__all_virtual_tablegroup_history"; -const char* const OB_ALL_VIRTUAL_TABLE_TNAME = "__all_virtual_table"; -const char* const OB_ALL_VIRTUAL_TABLE_HISTORY_TNAME = "__all_virtual_table_history"; -const char* const OB_ALL_VIRTUAL_COLUMN_TNAME = "__all_virtual_column"; -const char* const OB_ALL_VIRTUAL_COLUMN_HISTORY_TNAME = "__all_virtual_column_history"; -const char* const OB_ALL_VIRTUAL_PART_TNAME = "__all_virtual_part"; -const char* const OB_ALL_VIRTUAL_PART_HISTORY_TNAME = "__all_virtual_part_history"; -const char* const OB_ALL_VIRTUAL_PART_INFO_TNAME = "__all_virtual_part_info"; -const char* const OB_ALL_VIRTUAL_PART_INFO_HISTORY_TNAME = "__all_virtual_part_info_history"; -const char* const OB_ALL_VIRTUAL_DEF_SUB_PART_TNAME = "__all_virtual_def_sub_part"; -const char* const OB_ALL_VIRTUAL_DEF_SUB_PART_HISTORY_TNAME = "__all_virtual_def_sub_part_history"; -const char* const OB_ALL_VIRTUAL_SUB_PART_TNAME = "__all_virtual_sub_part"; -const char* const OB_ALL_VIRTUAL_SUB_PART_HISTORY_TNAME = "__all_virtual_sub_part_history"; -const char* const OB_ALL_VIRTUAL_CONSTRAINT_TNAME = "__all_virtual_constraint"; -const char* const OB_ALL_VIRTUAL_CONSTRAINT_HISTORY_TNAME = "__all_virtual_constraint_history"; -const char* const OB_ALL_VIRTUAL_FOREIGN_KEY_TNAME = "__all_virtual_foreign_key"; -const char* const OB_ALL_VIRTUAL_FOREIGN_KEY_HISTORY_TNAME = "__all_virtual_foreign_key_history"; -const char* const OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_TNAME = "__all_virtual_foreign_key_column"; -const char* const OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_HISTORY_TNAME = "__all_virtual_foreign_key_column_history"; -const char* const OB_ALL_VIRTUAL_TEMP_TABLE_TNAME = "__all_virtual_temp_table"; -const char* const OB_ALL_VIRTUAL_ORI_SCHEMA_VERSION_TNAME = "__all_virtual_ori_schema_version"; -const char* const OB_ALL_VIRTUAL_SYS_STAT_TNAME = "__all_virtual_sys_stat"; -const char* const OB_ALL_VIRTUAL_USER_TNAME = "__all_virtual_user"; -const char* const OB_ALL_VIRTUAL_USER_HISTORY_TNAME = "__all_virtual_user_history"; -const char* const OB_ALL_VIRTUAL_SYS_VARIABLE_TNAME = "__all_virtual_sys_variable"; -const char* const OB_ALL_VIRTUAL_SYS_VARIABLE_HISTORY_TNAME = "__all_virtual_sys_variable_history"; -const char* const OB_ALL_VIRTUAL_FUNC_TNAME = "__all_virtual_func"; -const char* const OB_ALL_VIRTUAL_FUNC_HISTORY_TNAME = "__all_virtual_func_history"; -const char* const OB_ALL_VIRTUAL_PACKAGE_TNAME = "__all_virtual_package"; -const char* const OB_ALL_VIRTUAL_PACKAGE_HISTORY_TNAME = "__all_virtual_package_history"; -const char* const OB_ALL_VIRTUAL_ROUTINE_TNAME = "__all_virtual_routine"; -const char* const OB_ALL_VIRTUAL_ROUTINE_HISTORY_TNAME = "__all_virtual_routine_history"; -const char* const OB_ALL_VIRTUAL_ROUTINE_PARAM_TNAME = "__all_virtual_routine_param"; -const char* const OB_ALL_VIRTUAL_ROUTINE_PARAM_HISTORY_TNAME = "__all_virtual_routine_param_history"; -const char* const OB_ALL_VIRTUAL_TYPE_TNAME = "__all_virtual_type"; -const char* const OB_ALL_VIRTUAL_TYPE_HISTORY_TNAME = "__all_virtual_type_history"; -const char* const OB_ALL_VIRTUAL_TYPE_ATTR_TNAME = "__all_virtual_type_attr"; -const char* const OB_ALL_VIRTUAL_TYPE_ATTR_HISTORY_TNAME = "__all_virtual_type_attr_history"; -const char* const OB_ALL_VIRTUAL_COLL_TYPE_TNAME = "__all_virtual_coll_type"; -const char* const OB_ALL_VIRTUAL_COLL_TYPE_HISTORY_TNAME = "__all_virtual_coll_type_history"; -const char* const OB_ALL_VIRTUAL_COLUMN_STAT_TNAME = "__all_virtual_column_stat"; -const char* const OB_ALL_VIRTUAL_TABLE_STAT_TNAME = "__all_virtual_table_stat"; -const char* const OB_ALL_VIRTUAL_HISTOGRAM_STAT_TNAME = "__all_virtual_histogram_stat"; -const char* const OB_ALL_VIRTUAL_COLUMN_STATISTIC_TNAME = "__all_virtual_column_statistic"; -const char* const OB_ALL_VIRTUAL_RECYCLEBIN_TNAME = "__all_virtual_recyclebin"; -const char* const OB_ALL_VIRTUAL_TENANT_GC_PARTITION_INFO_TNAME = "__all_virtual_tenant_gc_partition_info"; -const char* const OB_ALL_VIRTUAL_TENANT_PLAN_BASELINE_TNAME = "__all_virtual_tenant_plan_baseline"; -const char* const OB_ALL_VIRTUAL_TENANT_PLAN_BASELINE_HISTORY_TNAME = "__all_virtual_tenant_plan_baseline_history"; -const char* const OB_ALL_VIRTUAL_SEQUENCE_OBJECT_TNAME = "__all_virtual_sequence_object"; -const char* const OB_ALL_VIRTUAL_SEQUENCE_OBJECT_HISTORY_TNAME = "__all_virtual_sequence_object_history"; -const char* const OB_ALL_VIRTUAL_RAID_STAT_TNAME = "__all_virtual_raid_stat"; -const char* const OB_ALL_VIRTUAL_SERVER_LOG_META_TNAME = "__all_virtual_server_log_meta"; -const char* const OB_ALL_VIRTUAL_DTL_CHANNEL_TNAME = "__all_virtual_dtl_channel"; -const char* const OB_ALL_VIRTUAL_DTL_MEMORY_TNAME = "__all_virtual_dtl_memory"; -const char* const OB_ALL_VIRTUAL_DTL_FIRST_CACHED_BUFFER_TNAME = "__all_virtual_dtl_first_cached_buffer"; -const char* const OB_ALL_VIRTUAL_DBLINK_TNAME = "__all_virtual_dblink"; -const char* const OB_ALL_VIRTUAL_DBLINK_HISTORY_TNAME = "__all_virtual_dblink_history"; -const char* const OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_TNAME = "__all_virtual_tenant_partition_meta_table"; -const char* const OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_TNAME = "__all_virtual_tenant_role_grantee_map"; -const char* const OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_HISTORY_TNAME = - "__all_virtual_tenant_role_grantee_map_history"; -const char* const OB_ALL_VIRTUAL_TENANT_KEYSTORE_TNAME = "__all_virtual_tenant_keystore"; -const char* const OB_ALL_VIRTUAL_TENANT_KEYSTORE_HISTORY_TNAME = "__all_virtual_tenant_keystore_history"; -const char* const OB_ALL_VIRTUAL_DEADLOCK_STAT_TNAME = "__all_virtual_deadlock_stat"; -const char* const OB_ALL_VIRTUAL_TENANT_TABLESPACE_TNAME = "__all_virtual_tenant_tablespace"; -const char* const OB_ALL_VIRTUAL_TENANT_TABLESPACE_HISTORY_TNAME = "__all_virtual_tenant_tablespace_history"; -const char* const OB_ALL_VIRTUAL_INFORMATION_COLUMNS_TNAME = "__ALL_VIRTUAL_INFORMATION_COLUMNS"; -const char* const OB_ALL_VIRTUAL_PG_PARTITION_INFO_TNAME = "__all_virtual_pg_partition_info"; -const char* const OB_ALL_VIRTUAL_TENANT_USER_FAILED_LOGIN_STAT_TNAME = "__all_virtual_tenant_user_failed_login_stat"; -const char* const OB_ALL_VIRTUAL_TENANT_PROFILE_TNAME = "__all_virtual_tenant_profile"; -const char* const OB_ALL_VIRTUAL_TENANT_PROFILE_HISTORY_TNAME = "__all_virtual_tenant_profile_history"; -const char* const OB_ALL_VIRTUAL_SECURITY_AUDIT_TNAME = "__all_virtual_security_audit"; -const char* const OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_TNAME = "__all_virtual_security_audit_history"; -const char* const OB_ALL_VIRTUAL_TRIGGER_TNAME = "__all_virtual_trigger"; -const char* const OB_ALL_VIRTUAL_TRIGGER_HISTORY_TNAME = "__all_virtual_trigger_history"; -const char* const OB_ALL_VIRTUAL_CLUSTER_STATS_TNAME = "__all_virtual_cluster_stats"; -const char* const OB_ALL_VIRTUAL_SSTABLE_COLUMN_CHECKSUM_TNAME = "__all_virtual_sstable_column_checksum"; -const char* const OB_ALL_VIRTUAL_PS_STAT_TNAME = "__all_virtual_ps_stat"; -const char* const OB_ALL_VIRTUAL_PS_ITEM_INFO_TNAME = "__all_virtual_ps_item_info"; -const char* const OB_ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_TNAME = "__all_virtual_sql_workarea_history_stat"; -const char* const OB_ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_TNAME = "__all_virtual_sql_workarea_active"; -const char* const OB_ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_TNAME = "__all_virtual_sql_workarea_histogram"; -const char* const OB_ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_TNAME = "__all_virtual_sql_workarea_memory_info"; -const char* const OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_TNAME = "__all_virtual_security_audit_record"; -const char* const OB_ALL_VIRTUAL_SYSAUTH_TNAME = "__all_virtual_sysauth"; -const char* const OB_ALL_VIRTUAL_SYSAUTH_HISTORY_TNAME = "__all_virtual_sysauth_history"; -const char* const OB_ALL_VIRTUAL_OBJAUTH_TNAME = "__all_virtual_objauth"; -const char* const OB_ALL_VIRTUAL_OBJAUTH_HISTORY_TNAME = "__all_virtual_objauth_history"; -const char* const OB_ALL_VIRTUAL_BACKUP_INFO_TNAME = "__all_virtual_backup_info"; -const char* const OB_ALL_VIRTUAL_BACKUP_LOG_ARCHIVE_STATUS_TNAME = "__all_virtual_backup_log_archive_status"; -const char* const OB_ALL_VIRTUAL_BACKUP_TASK_TNAME = "__all_virtual_backup_task"; -const char* const OB_ALL_VIRTUAL_PG_BACKUP_TASK_TNAME = "__all_virtual_pg_backup_task"; -const char* const OB_ALL_VIRTUAL_PG_BACKUP_LOG_ARCHIVE_STATUS_TNAME = "__all_virtual_pg_backup_log_archive_status"; -const char* const OB_ALL_VIRTUAL_SERVER_BACKUP_LOG_ARCHIVE_STATUS_TNAME = - "__all_virtual_server_backup_log_archive_status"; -const char* const OB_ALL_VIRTUAL_ERROR_TNAME = "__all_virtual_error"; -const char* const OB_ALL_VIRTUAL_TIMESTAMP_SERVICE_TNAME = "__all_virtual_timestamp_service"; -const char* const OB_REFERENTIAL_CONSTRAINTS_TNAME = "REFERENTIAL_CONSTRAINTS"; -const char* const OB_ALL_VIRTUAL_TABLE_MODIFICATIONS_TNAME = "__all_virtual_table_modifications"; -const char* const OB_ALL_VIRTUAL_BACKUP_CLEAN_INFO_TNAME = "__all_virtual_backup_clean_info"; -const char* const OB_ALL_VIRTUAL_RESTORE_PG_INFO_TNAME = "__all_virtual_restore_pg_info"; -const char* const OB_ALL_VIRTUAL_OBJECT_TYPE_TNAME = "__all_virtual_object_type"; -const char* const OB_ALL_VIRTUAL_TRANS_TABLE_STATUS_TNAME = "__all_virtual_trans_table_status"; -const char* const OB_ALL_VIRTUAL_PG_LOG_ARCHIVE_STAT_TNAME = "__all_virtual_pg_log_archive_stat"; -const char* const OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_TNAME = "__all_virtual_sql_plan_monitor"; -const char* const OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_TNAME = "__all_virtual_sql_monitor_statname"; -const char* const OB_ALL_VIRTUAL_OPEN_CURSOR_TNAME = "__all_virtual_open_cursor"; -const char* const OB_ALL_VIRTUAL_BACKUP_VALIDATION_TASK_TNAME = "__all_virtual_backup_validation_task"; -const char* const OB_ALL_VIRTUAL_PG_BACKUP_VALIDATION_TASK_TNAME = "__all_virtual_pg_backup_validation_task"; -const char* const OB_ALL_VIRTUAL_TIME_ZONE_TNAME = "__all_virtual_time_zone"; -const char* const OB_ALL_VIRTUAL_TIME_ZONE_NAME_TNAME = "__all_virtual_time_zone_name"; -const char* const OB_ALL_VIRTUAL_TIME_ZONE_TRANSITION_TNAME = "__all_virtual_time_zone_transition"; -const char* const OB_ALL_VIRTUAL_TIME_ZONE_TRANSITION_TYPE_TNAME = "__all_virtual_time_zone_transition_type"; -const char* const OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_TNAME = "__all_virtual_constraint_column"; -const char* const OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_HISTORY_TNAME = "__all_virtual_constraint_column_history"; -const char* const OB_ALL_VIRTUAL_FILES_TNAME = "__all_virtual_files"; -const char* const OB_FILES_TNAME = "FILES"; -const char* const OB_ALL_VIRTUAL_DEPENDENCY_TNAME = "__all_virtual_dependency"; -const char* const OB_TENANT_VIRTUAL_OBJECT_DEFINITION_TNAME = "__tenant_virtual_object_definition"; -const char* const OB_ALL_VIRTUAL_RESERVED_TABLE_MGR_TNAME = "__all_virtual_reserved_table_mgr"; -const char* const OB_ALL_VIRTUAL_BACKUPSET_HISTORY_MGR_TNAME = "__all_virtual_backupset_history_mgr"; -const char* const OB_ALL_VIRTUAL_BACKUP_BACKUPSET_TASK_TNAME = "__all_virtual_backup_backupset_task"; -const char* const OB_ALL_VIRTUAL_PG_BACKUP_BACKUPSET_TASK_TNAME = "__all_virtual_pg_backup_backupset_task"; -const char* const OB_ALL_VIRTUAL_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TNAME = - "__all_virtual_backup_backup_log_archive_status"; -const char* const OB_ALL_VIRTUAL_GLOBAL_TRANSACTION_TNAME = "__all_virtual_global_transaction"; -const char* const OB_ALL_VIRTUAL_TABLE_AGENT_TNAME = "ALL_VIRTUAL_TABLE_AGENT"; -const char* const OB_ALL_VIRTUAL_COLUMN_AGENT_TNAME = "ALL_VIRTUAL_COLUMN_AGENT"; -const char* const OB_ALL_VIRTUAL_DATABASE_AGENT_TNAME = "ALL_VIRTUAL_DATABASE_AGENT"; -const char* const OB_ALL_VIRTUAL_SEQUENCE_V2_AGENT_TNAME = "ALL_VIRTUAL_SEQUENCE_V2_AGENT"; -const char* const OB_ALL_VIRTUAL_PART_AGENT_TNAME = "ALL_VIRTUAL_PART_AGENT"; -const char* const OB_ALL_VIRTUAL_SUB_PART_AGENT_TNAME = "ALL_VIRTUAL_SUB_PART_AGENT"; -const char* const OB_ALL_VIRTUAL_PACKAGE_AGENT_TNAME = "ALL_VIRTUAL_PACKAGE_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_META_TABLE_AGENT_TNAME = "ALL_VIRTUAL_TENANT_META_TABLE_AGENT"; -const char* const OB_ALL_VIRTUAL_SQL_AUDIT_ORA_TNAME = "ALL_VIRTUAL_SQL_AUDIT"; -const char* const OB_ALL_VIRTUAL_PLAN_STAT_ORA_TNAME = "ALL_VIRTUAL_PLAN_STAT"; -const char* const OB_ALL_VIRTUAL_SQL_PLAN_STATISTICS_AGENT_TNAME = "ALL_VIRTUAL_SQL_PLAN_STATISTICS_AGENT"; -const char* const OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_ORA_TNAME = "ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN"; -const char* const OB_ALL_VIRTUAL_SEQUENCE_VALUE_AGENT_TNAME = "ALL_VIRTUAL_SEQUENCE_VALUE_AGENT"; -const char* const OB_ALL_VIRTUAL_SEQUENCE_OBJECT_AGENT_TNAME = "ALL_VIRTUAL_SEQUENCE_OBJECT_AGENT"; -const char* const OB_ALL_VIRTUAL_USER_AGENT_TNAME = "ALL_VIRTUAL_USER_AGENT"; -const char* const OB_ALL_VIRTUAL_SYNONYM_AGENT_TNAME = "ALL_VIRTUAL_SYNONYM_AGENT"; -const char* const OB_ALL_VIRTUAL_FOREIGN_KEY_AGENT_TNAME = "ALL_VIRTUAL_FOREIGN_KEY_AGENT"; -const char* const OB_ALL_VIRTUAL_COLUMN_STAT_AGENT_TNAME = "ALL_VIRTUAL_COLUMN_STAT_AGENT"; -const char* const OB_ALL_VIRTUAL_COLUMN_STATISTIC_AGENT_TNAME = "ALL_VIRTUAL_COLUMN_STATISTIC_AGENT"; -const char* const OB_ALL_VIRTUAL_PARTITION_TABLE_AGENT_TNAME = "ALL_VIRTUAL_PARTITION_TABLE_AGENT"; -const char* const OB_ALL_VIRTUAL_TABLE_STAT_AGENT_TNAME = "ALL_VIRTUAL_TABLE_STAT_AGENT"; -const char* const OB_ALL_VIRTUAL_RECYCLEBIN_AGENT_TNAME = "ALL_VIRTUAL_RECYCLEBIN_AGENT"; -const char* const OB_TENANT_VIRTUAL_OUTLINE_AGENT_TNAME = "TENANT_VIRTUAL_OUTLINE_AGENT"; -const char* const OB_ALL_VIRTUAL_ROUTINE_AGENT_TNAME = "ALL_VIRTUAL_ROUTINE_AGENT"; -const char* const OB_ALL_VIRTUAL_TABLEGROUP_AGENT_TNAME = "ALL_VIRTUAL_TABLEGROUP_AGENT"; -const char* const OB_ALL_VIRTUAL_PRIVILEGE_AGENT_TNAME = "ALL_VIRTUAL_PRIVILEGE_AGENT"; -const char* const OB_ALL_VIRTUAL_SYS_PARAMETER_STAT_AGENT_TNAME = "ALL_VIRTUAL_SYS_PARAMETER_STAT_AGENT"; -const char* const OB_TENANT_VIRTUAL_TABLE_INDEX_AGENT_TNAME = "TENANT_VIRTUAL_TABLE_INDEX_AGENT"; -const char* const OB_TENANT_VIRTUAL_CHARSET_AGENT_TNAME = "TENANT_VIRTUAL_CHARSET_AGENT"; -const char* const OB_TENANT_VIRTUAL_ALL_TABLE_AGENT_TNAME = "TENANT_VIRTUAL_ALL_TABLE_AGENT"; -const char* const OB_TENANT_VIRTUAL_COLLATION_AGENT_TNAME = "TENANT_VIRTUAL_COLLATION_AGENT"; -const char* const OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_AGENT_TNAME = "ALL_VIRTUAL_FOREIGN_KEY_COLUMN_AGENT"; -const char* const OB_ALL_VIRTUAL_SERVER_AGENT_TNAME = "ALL_VIRTUAL_SERVER_AGENT"; -const char* const OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_TNAME = "ALL_VIRTUAL_PLAN_CACHE_STAT"; -const char* const OB_ALL_VIRTUAL_PROCESSLIST_ORA_TNAME = "ALL_VIRTUAL_PROCESSLIST"; -const char* const OB_ALL_VIRTUAL_SESSION_WAIT_ORA_TNAME = "ALL_VIRTUAL_SESSION_WAIT"; -const char* const OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_TNAME = "ALL_VIRTUAL_SESSION_WAIT_HISTORY"; -const char* const OB_ALL_VIRTUAL_MEMORY_INFO_ORA_TNAME = "ALL_VIRTUAL_MEMORY_INFO"; -const char* const OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_ORA_TNAME = "ALL_VIRTUAL_TENANT_MEMSTORE_INFO"; -const char* const OB_ALL_VIRTUAL_MEMSTORE_INFO_ORA_TNAME = "ALL_VIRTUAL_MEMSTORE_INFO"; -const char* const OB_ALL_VIRTUAL_SERVER_MEMORY_INFO_AGENT_TNAME = "ALL_VIRTUAL_SERVER_MEMORY_INFO_AGENT"; -const char* const OB_ALL_VIRTUAL_SESSTAT_ORA_TNAME = "ALL_VIRTUAL_SESSTAT"; -const char* const OB_ALL_VIRTUAL_SYSSTAT_ORA_TNAME = "ALL_VIRTUAL_SYSSTAT"; -const char* const OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_TNAME = "ALL_VIRTUAL_SYSTEM_EVENT"; -const char* const OB_ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_AGENT_TNAME = - "ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_AGENT"; -const char* const OB_TENANT_VIRTUAL_SESSION_VARIABLE_ORA_TNAME = "TENANT_VIRTUAL_SESSION_VARIABLE"; -const char* const OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_ORA_TNAME = "TENANT_VIRTUAL_GLOBAL_VARIABLE"; -const char* const OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_ORA_TNAME = "TENANT_VIRTUAL_SHOW_CREATE_TABLE"; -const char* const OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_ORA_TNAME = "TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE"; -const char* const OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_ORA_TNAME = "TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP"; -const char* const OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_ORA_TNAME = "TENANT_VIRTUAL_PRIVILEGE_GRANT"; -const char* const OB_TENANT_VIRTUAL_TABLE_COLUMN_ORA_TNAME = "TENANT_VIRTUAL_TABLE_COLUMN"; -const char* const OB_ALL_VIRTUAL_TRACE_LOG_ORA_TNAME = "ALL_VIRTUAL_TRACE_LOG"; -const char* const OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_AGENT_TNAME = "TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_AGENT"; -const char* const OB_ALL_VIRTUAL_CONSTRAINT_AGENT_TNAME = "ALL_VIRTUAL_CONSTRAINT_AGENT"; -const char* const OB_ALL_VIRTUAL_TYPE_AGENT_TNAME = "ALL_VIRTUAL_TYPE_AGENT"; -const char* const OB_ALL_VIRTUAL_TYPE_ATTR_AGENT_TNAME = "ALL_VIRTUAL_TYPE_ATTR_AGENT"; -const char* const OB_ALL_VIRTUAL_COLL_TYPE_AGENT_TNAME = "ALL_VIRTUAL_COLL_TYPE_AGENT"; -const char* const OB_ALL_VIRTUAL_ROUTINE_PARAM_AGENT_TNAME = "ALL_VIRTUAL_ROUTINE_PARAM_AGENT"; -const char* const OB_ALL_VIRTUAL_DATA_TYPE_ORA_TNAME = "ALL_VIRTUAL_DATA_TYPE"; -const char* const OB_ALL_VIRTUAL_TABLE_SYS_AGENT_TNAME = "ALL_VIRTUAL_TABLE_SYS_AGENT"; -const char* const OB_ALL_VIRTUAL_SSTABLE_CHECKSUM_AGENT_TNAME = "ALL_VIRTUAL_SSTABLE_CHECKSUM_AGENT"; -const char* const OB_ALL_VIRTUAL_PARTITION_INFO_AGENT_TNAME = "ALL_VIRTUAL_PARTITION_INFO_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_AGENT_TNAME = - "ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_KEYSTORE_AGENT_TNAME = "ALL_VIRTUAL_TENANT_KEYSTORE_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_TABLESPACE_AGENT_TNAME = "ALL_VIRTUAL_TENANT_TABLESPACE_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_PROFILE_AGENT_TNAME = "ALL_VIRTUAL_TENANT_PROFILE_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT_TNAME = "ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT"; -const char* const OB_ALL_VIRTUAL_TABLE_PRIVILEGE_AGENT_TNAME = "ALL_VIRTUAL_TABLE_PRIVILEGE_AGENT"; -const char* const OB_ALL_VIRTUAL_SECURITY_AUDIT_AGENT_TNAME = "ALL_VIRTUAL_SECURITY_AUDIT_AGENT"; -const char* const OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_AGENT_TNAME = "ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_AGENT"; -const char* const OB_ALL_VIRTUAL_TRIGGER_AGENT_TNAME = "ALL_VIRTUAL_TRIGGER_AGENT"; -const char* const OB_ALL_VIRTUAL_PX_WORKER_STAT_ORA_TNAME = "ALL_VIRTUAL_PX_WORKER_STAT"; -const char* const OB_ALL_VIRTUAL_PS_STAT_ORA_TNAME = "ALL_VIRTUAL_PS_STAT"; -const char* const OB_ALL_VIRTUAL_PS_ITEM_INFO_ORA_TNAME = "ALL_VIRTUAL_PS_ITEM_INFO"; -const char* const OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_ORA_TNAME = "ALL_VIRTUAL_TENANT_PARAMETER_STAT"; -const char* const OB_ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT_TNAME = "ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT"; -const char* const OB_ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT_TNAME = "ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT"; -const char* const OB_ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT_TNAME = "ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT"; -const char* const OB_ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT_TNAME = "ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT"; -const char* const OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_AGENT_TNAME = "ALL_VIRTUAL_SECURITY_AUDIT_RECORD_AGENT"; -const char* const OB_ALL_VIRTUAL_SYSAUTH_AGENT_TNAME = "ALL_VIRTUAL_SYSAUTH_AGENT"; -const char* const OB_ALL_VIRTUAL_SYSAUTH_HISTORY_AGENT_TNAME = "ALL_VIRTUAL_SYSAUTH_HISTORY_AGENT"; -const char* const OB_ALL_VIRTUAL_OBJAUTH_AGENT_TNAME = "ALL_VIRTUAL_OBJAUTH_AGENT"; -const char* const OB_ALL_VIRTUAL_OBJAUTH_HISTORY_AGENT_TNAME = "ALL_VIRTUAL_OBJAUTH_HISTORY_AGENT"; -const char* const OB_ALL_VIRTUAL_ERROR_AGENT_TNAME = "ALL_VIRTUAL_ERROR_AGENT"; -const char* const OB_ALL_VIRTUAL_TABLE_MGR_AGENT_TNAME = "ALL_VIRTUAL_TABLE_MGR_AGENT"; -const char* const OB_ALL_VIRTUAL_DEF_SUB_PART_AGENT_TNAME = "ALL_VIRTUAL_DEF_SUB_PART_AGENT"; -const char* const OB_ALL_VIRTUAL_OBJECT_TYPE_AGENT_TNAME = "ALL_VIRTUAL_OBJECT_TYPE_AGENT"; -const char* const OB_ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT_TNAME = "ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT"; -const char* const OB_ALL_VIRTUAL_DBLINK_AGENT_TNAME = "ALL_VIRTUAL_DBLINK_AGENT"; -const char* const OB_ALL_VIRTUAL_DBLINK_HISTORY_AGENT_TNAME = "ALL_VIRTUAL_DBLINK_HISTORY_AGENT"; -const char* const OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_TNAME = "ALL_VIRTUAL_SQL_PLAN_MONITOR"; -const char* const OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_ORA_TNAME = "ALL_VIRTUAL_SQL_MONITOR_STATNAME"; -const char* const OB_ALL_VIRTUAL_LOCK_WAIT_STAT_ORA_TNAME = "ALL_VIRTUAL_LOCK_WAIT_STAT"; -const char* const OB_ALL_VIRTUAL_OPEN_CURSOR_ORA_TNAME = "ALL_VIRTUAL_OPEN_CURSOR"; -const char* const OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_AGENT_TNAME = "ALL_VIRTUAL_CONSTRAINT_COLUMN_AGENT"; -const char* const OB_ALL_VIRTUAL_DEPENDENCY_AGENT_TNAME = "ALL_VIRTUAL_DEPENDENCY_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_TIME_ZONE_AGENT_TNAME = "ALL_VIRTUAL_TENANT_TIME_ZONE_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_AGENT_TNAME = "ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_AGENT_TNAME = - "ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_AGENT_TNAME = - "ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_AGENT"; -const char* const OB_TENANT_VIRTUAL_OBJECT_DEFINITION_ORA_TNAME = "TENANT_VIRTUAL_OBJECT_DEFINITION"; -const char* const OB_ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT_TNAME = "ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT"; -const char* const OB_ALL_VIRTUAL_TYPE_SYS_AGENT_TNAME = "ALL_VIRTUAL_TYPE_SYS_AGENT"; -const char* const OB_ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT_TNAME = "ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT"; -const char* const OB_ALL_VIRTUAL_COLL_TYPE_SYS_AGENT_TNAME = "ALL_VIRTUAL_COLL_TYPE_SYS_AGENT"; -const char* const OB_ALL_VIRTUAL_PACKAGE_SYS_AGENT_TNAME = "ALL_VIRTUAL_PACKAGE_SYS_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT_TNAME = "ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT"; -const char* const OB_ALL_VIRTUAL_ROUTINE_SYS_AGENT_TNAME = "ALL_VIRTUAL_ROUTINE_SYS_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT_TNAME = "ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT"; -const char* const OB_ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT_TNAME = "ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT"; -const char* const OB_ALL_VIRTUAL_TABLE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TABLE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_COLUMN_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_COLUMN_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_DATABASE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_DATABASE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_SEQUENCE_V2_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_SEQUENCE_V2_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_PART_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_PART_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_SUB_PART_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_SUB_PART_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_PACKAGE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_PACKAGE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_USER_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_USER_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_SYNONYM_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_SYNONYM_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_COLUMN_STAT_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_COLUMN_STAT_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_COLUMN_STATISTIC_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_COLUMN_STATISTIC_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TABLE_STAT_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TABLE_STAT_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_ROUTINE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_ROUTINE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TABLEGROUP_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TABLEGROUP_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_CONSTRAINT_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_CONSTRAINT_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TYPE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TYPE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_COLL_TYPE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_COLL_TYPE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT_ORA_TNAME = - "ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_KEYSTORE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_KEYSTORE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_REAL_AGENT_ORA_TNAME = - "ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TABLE_PRIVILEGE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TABLE_PRIVILEGE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_REAL_AGENT_ORA_TNAME = - "ALL_VIRTUAL_TENANT_SECURITY_AUDIT_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_HISTORY_REAL_AGENT_ORA_TNAME = - "ALL_VIRTUAL_TENANT_SECURITY_AUDIT_HISTORY_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_RECORD_REAL_AGENT_ORA_TNAME = - "ALL_VIRTUAL_TENANT_SECURITY_AUDIT_RECORD_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_SYSAUTH_HISTORY_REAL_AGENT_ORA_TNAME = - "ALL_VIRTUAL_TENANT_SYSAUTH_HISTORY_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_OBJAUTH_HISTORY_REAL_AGENT_ORA_TNAME = - "ALL_VIRTUAL_TENANT_OBJAUTH_HISTORY_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_OBJECT_TYPE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_OBJECT_TYPE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_DBLINK_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_DBLINK_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_DBLINK_HISTORY_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_DBLINK_HISTORY_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_CONSTRAINT_COLUMN_REAL_AGENT_ORA_TNAME = - "ALL_VIRTUAL_TENANT_CONSTRAINT_COLUMN_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_DEPENDENCY_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_DEPENDENCY_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_TIME_ZONE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_TIME_ZONE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_REAL_AGENT_ORA_TNAME = - "ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_REAL_AGENT_ORA_TNAME = - "ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT_ORA_TNAME = - "ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_RES_MGR_PLAN_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_RES_MGR_PLAN_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_RES_MGR_DIRECTIVE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_RES_MGR_DIRECTIVE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_TRANS_LOCK_STAT_ORA_TNAME = "ALL_VIRTUAL_TRANS_LOCK_STAT"; -const char* const OB_ALL_VIRTUAL_RES_MGR_MAPPING_RULE_REAL_AGENT_ORA_TNAME = - "ALL_VIRTUAL_RES_MGR_MAPPING_RULE_REAL_AGENT"; -const char* const OB_ALL_VIRTUAL_RES_MGR_CONSUMER_GROUP_REAL_AGENT_ORA_TNAME = - "ALL_VIRTUAL_RES_MGR_CONSUMER_GROUP_REAL_AGENT"; -const char* const OB_GV_PLAN_CACHE_STAT_TNAME = "gv$plan_cache_stat"; -const char* const OB_GV_PLAN_CACHE_PLAN_STAT_TNAME = "gv$plan_cache_plan_stat"; -const char* const OB_SCHEMATA_TNAME = "SCHEMATA"; -const char* const OB_CHARACTER_SETS_TNAME = "CHARACTER_SETS"; -const char* const OB_GLOBAL_VARIABLES_TNAME = "GLOBAL_VARIABLES"; -const char* const OB_STATISTICS_TNAME = "STATISTICS"; -const char* const OB_VIEWS_TNAME = "VIEWS"; -const char* const OB_TABLES_TNAME = "TABLES"; -const char* const OB_COLLATIONS_TNAME = "COLLATIONS"; -const char* const OB_COLLATION_CHARACTER_SET_APPLICABILITY_TNAME = "COLLATION_CHARACTER_SET_APPLICABILITY"; -const char* const OB_PROCESSLIST_TNAME = "PROCESSLIST"; -const char* const OB_KEY_COLUMN_USAGE_TNAME = "KEY_COLUMN_USAGE"; -const char* const OB_DBA_OUTLINES_TNAME = "DBA_OUTLINES"; -const char* const OB_ENGINES_TNAME = "ENGINES"; -const char* const OB_ROUTINES_TNAME = "ROUTINES"; -const char* const OB_GV_SESSION_EVENT_TNAME = "gv$session_event"; -const char* const OB_GV_SESSION_WAIT_TNAME = "gv$session_wait"; -const char* const OB_GV_SESSION_WAIT_HISTORY_TNAME = "gv$session_wait_history"; -const char* const OB_GV_SYSTEM_EVENT_TNAME = "gv$system_event"; -const char* const OB_GV_SESSTAT_TNAME = "gv$sesstat"; -const char* const OB_GV_SYSSTAT_TNAME = "gv$sysstat"; -const char* const OB_V_STATNAME_TNAME = "v$statname"; -const char* const OB_V_EVENT_NAME_TNAME = "v$event_name"; -const char* const OB_V_SESSION_EVENT_TNAME = "v$session_event"; -const char* const OB_V_SESSION_WAIT_TNAME = "v$session_wait"; -const char* const OB_V_SESSION_WAIT_HISTORY_TNAME = "v$session_wait_history"; -const char* const OB_V_SESSTAT_TNAME = "v$sesstat"; -const char* const OB_V_SYSSTAT_TNAME = "v$sysstat"; -const char* const OB_V_SYSTEM_EVENT_TNAME = "v$system_event"; -const char* const OB_GV_SQL_AUDIT_TNAME = "gv$sql_audit"; -const char* const OB_GV_LATCH_TNAME = "gv$latch"; -const char* const OB_GV_MEMORY_TNAME = "gv$memory"; -const char* const OB_V_MEMORY_TNAME = "v$memory"; -const char* const OB_GV_MEMSTORE_TNAME = "gv$memstore"; -const char* const OB_V_MEMSTORE_TNAME = "v$memstore"; -const char* const OB_GV_MEMSTORE_INFO_TNAME = "gv$memstore_info"; -const char* const OB_V_MEMSTORE_INFO_TNAME = "v$memstore_info"; -const char* const OB_V_PLAN_CACHE_STAT_TNAME = "v$plan_cache_stat"; -const char* const OB_V_PLAN_CACHE_PLAN_STAT_TNAME = "v$plan_cache_plan_stat"; -const char* const OB_GV_PLAN_CACHE_PLAN_EXPLAIN_TNAME = "gv$plan_cache_plan_explain"; -const char* const OB_V_PLAN_CACHE_PLAN_EXPLAIN_TNAME = "v$plan_cache_plan_explain"; -const char* const OB_V_SQL_AUDIT_TNAME = "v$sql_audit"; -const char* const OB_V_LATCH_TNAME = "v$latch"; -const char* const OB_GV_OBRPC_OUTGOING_TNAME = "gv$obrpc_outgoing"; -const char* const OB_V_OBRPC_OUTGOING_TNAME = "v$obrpc_outgoing"; -const char* const OB_GV_OBRPC_INCOMING_TNAME = "gv$obrpc_incoming"; -const char* const OB_V_OBRPC_INCOMING_TNAME = "v$obrpc_incoming"; -const char* const OB_GV_SQL_TNAME = "gv$sql"; -const char* const OB_V_SQL_TNAME = "v$sql"; -const char* const OB_GV_SQL_MONITOR_TNAME = "gv$sql_monitor"; -const char* const OB_V_SQL_MONITOR_TNAME = "v$sql_monitor"; -const char* const OB_GV_SQL_PLAN_MONITOR_TNAME = "gv$sql_plan_monitor"; -const char* const OB_V_SQL_PLAN_MONITOR_TNAME = "v$sql_plan_monitor"; -const char* const OB_USER_RECYCLEBIN_TNAME = "USER_RECYCLEBIN"; -const char* const OB_GV_OUTLINE_TNAME = "gv$outline"; -const char* const OB_GV_CONCURRENT_LIMIT_SQL_TNAME = "gv$concurrent_limit_sql"; -const char* const OB_GV_SQL_PLAN_STATISTICS_TNAME = "gv$sql_plan_statistics"; -const char* const OB_V_SQL_PLAN_STATISTICS_TNAME = "v$sql_plan_statistics"; -const char* const OB_GV_SERVER_MEMSTORE_TNAME = "gv$server_memstore"; -const char* const OB_GV_UNIT_LOAD_BALANCE_EVENT_HISTORY_TNAME = "gv$unit_load_balance_event_history"; -const char* const OB_GV_TENANT_TNAME = "gv$tenant"; -const char* const OB_GV_DATABASE_TNAME = "gv$database"; -const char* const OB_GV_TABLE_TNAME = "gv$table"; -const char* const OB_GV_UNIT_TNAME = "gv$unit"; -const char* const OB_V_UNIT_TNAME = "v$unit"; -const char* const OB_GV_PARTITION_TNAME = "gv$partition"; -const char* const OB_V_PARTITION_TNAME = "v$partition"; -const char* const OB_GV_LOCK_WAIT_STAT_TNAME = "gv$lock_wait_stat"; -const char* const OB_V_LOCK_WAIT_STAT_TNAME = "v$lock_wait_stat"; -const char* const OB_TIME_ZONE_TNAME = "time_zone"; -const char* const OB_TIME_ZONE_NAME_TNAME = "time_zone_name"; -const char* const OB_TIME_ZONE_TRANSITION_TNAME = "time_zone_transition"; -const char* const OB_TIME_ZONE_TRANSITION_TYPE_TNAME = "time_zone_transition_type"; -const char* const OB_GV_SESSION_LONGOPS_TNAME = "gv$session_longops"; -const char* const OB_V_SESSION_LONGOPS_TNAME = "v$session_longops"; -const char* const OB_GV_TENANT_MEMSTORE_ALLOCATOR_INFO_TNAME = "gv$tenant_memstore_allocator_info"; -const char* const OB_V_TENANT_MEMSTORE_ALLOCATOR_INFO_TNAME = "v$tenant_memstore_allocator_info"; -const char* const OB_GV_TENANT_SEQUENCE_OBJECT_TNAME = "gv$tenant_sequence_object"; -const char* const OB_COLUMNS_TNAME = "COLUMNS"; -const char* const OB_GV_MINOR_MERGE_INFO_TNAME = "gv$minor_merge_info"; -const char* const OB_GV_TENANT_PX_WORKER_STAT_TNAME = "gv$tenant_px_worker_stat"; -const char* const OB_V_TENANT_PX_WORKER_STAT_TNAME = "v$tenant_px_worker_stat"; -const char* const OB_GV_PARTITION_AUDIT_TNAME = "gv$partition_audit"; -const char* const OB_V_PARTITION_AUDIT_TNAME = "v$partition_audit"; -const char* const OB_V_OB_CLUSTER_TNAME = "v$ob_cluster"; -const char* const OB_GV_PS_STAT_TNAME = "gv$ps_stat"; -const char* const OB_V_PS_STAT_TNAME = "v$ps_stat"; -const char* const OB_GV_PS_ITEM_INFO_TNAME = "gv$ps_item_info"; -const char* const OB_V_PS_ITEM_INFO_TNAME = "v$ps_item_info"; -const char* const OB_GV_SQL_WORKAREA_TNAME = "gv$sql_workarea"; -const char* const OB_V_SQL_WORKAREA_TNAME = "v$sql_workarea"; -const char* const OB_GV_SQL_WORKAREA_ACTIVE_TNAME = "gv$sql_workarea_active"; -const char* const OB_V_SQL_WORKAREA_ACTIVE_TNAME = "v$sql_workarea_active"; -const char* const OB_GV_SQL_WORKAREA_HISTOGRAM_TNAME = "gv$sql_workarea_histogram"; -const char* const OB_V_SQL_WORKAREA_HISTOGRAM_TNAME = "v$sql_workarea_histogram"; -const char* const OB_GV_OB_SQL_WORKAREA_MEMORY_INFO_TNAME = "gv$ob_sql_workarea_memory_info"; -const char* const OB_V_OB_SQL_WORKAREA_MEMORY_INFO_TNAME = "v$ob_sql_workarea_memory_info"; -const char* const OB_GV_PLAN_CACHE_REFERENCE_INFO_TNAME = "gv$plan_cache_reference_info"; -const char* const OB_V_PLAN_CACHE_REFERENCE_INFO_TNAME = "v$plan_cache_reference_info"; -const char* const OB_V_OB_TIMESTAMP_SERVICE_TNAME = "v$ob_timestamp_service"; -const char* const OB_GV_SSTABLE_TNAME = "gv$sstable"; -const char* const OB_V_SSTABLE_TNAME = "v$sstable"; -const char* const OB_CDB_OB_BACKUP_ARCHIVELOG_SUMMARY_TNAME = "CDB_OB_BACKUP_ARCHIVELOG_SUMMARY"; -const char* const OB_CDB_OB_BACKUP_JOB_DETAILS_TNAME = "CDB_OB_BACKUP_JOB_DETAILS"; -const char* const OB_CDB_OB_BACKUP_SET_DETAILS_TNAME = "CDB_OB_BACKUP_SET_DETAILS"; -const char* const OB_CDB_OB_BACKUP_SET_EXPIRED_TNAME = "CDB_OB_BACKUP_SET_EXPIRED"; -const char* const OB_CDB_OB_BACKUP_PROGRESS_TNAME = "CDB_OB_BACKUP_PROGRESS"; -const char* const OB_CDB_OB_BACKUP_ARCHIVELOG_PROGRESS_TNAME = "CDB_OB_BACKUP_ARCHIVELOG_PROGRESS"; -const char* const OB_CDB_OB_BACKUP_CLEAN_HISTORY_TNAME = "CDB_OB_BACKUP_CLEAN_HISTORY"; -const char* const OB_CDB_OB_BACKUP_TASK_CLEAN_HISTORY_TNAME = "CDB_OB_BACKUP_TASK_CLEAN_HISTORY"; -const char* const OB_CDB_OB_RESTORE_PROGRESS_TNAME = "CDB_OB_RESTORE_PROGRESS"; -const char* const OB_CDB_OB_RESTORE_HISTORY_TNAME = "CDB_OB_RESTORE_HISTORY"; -const char* const OB_GV_SERVER_SCHEMA_INFO_TNAME = "gv$server_schema_info"; -const char* const OB_V_SERVER_SCHEMA_INFO_TNAME = "v$server_schema_info"; -const char* const OB_CDB_CKPT_HISTORY_TNAME = "CDB_CKPT_HISTORY"; -const char* const OB_GV_OB_TRANS_TABLE_STATUS_TNAME = "gv$ob_trans_table_status"; -const char* const OB_V_OB_TRANS_TABLE_STATUS_TNAME = "v$ob_trans_table_status"; -const char* const OB_V_SQL_MONITOR_STATNAME_TNAME = "v$sql_monitor_statname"; -const char* const OB_GV_MERGE_INFO_TNAME = "gv$merge_info"; -const char* const OB_V_MERGE_INFO_TNAME = "v$merge_info"; -const char* const OB_GV_LOCK_TNAME = "gv$lock"; -const char* const OB_V_LOCK_TNAME = "v$lock"; -const char* const OB_CDB_OB_BACKUP_VALIDATION_JOB_TNAME = "CDB_OB_BACKUP_VALIDATION_JOB"; -const char* const OB_CDB_OB_BACKUP_VALIDATION_JOB_HISTORY_TNAME = "CDB_OB_BACKUP_VALIDATION_JOB_HISTORY"; -const char* const OB_CDB_OB_TENANT_BACKUP_VALIDATION_TASK_TNAME = "CDB_OB_TENANT_BACKUP_VALIDATION_TASK"; -const char* const OB_CDB_OB_BACKUP_VALIDATION_TASK_HISTORY_TNAME = "CDB_OB_BACKUP_VALIDATION_TASK_HISTORY"; -const char* const OB_V_RESTORE_POINT_TNAME = "v$restore_point"; -const char* const OB_CDB_OB_BACKUP_SET_OBSOLETE_TNAME = "CDB_OB_BACKUP_SET_OBSOLETE"; -const char* const OB_CDB_OB_BACKUP_BACKUPSET_JOB_TNAME = "CDB_OB_BACKUP_BACKUPSET_JOB"; -const char* const OB_CDB_OB_BACKUP_BACKUPSET_JOB_HISTORY_TNAME = "CDB_OB_BACKUP_BACKUPSET_JOB_HISTORY"; -const char* const OB_CDB_OB_BACKUP_BACKUPSET_TASK_TNAME = "CDB_OB_BACKUP_BACKUPSET_TASK"; -const char* const OB_CDB_OB_BACKUP_BACKUPSET_TASK_HISTORY_TNAME = "CDB_OB_BACKUP_BACKUPSET_TASK_HISTORY"; -const char* const OB_CDB_OB_BACKUP_BACKUP_ARCHIVELOG_SUMMARY_TNAME = "CDB_OB_BACKUP_BACKUP_ARCHIVELOG_SUMMARY"; -const char* const OB_DBA_SYNONYMS_TNAME = "DBA_SYNONYMS"; -const char* const OB_DBA_OBJECTS_TNAME = "DBA_OBJECTS"; -const char* const OB_ALL_OBJECTS_TNAME = "ALL_OBJECTS"; -const char* const OB_USER_OBJECTS_TNAME = "USER_OBJECTS"; -const char* const OB_DBA_SEQUENCES_TNAME = "DBA_SEQUENCES"; -const char* const OB_ALL_SEQUENCES_TNAME = "ALL_SEQUENCES"; -const char* const OB_USER_SEQUENCES_TNAME = "USER_SEQUENCES"; -const char* const OB_DBA_USERS_TNAME = "DBA_USERS"; -const char* const OB_ALL_USERS_TNAME = "ALL_USERS"; -const char* const OB_ALL_SYNONYMS_TNAME = "ALL_SYNONYMS"; -const char* const OB_USER_SYNONYMS_TNAME = "USER_SYNONYMS"; -const char* const OB_DBA_IND_COLUMNS_TNAME = "DBA_IND_COLUMNS"; -const char* const OB_ALL_IND_COLUMNS_TNAME = "ALL_IND_COLUMNS"; -const char* const OB_USER_IND_COLUMNS_TNAME = "USER_IND_COLUMNS"; -const char* const OB_DBA_CONSTRAINTS_TNAME = "DBA_CONSTRAINTS"; -const char* const OB_ALL_CONSTRAINTS_TNAME = "ALL_CONSTRAINTS"; -const char* const OB_USER_CONSTRAINTS_TNAME = "USER_CONSTRAINTS"; -const char* const OB_ALL_TAB_COLS_V_TNAME = "ALL_TAB_COLS_V$"; -const char* const OB_DBA_TAB_COLS_V_TNAME = "DBA_TAB_COLS_V$"; -const char* const OB_USER_TAB_COLS_V_TNAME = "USER_TAB_COLS_V$"; -const char* const OB_ALL_TAB_COLS_TNAME = "ALL_TAB_COLS"; -const char* const OB_DBA_TAB_COLS_TNAME = "DBA_TAB_COLS"; -const char* const OB_USER_TAB_COLS_TNAME = "USER_TAB_COLS"; -const char* const OB_ALL_TAB_COLUMNS_TNAME = "ALL_TAB_COLUMNS"; -const char* const OB_DBA_TAB_COLUMNS_TNAME = "DBA_TAB_COLUMNS"; -const char* const OB_USER_TAB_COLUMNS_TNAME = "USER_TAB_COLUMNS"; -const char* const OB_ALL_TABLES_TNAME = "ALL_TABLES"; -const char* const OB_DBA_TABLES_TNAME = "DBA_TABLES"; -const char* const OB_USER_TABLES_TNAME = "USER_TABLES"; -const char* const OB_DBA_TAB_COMMENTS_TNAME = "DBA_TAB_COMMENTS"; -const char* const OB_ALL_TAB_COMMENTS_TNAME = "ALL_TAB_COMMENTS"; -const char* const OB_USER_TAB_COMMENTS_TNAME = "USER_TAB_COMMENTS"; -const char* const OB_DBA_COL_COMMENTS_TNAME = "DBA_COL_COMMENTS"; -const char* const OB_ALL_COL_COMMENTS_TNAME = "ALL_COL_COMMENTS"; -const char* const OB_USER_COL_COMMENTS_TNAME = "USER_COL_COMMENTS"; -const char* const OB_DBA_INDEXES_TNAME = "DBA_INDEXES"; -const char* const OB_ALL_INDEXES_TNAME = "ALL_INDEXES"; -const char* const OB_USER_INDEXES_TNAME = "USER_INDEXES"; -const char* const OB_DBA_CONS_COLUMNS_TNAME = "DBA_CONS_COLUMNS"; -const char* const OB_ALL_CONS_COLUMNS_TNAME = "ALL_CONS_COLUMNS"; -const char* const OB_USER_CONS_COLUMNS_TNAME = "USER_CONS_COLUMNS"; -const char* const OB_USER_SEGMENTS_TNAME = "USER_SEGMENTS"; -const char* const OB_DBA_SEGMENTS_TNAME = "DBA_SEGMENTS"; -const char* const OB_DBA_TYPES_TNAME = "DBA_TYPES"; -const char* const OB_ALL_TYPES_TNAME = "ALL_TYPES"; -const char* const OB_USER_TYPES_TNAME = "USER_TYPES"; -const char* const OB_DBA_TYPE_ATTRS_TNAME = "DBA_TYPE_ATTRS"; -const char* const OB_ALL_TYPE_ATTRS_TNAME = "ALL_TYPE_ATTRS"; -const char* const OB_USER_TYPE_ATTRS_TNAME = "USER_TYPE_ATTRS"; -const char* const OB_DBA_COLL_TYPES_TNAME = "DBA_COLL_TYPES"; -const char* const OB_ALL_COLL_TYPES_TNAME = "ALL_COLL_TYPES"; -const char* const OB_USER_COLL_TYPES_TNAME = "USER_COLL_TYPES"; -const char* const OB_DBA_PROCEDURES_TNAME = "DBA_PROCEDURES"; -const char* const OB_DBA_ARGUMENTS_TNAME = "DBA_ARGUMENTS"; -const char* const OB_DBA_SOURCE_TNAME = "DBA_SOURCE"; -const char* const OB_ALL_PROCEDURES_TNAME = "ALL_PROCEDURES"; -const char* const OB_ALL_ARGUMENTS_TNAME = "ALL_ARGUMENTS"; -const char* const OB_ALL_SOURCE_TNAME = "ALL_SOURCE"; -const char* const OB_USER_PROCEDURES_TNAME = "USER_PROCEDURES"; -const char* const OB_USER_ARGUMENTS_TNAME = "USER_ARGUMENTS"; -const char* const OB_USER_SOURCE_TNAME = "USER_SOURCE"; -const char* const OB_DBA_PART_KEY_COLUMNS_TNAME = "DBA_PART_KEY_COLUMNS"; -const char* const OB_ALL_PART_KEY_COLUMNS_TNAME = "ALL_PART_KEY_COLUMNS"; -const char* const OB_USER_PART_KEY_COLUMNS_TNAME = "USER_PART_KEY_COLUMNS"; -const char* const OB_DBA_SUBPART_KEY_COLUMNS_TNAME = "DBA_SUBPART_KEY_COLUMNS"; -const char* const OB_ALL_SUBPART_KEY_COLUMNS_TNAME = "ALL_SUBPART_KEY_COLUMNS"; -const char* const OB_USER_SUBPART_KEY_COLUMNS_TNAME = "USER_SUBPART_KEY_COLUMNS"; -const char* const OB_DBA_VIEWS_TNAME = "DBA_VIEWS"; -const char* const OB_ALL_VIEWS_TNAME = "ALL_VIEWS"; -const char* const OB_USER_VIEWS_TNAME = "USER_VIEWS"; -const char* const OB_ALL_TAB_PARTITIONS_ORA_TNAME = "ALL_TAB_PARTITIONS"; -const char* const OB_ALL_TAB_SUBPARTITIONS_ORA_TNAME = "ALL_TAB_SUBPARTITIONS"; -const char* const OB_ALL_PART_TABLES_ORA_TNAME = "ALL_PART_TABLES"; -const char* const OB_DBA_PART_TABLES_ORA_TNAME = "DBA_PART_TABLES"; -const char* const OB_USER_PART_TABLES_ORA_TNAME = "USER_PART_TABLES"; -const char* const OB_DBA_TAB_PARTITIONS_ORA_TNAME = "DBA_TAB_PARTITIONS"; -const char* const OB_USER_TAB_PARTITIONS_ORA_TNAME = "USER_TAB_PARTITIONS"; -const char* const OB_DBA_TAB_SUBPARTITIONS_ORA_TNAME = "DBA_TAB_SUBPARTITIONS"; -const char* const OB_USER_TAB_SUBPARTITIONS_ORA_TNAME = "USER_TAB_SUBPARTITIONS"; -const char* const OB_DBA_SUBPARTITION_TEMPLATES_ORA_TNAME = "DBA_SUBPARTITION_TEMPLATES"; -const char* const OB_ALL_SUBPARTITION_TEMPLATES_ORA_TNAME = "ALL_SUBPARTITION_TEMPLATES"; -const char* const OB_USER_SUBPARTITION_TEMPLATES_ORA_TNAME = "USER_SUBPARTITION_TEMPLATES"; -const char* const OB_DBA_PART_INDEXES_TNAME = "DBA_PART_INDEXES"; -const char* const OB_ALL_PART_INDEXES_TNAME = "ALL_PART_INDEXES"; -const char* const OB_USER_PART_INDEXES_TNAME = "USER_PART_INDEXES"; -const char* const OB_ALL_ALL_TABLES_ORA_TNAME = "ALL_ALL_TABLES"; -const char* const OB_DBA_ALL_TABLES_ORA_TNAME = "DBA_ALL_TABLES"; -const char* const OB_USER_ALL_TABLES_ORA_TNAME = "USER_ALL_TABLES"; -const char* const OB_DBA_PROFILES_ORA_TNAME = "DBA_PROFILES"; -const char* const OB_USER_PROFILES_ORA_TNAME = "USER_PROFILES"; -const char* const OB_ALL_PROFILES_ORA_TNAME = "ALL_PROFILES"; -const char* const OB_ALL_MVIEW_COMMENTS_ORA_TNAME = "ALL_MVIEW_COMMENTS"; -const char* const OB_USER_MVIEW_COMMENTS_ORA_TNAME = "USER_MVIEW_COMMENTS"; -const char* const OB_DBA_MVIEW_COMMENTS_ORA_TNAME = "DBA_MVIEW_COMMENTS"; -const char* const OB_ALL_SCHEDULER_PROGRAM_ARGS_ORA_TNAME = "ALL_SCHEDULER_PROGRAM_ARGS"; -const char* const OB_DBA_SCHEDULER_PROGRAM_ARGS_ORA_TNAME = "DBA_SCHEDULER_PROGRAM_ARGS"; -const char* const OB_USER_SCHEDULER_PROGRAM_ARGS_ORA_TNAME = "USER_SCHEDULER_PROGRAM_ARGS"; -const char* const OB_ALL_SCHEDULER_JOB_ARGS_ORA_TNAME = "ALL_SCHEDULER_JOB_ARGS"; -const char* const OB_DBA_SCHEDULER_JOB_ARGS_ORA_TNAME = "DBA_SCHEDULER_JOB_ARGS"; -const char* const OB_USER_SCHEDULER_JOB_ARGS_ORA_TNAME = "USER_SCHEDULER_JOB_ARGS"; -const char* const OB_ALL_ERRORS_ORA_TNAME = "ALL_ERRORS"; -const char* const OB_DBA_ERRORS_ORA_TNAME = "DBA_ERRORS"; -const char* const OB_USER_ERRORS_ORA_TNAME = "USER_ERRORS"; -const char* const OB_ALL_TYPE_METHODS_ORA_TNAME = "ALL_TYPE_METHODS"; -const char* const OB_DBA_TYPE_METHODS_ORA_TNAME = "DBA_TYPE_METHODS"; -const char* const OB_USER_TYPE_METHODS_ORA_TNAME = "USER_TYPE_METHODS"; -const char* const OB_ALL_METHOD_PARAMS_ORA_TNAME = "ALL_METHOD_PARAMS"; -const char* const OB_DBA_METHOD_PARAMS_ORA_TNAME = "DBA_METHOD_PARAMS"; -const char* const OB_USER_METHOD_PARAMS_ORA_TNAME = "USER_METHOD_PARAMS"; -const char* const OB_DBA_TABLESPACES_ORA_TNAME = "DBA_TABLESPACES"; -const char* const OB_USER_TABLESPACES_ORA_TNAME = "USER_TABLESPACES"; -const char* const OB_DBA_IND_EXPRESSIONS_TNAME = "DBA_IND_EXPRESSIONS"; -const char* const OB_USER_IND_EXPRESSIONS_TNAME = "USER_IND_EXPRESSIONS"; -const char* const OB_ALL_IND_EXPRESSIONS_TNAME = "ALL_IND_EXPRESSIONS"; -const char* const OB_ALL_IND_PARTITIONS_TNAME = "ALL_IND_PARTITIONS"; -const char* const OB_USER_IND_PARTITIONS_TNAME = "USER_IND_PARTITIONS"; -const char* const OB_DBA_IND_PARTITIONS_TNAME = "DBA_IND_PARTITIONS"; -const char* const OB_DBA_IND_SUBPARTITIONS_TNAME = "DBA_IND_SUBPARTITIONS"; -const char* const OB_ALL_IND_SUBPARTITIONS_TNAME = "ALL_IND_SUBPARTITIONS"; -const char* const OB_USER_IND_SUBPARTITIONS_TNAME = "USER_IND_SUBPARTITIONS"; -const char* const OB_DBA_ROLES_TNAME = "DBA_ROLES"; -const char* const OB_DBA_ROLE_PRIVS_TNAME = "DBA_ROLE_PRIVS"; -const char* const OB_USER_ROLE_PRIVS_TNAME = "USER_ROLE_PRIVS"; -const char* const OB_DBA_TAB_PRIVS_TNAME = "DBA_TAB_PRIVS"; -const char* const OB_ALL_TAB_PRIVS_TNAME = "ALL_TAB_PRIVS"; -const char* const OB_USER_TAB_PRIVS_TNAME = "USER_TAB_PRIVS"; -const char* const OB_DBA_SYS_PRIVS_TNAME = "DBA_SYS_PRIVS"; -const char* const OB_USER_SYS_PRIVS_TNAME = "USER_SYS_PRIVS"; -const char* const OB_DBA_COL_PRIVS_ORA_TNAME = "DBA_COL_PRIVS"; -const char* const OB_USER_COL_PRIVS_ORA_TNAME = "USER_COL_PRIVS"; -const char* const OB_ALL_COL_PRIVS_ORA_TNAME = "ALL_COL_PRIVS"; -const char* const OB_ROLE_TAB_PRIVS_ORA_TNAME = "ROLE_TAB_PRIVS"; -const char* const OB_ROLE_SYS_PRIVS_ORA_TNAME = "ROLE_SYS_PRIVS"; -const char* const OB_ROLE_ROLE_PRIVS_ORA_TNAME = "ROLE_ROLE_PRIVS"; -const char* const OB_DICTIONARY_ORA_TNAME = "DICTIONARY"; -const char* const OB_DICT_ORA_TNAME = "DICT"; -const char* const OB_ALL_TRIGGERS_TNAME = "ALL_TRIGGERS"; -const char* const OB_DBA_TRIGGERS_TNAME = "DBA_TRIGGERS"; -const char* const OB_USER_TRIGGERS_TNAME = "USER_TRIGGERS"; -const char* const OB_ALL_DEPENDENCIES_ORA_TNAME = "ALL_DEPENDENCIES"; -const char* const OB_DBA_DEPENDENCIES_ORA_TNAME = "DBA_DEPENDENCIES"; -const char* const OB_USER_DEPENDENCIES_ORA_TNAME = "USER_DEPENDENCIES"; -const char* const OB_DBA_RSRC_PLANS_TNAME = "DBA_RSRC_PLANS"; -const char* const OB_DBA_RSRC_PLAN_DIRECTIVES_TNAME = "DBA_RSRC_PLAN_DIRECTIVES"; -const char* const OB_DBA_RSRC_GROUP_MAPPINGS_TNAME = "DBA_RSRC_GROUP_MAPPINGS"; -const char* const OB_DBA_RECYCLEBIN_ORA_TNAME = "DBA_RECYCLEBIN"; -const char* const OB_USER_RECYCLEBIN_ORA_TNAME = "USER_RECYCLEBIN"; -const char* const OB_DBA_RSRC_CONSUMER_GROUPS_TNAME = "DBA_RSRC_CONSUMER_GROUPS"; -const char* const OB_GV_OUTLINE_ORA_TNAME = "GV$OUTLINE"; -const char* const OB_GV_SQL_AUDIT_ORA_TNAME = "GV$SQL_AUDIT"; -const char* const OB_V_SQL_AUDIT_ORA_TNAME = "V$SQL_AUDIT"; -const char* const OB_GV_INSTANCE_TNAME = "GV$INSTANCE"; -const char* const OB_V_INSTANCE_TNAME = "V$INSTANCE"; -const char* const OB_GV_PLAN_CACHE_PLAN_STAT_ORA_TNAME = "GV$PLAN_CACHE_PLAN_STAT"; -const char* const OB_V_PLAN_CACHE_PLAN_STAT_ORA_TNAME = "V$PLAN_CACHE_PLAN_STAT"; -const char* const OB_GV_PLAN_CACHE_PLAN_EXPLAIN_ORA_TNAME = "GV$PLAN_CACHE_PLAN_EXPLAIN"; -const char* const OB_V_PLAN_CACHE_PLAN_EXPLAIN_ORA_TNAME = "V$PLAN_CACHE_PLAN_EXPLAIN"; -const char* const OB_GV_SESSION_WAIT_ORA_TNAME = "GV$SESSION_WAIT"; -const char* const OB_V_SESSION_WAIT_ORA_TNAME = "V$SESSION_WAIT"; -const char* const OB_GV_SESSION_WAIT_HISTORY_ORA_TNAME = "GV$SESSION_WAIT_HISTORY"; -const char* const OB_V_SESSION_WAIT_HISTORY_ORA_TNAME = "V$SESSION_WAIT_HISTORY"; -const char* const OB_GV_MEMORY_ORA_TNAME = "GV$MEMORY"; -const char* const OB_V_MEMORY_ORA_TNAME = "V$MEMORY"; -const char* const OB_GV_MEMSTORE_ORA_TNAME = "GV$MEMSTORE"; -const char* const OB_V_MEMSTORE_ORA_TNAME = "V$MEMSTORE"; -const char* const OB_GV_MEMSTORE_INFO_ORA_TNAME = "GV$MEMSTORE_INFO"; -const char* const OB_V_MEMSTORE_INFO_ORA_TNAME = "V$MEMSTORE_INFO"; -const char* const OB_GV_SERVER_MEMSTORE_ORA_TNAME = "GV$SERVER_MEMSTORE"; -const char* const OB_GV_SESSTAT_ORA_TNAME = "GV$SESSTAT"; -const char* const OB_V_SESSTAT_ORA_TNAME = "V$SESSTAT"; -const char* const OB_GV_SYSSTAT_ORA_TNAME = "GV$SYSSTAT"; -const char* const OB_V_SYSSTAT_ORA_TNAME = "V$SYSSTAT"; -const char* const OB_GV_SYSTEM_EVENT_ORA_TNAME = "GV$SYSTEM_EVENT"; -const char* const OB_V_SYSTEM_EVENT_ORA_TNAME = "V$SYSTEM_EVENT"; -const char* const OB_GV_TENANT_MEMSTORE_ALLOCATOR_INFO_ORA_TNAME = "GV$TENANT_MEMSTORE_ALLOCATOR_INFO"; -const char* const OB_V_TENANT_MEMSTORE_ALLOCATOR_INFO_ORA_TNAME = "V$TENANT_MEMSTORE_ALLOCATOR_INFO"; -const char* const OB_GV_PLAN_CACHE_STAT_ORA_TNAME = "GV$PLAN_CACHE_STAT"; -const char* const OB_V_PLAN_CACHE_STAT_ORA_TNAME = "V$PLAN_CACHE_STAT"; -const char* const OB_GV_CONCURRENT_LIMIT_SQL_ORA_TNAME = "GV$CONCURRENT_LIMIT_SQL"; -const char* const OB_NLS_SESSION_PARAMETERS_ORA_TNAME = "NLS_SESSION_PARAMETERS"; -const char* const OB_NLS_INSTANCE_PARAMETERS_ORA_TNAME = "NLS_INSTANCE_PARAMETERS"; -const char* const OB_NLS_DATABASE_PARAMETERS_ORA_TNAME = "NLS_DATABASE_PARAMETERS"; -const char* const OB_V_NLS_PARAMETERS_ORA_TNAME = "V$NLS_PARAMETERS"; -const char* const OB_V_VERSION_ORA_TNAME = "V$VERSION"; -const char* const OB_GV_TENANT_PX_WORKER_STAT_ORA_TNAME = "GV$TENANT_PX_WORKER_STAT"; -const char* const OB_V_TENANT_PX_WORKER_STAT_ORA_TNAME = "V$TENANT_PX_WORKER_STAT"; -const char* const OB_GV_PS_STAT_ORA_TNAME = "GV$PS_STAT"; -const char* const OB_V_PS_STAT_ORA_TNAME = "V$PS_STAT"; -const char* const OB_GV_PS_ITEM_INFO_ORA_TNAME = "GV$PS_ITEM_INFO"; -const char* const OB_V_PS_ITEM_INFO_ORA_TNAME = "V$PS_ITEM_INFO"; -const char* const OB_GV_SQL_WORKAREA_ACTIVE_ORA_TNAME = "GV$SQL_WORKAREA_ACTIVE"; -const char* const OB_V_SQL_WORKAREA_ACTIVE_ORA_TNAME = "V$SQL_WORKAREA_ACTIVE"; -const char* const OB_GV_SQL_WORKAREA_HISTOGRAM_ORA_TNAME = "GV$SQL_WORKAREA_HISTOGRAM"; -const char* const OB_V_SQL_WORKAREA_HISTOGRAM_ORA_TNAME = "V$SQL_WORKAREA_HISTOGRAM"; -const char* const OB_GV_OB_SQL_WORKAREA_MEMORY_INFO_ORA_TNAME = "GV$OB_SQL_WORKAREA_MEMORY_INFO"; -const char* const OB_V_OB_SQL_WORKAREA_MEMORY_INFO_ORA_TNAME = "V$OB_SQL_WORKAREA_MEMORY_INFO"; -const char* const OB_GV_PLAN_CACHE_REFERENCE_INFO_ORA_TNAME = "GV$PLAN_CACHE_REFERENCE_INFO"; -const char* const OB_V_PLAN_CACHE_REFERENCE_INFO_ORA_TNAME = "V$PLAN_CACHE_REFERENCE_INFO"; -const char* const OB_GV_SQL_WORKAREA_ORA_TNAME = "GV$SQL_WORKAREA"; -const char* const OB_V_SQL_WORKAREA_ORA_TNAME = "V$SQL_WORKAREA"; -const char* const OB_GV_SSTABLE_ORA_TNAME = "GV$SSTABLE"; -const char* const OB_V_SSTABLE_ORA_TNAME = "V$SSTABLE"; -const char* const OB_GV_SERVER_SCHEMA_INFO_ORA_TNAME = "GV$SERVER_SCHEMA_INFO"; -const char* const OB_V_SERVER_SCHEMA_INFO_ORA_TNAME = "V$SERVER_SCHEMA_INFO"; -const char* const OB_GV_SQL_PLAN_MONITOR_ORA_TNAME = "GV$SQL_PLAN_MONITOR"; -const char* const OB_V_SQL_PLAN_MONITOR_ORA_TNAME = "V$SQL_PLAN_MONITOR"; -const char* const OB_V_SQL_MONITOR_STATNAME_ORA_TNAME = "V$SQL_MONITOR_STATNAME"; -const char* const OB_GV_LOCK_ORA_TNAME = "GV$LOCK"; -const char* const OB_V_LOCK_ORA_TNAME = "V$LOCK"; -const char* const OB_GV_OPEN_CURSOR_ORA_TNAME = "GV$OPEN_CURSOR"; -const char* const OB_V_OPEN_CURSOR_ORA_TNAME = "V$OPEN_CURSOR"; -const char* const OB_V_TIMEZONE_NAMES_ORA_TNAME = "V$TIMEZONE_NAMES"; -const char* const OB_GV_GLOBAL_TRANSACTION_ORA_TNAME = "GV$GLOBAL_TRANSACTION"; -const char* const OB_V_GLOBAL_TRANSACTION_ORA_TNAME = "V$GLOBAL_TRANSACTION"; -const char* const OB_V_RESTORE_POINT_ORA_TNAME = "V$RESTORE_POINT"; -const char* const OB_V_RSRC_PLAN_ORA_TNAME = "V$RSRC_PLAN"; -const char* const OB_TRIGGERS_TNAME = "TRIGGERS"; -const char* const OB_ALL_TABLE_V2_HISTORY_IDX_DATA_TABLE_ID_TNAME = "__idx_1099511628058_idx_data_table_id"; -const char* const OB_ALL_TABLE_HISTORY_IDX_DATA_TABLE_ID_TNAME = "__idx_1099511627890_idx_data_table_id"; -const char* const OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TNAME = - "__idx_1099511638779_all_virtual_plan_cache_stat_i1"; -const char* const OB_ALL_VIRTUAL_SESSION_EVENT_ALL_VIRTUAL_SESSION_EVENT_I1_TNAME = - "__idx_1099511638789_all_virtual_session_event_i1"; -const char* const OB_ALL_VIRTUAL_SESSION_WAIT_ALL_VIRTUAL_SESSION_WAIT_I1_TNAME = - "__idx_1099511638790_all_virtual_session_wait_i1"; -const char* const OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TNAME = - "__idx_1099511638791_all_virtual_session_wait_history_i1"; -const char* const OB_ALL_VIRTUAL_SYSTEM_EVENT_ALL_VIRTUAL_SYSTEM_EVENT_I1_TNAME = - "__idx_1099511638793_all_virtual_system_event_i1"; -const char* const OB_ALL_VIRTUAL_SESSTAT_ALL_VIRTUAL_SESSTAT_I1_TNAME = "__idx_1099511638796_all_virtual_sesstat_i1"; -const char* const OB_ALL_VIRTUAL_SYSSTAT_ALL_VIRTUAL_SYSSTAT_I1_TNAME = "__idx_1099511638797_all_virtual_sysstat_i1"; -const char* const OB_ALL_VIRTUAL_SQL_AUDIT_ALL_VIRTUAL_SQL_AUDIT_I1_TNAME = - "__idx_1099511638807_all_virtual_sql_audit_i1"; -const char* const OB_ALL_VIRTUAL_REPLICA_TASK_ALL_VIRTUAL_REPLICA_TASK_I1_TNAME = - "__idx_1099511639791_all_virtual_replica_task_i1"; -const char* const OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TNAME = - "__idx_1099511639961_all_virtual_sql_plan_monitor_i1"; -const char* const OB_ALL_VIRTUAL_SQL_AUDIT_ORA_ALL_VIRTUAL_SQL_AUDIT_I1_TNAME = - "__idx_1099511642785_all_virtual_sql_audit_i1"; -const char* const OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TNAME = - "__idx_1099511642810_all_virtual_plan_cache_stat_i1"; -const char* const OB_ALL_VIRTUAL_SESSION_WAIT_ORA_ALL_VIRTUAL_SESSION_WAIT_I1_TNAME = - "__idx_1099511642812_all_virtual_session_wait_i1"; -const char* const OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TNAME = - "__idx_1099511642813_all_virtual_session_wait_history_i1"; -const char* const OB_ALL_VIRTUAL_SESSTAT_ORA_ALL_VIRTUAL_SESSTAT_I1_TNAME = - "__idx_1099511642818_all_virtual_sesstat_i1"; -const char* const OB_ALL_VIRTUAL_SYSSTAT_ORA_ALL_VIRTUAL_SYSSTAT_I1_TNAME = - "__idx_1099511642819_all_virtual_sysstat_i1"; -const char* const OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_ALL_VIRTUAL_SYSTEM_EVENT_I1_TNAME = - "__idx_1099511642820_all_virtual_system_event_i1"; -const char* const OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TNAME = - "__idx_1099511642876_all_virtual_sql_plan_monitor_i1"; +const char *const OB_ALL_CORE_TABLE_TNAME = "__all_core_table"; +const char *const OB_ALL_ROOT_TABLE_TNAME = "__all_root_table"; +const char *const OB_ALL_TABLE_TNAME = "__all_table"; +const char *const OB_ALL_COLUMN_TNAME = "__all_column"; +const char *const OB_ALL_DDL_OPERATION_TNAME = "__all_ddl_operation"; +const char *const OB_ALL_TABLE_V2_TNAME = "__all_table_v2"; +const char *const OB_ALL_META_TABLE_TNAME = "__all_meta_table"; +const char *const OB_ALL_USER_TNAME = "__all_user"; +const char *const OB_ALL_USER_HISTORY_TNAME = "__all_user_history"; +const char *const OB_ALL_DATABASE_TNAME = "__all_database"; +const char *const OB_ALL_DATABASE_HISTORY_TNAME = "__all_database_history"; +const char *const OB_ALL_TABLEGROUP_TNAME = "__all_tablegroup"; +const char *const OB_ALL_TABLEGROUP_HISTORY_TNAME = "__all_tablegroup_history"; +const char *const OB_ALL_TENANT_TNAME = "__all_tenant"; +const char *const OB_ALL_TENANT_HISTORY_TNAME = "__all_tenant_history"; +const char *const OB_ALL_TABLE_PRIVILEGE_TNAME = "__all_table_privilege"; +const char *const OB_ALL_TABLE_PRIVILEGE_HISTORY_TNAME = "__all_table_privilege_history"; +const char *const OB_ALL_DATABASE_PRIVILEGE_TNAME = "__all_database_privilege"; +const char *const OB_ALL_DATABASE_PRIVILEGE_HISTORY_TNAME = "__all_database_privilege_history"; +const char *const OB_ALL_TABLE_HISTORY_TNAME = "__all_table_history"; +const char *const OB_ALL_COLUMN_HISTORY_TNAME = "__all_column_history"; +const char *const OB_ALL_ZONE_TNAME = "__all_zone"; +const char *const OB_ALL_SERVER_TNAME = "__all_server"; +const char *const OB_ALL_SYS_PARAMETER_TNAME = "__all_sys_parameter"; +const char *const OB_TENANT_PARAMETER_TNAME = "__tenant_parameter"; +const char *const OB_ALL_SYS_VARIABLE_TNAME = "__all_sys_variable"; +const char *const OB_ALL_SYS_STAT_TNAME = "__all_sys_stat"; +const char *const OB_ALL_COLUMN_STATISTIC_TNAME = "__all_column_statistic"; +const char *const OB_ALL_UNIT_TNAME = "__all_unit"; +const char *const OB_ALL_UNIT_CONFIG_TNAME = "__all_unit_config"; +const char *const OB_ALL_RESOURCE_POOL_TNAME = "__all_resource_pool"; +const char *const OB_ALL_TENANT_RESOURCE_USAGE_TNAME = "__all_tenant_resource_usage"; +const char *const OB_ALL_SEQUENCE_TNAME = "__all_sequence"; +const char *const OB_ALL_CHARSET_TNAME = "__all_charset"; +const char *const OB_ALL_COLLATION_TNAME = "__all_collation"; +const char *const OB_ALL_LOCAL_INDEX_STATUS_TNAME = "__all_local_index_status"; +const char *const OB_ALL_DUMMY_TNAME = "__all_dummy"; +const char *const OB_ALL_FROZEN_MAP_TNAME = "__all_frozen_map"; +const char *const OB_ALL_CLOG_HISTORY_INFO_TNAME = "__all_clog_history_info"; +const char *const OB_ALL_CLOG_HISTORY_INFO_V2_TNAME = "__all_clog_history_info_v2"; +const char *const OB_ALL_ROOTSERVICE_EVENT_HISTORY_TNAME = "__all_rootservice_event_history"; +const char *const OB_ALL_PRIVILEGE_TNAME = "__all_privilege"; +const char *const OB_ALL_OUTLINE_TNAME = "__all_outline"; +const char *const OB_ALL_OUTLINE_HISTORY_TNAME = "__all_outline_history"; +const char *const OB_ALL_ELECTION_EVENT_HISTORY_TNAME = "__all_election_event_history"; +const char *const OB_ALL_RECYCLEBIN_TNAME = "__all_recyclebin"; +const char *const OB_ALL_PART_TNAME = "__all_part"; +const char *const OB_ALL_PART_HISTORY_TNAME = "__all_part_history"; +const char *const OB_ALL_SUB_PART_TNAME = "__all_sub_part"; +const char *const OB_ALL_SUB_PART_HISTORY_TNAME = "__all_sub_part_history"; +const char *const OB_ALL_PART_INFO_TNAME = "__all_part_info"; +const char *const OB_ALL_PART_INFO_HISTORY_TNAME = "__all_part_info_history"; +const char *const OB_ALL_DEF_SUB_PART_TNAME = "__all_def_sub_part"; +const char *const OB_ALL_DEF_SUB_PART_HISTORY_TNAME = "__all_def_sub_part_history"; +const char *const OB_ALL_SERVER_EVENT_HISTORY_TNAME = "__all_server_event_history"; +const char *const OB_ALL_ROOTSERVICE_JOB_TNAME = "__all_rootservice_job"; +const char *const OB_ALL_UNIT_LOAD_HISTORY_TNAME = "__all_unit_load_history"; +const char *const OB_ALL_SYS_VARIABLE_HISTORY_TNAME = "__all_sys_variable_history"; +const char *const OB_ALL_RESTORE_JOB_TNAME = "__all_restore_job"; +const char *const OB_ALL_RESTORE_TASK_TNAME = "__all_restore_task"; +const char *const OB_ALL_RESTORE_JOB_HISTORY_TNAME = "__all_restore_job_history"; +const char *const OB_ALL_TIME_ZONE_TNAME = "__all_time_zone"; +const char *const OB_ALL_TIME_ZONE_NAME_TNAME = "__all_time_zone_name"; +const char *const OB_ALL_TIME_ZONE_TRANSITION_TNAME = "__all_time_zone_transition"; +const char *const OB_ALL_TIME_ZONE_TRANSITION_TYPE_TNAME = "__all_time_zone_transition_type"; +const char *const OB_ALL_DDL_ID_TNAME = "__all_ddl_id"; +const char *const OB_ALL_FOREIGN_KEY_TNAME = "__all_foreign_key"; +const char *const OB_ALL_FOREIGN_KEY_HISTORY_TNAME = "__all_foreign_key_history"; +const char *const OB_ALL_FOREIGN_KEY_COLUMN_TNAME = "__all_foreign_key_column"; +const char *const OB_ALL_FOREIGN_KEY_COLUMN_HISTORY_TNAME = "__all_foreign_key_column_history"; +const char *const OB_ALL_SYNONYM_TNAME = "__all_synonym"; +const char *const OB_ALL_SYNONYM_HISTORY_TNAME = "__all_synonym_history"; +const char *const OB_ALL_SEQUENCE_V2_TNAME = "__all_sequence_v2"; +const char *const OB_ALL_TENANT_META_TABLE_TNAME = "__all_tenant_meta_table"; +const char *const OB_ALL_INDEX_WAIT_TRANSACTION_STATUS_TNAME = "__all_index_wait_transaction_status"; +const char *const OB_ALL_INDEX_SCHEDULE_TASK_TNAME = "__all_index_schedule_task"; +const char *const OB_ALL_INDEX_CHECKSUM_TNAME = "__all_index_checksum"; +const char *const OB_ALL_ROUTINE_TNAME = "__all_routine"; +const char *const OB_ALL_ROUTINE_HISTORY_TNAME = "__all_routine_history"; +const char *const OB_ALL_ROUTINE_PARAM_TNAME = "__all_routine_param"; +const char *const OB_ALL_ROUTINE_PARAM_HISTORY_TNAME = "__all_routine_param_history"; +const char *const OB_ALL_TABLE_STAT_TNAME = "__all_table_stat"; +const char *const OB_ALL_COLUMN_STAT_TNAME = "__all_column_stat"; +const char *const OB_ALL_HISTOGRAM_STAT_TNAME = "__all_histogram_stat"; +const char *const OB_ALL_PACKAGE_TNAME = "__all_package"; +const char *const OB_ALL_PACKAGE_HISTORY_TNAME = "__all_package_history"; +const char *const OB_ALL_SQL_EXECUTE_TASK_TNAME = "__all_sql_execute_task"; +const char *const OB_ALL_INDEX_BUILD_STAT_TNAME = "__all_index_build_stat"; +const char *const OB_ALL_BUILD_INDEX_PARAM_TNAME = "__all_build_index_param"; +const char *const OB_ALL_GLOBAL_INDEX_DATA_SRC_TNAME = "__all_global_index_data_src"; +const char *const OB_ALL_ACQUIRED_SNAPSHOT_TNAME = "__all_acquired_snapshot"; +const char *const OB_ALL_IMMEDIATE_EFFECT_INDEX_SSTABLE_TNAME = "__all_immediate_effect_index_sstable"; +const char *const OB_ALL_SSTABLE_CHECKSUM_TNAME = "__all_sstable_checksum"; +const char *const OB_ALL_TENANT_GC_PARTITION_INFO_TNAME = "__all_tenant_gc_partition_info"; +const char *const OB_ALL_CONSTRAINT_TNAME = "__all_constraint"; +const char *const OB_ALL_CONSTRAINT_HISTORY_TNAME = "__all_constraint_history"; +const char *const OB_ALL_ORI_SCHEMA_VERSION_TNAME = "__all_ori_schema_version"; +const char *const OB_ALL_FUNC_TNAME = "__all_func"; +const char *const OB_ALL_FUNC_HISTORY_TNAME = "__all_func_history"; +const char *const OB_ALL_TEMP_TABLE_TNAME = "__all_temp_table"; +const char *const OB_ALL_SSTABLE_COLUMN_CHECKSUM_TNAME = "__all_sstable_column_checksum"; +const char *const OB_ALL_SEQUENCE_OBJECT_TNAME = "__all_sequence_object"; +const char *const OB_ALL_SEQUENCE_OBJECT_HISTORY_TNAME = "__all_sequence_object_history"; +const char *const OB_ALL_SEQUENCE_VALUE_TNAME = "__all_sequence_value"; +const char *const OB_ALL_TENANT_PLAN_BASELINE_TNAME = "__all_tenant_plan_baseline"; +const char *const OB_ALL_TENANT_PLAN_BASELINE_HISTORY_TNAME = "__all_tenant_plan_baseline_history"; +const char *const OB_ALL_DDL_HELPER_TNAME = "__all_ddl_helper"; +const char *const OB_ALL_FREEZE_SCHEMA_VERSION_TNAME = "__all_freeze_schema_version"; +const char *const OB_ALL_TYPE_TNAME = "__all_type"; +const char *const OB_ALL_TYPE_HISTORY_TNAME = "__all_type_history"; +const char *const OB_ALL_TYPE_ATTR_TNAME = "__all_type_attr"; +const char *const OB_ALL_TYPE_ATTR_HISTORY_TNAME = "__all_type_attr_history"; +const char *const OB_ALL_COLL_TYPE_TNAME = "__all_coll_type"; +const char *const OB_ALL_COLL_TYPE_HISTORY_TNAME = "__all_coll_type_history"; +const char *const OB_ALL_WEAK_READ_SERVICE_TNAME = "__all_weak_read_service"; +const char *const OB_ALL_GTS_TNAME = "__all_gts"; +const char *const OB_ALL_TENANT_GTS_TNAME = "__all_tenant_gts"; +const char *const OB_ALL_PARTITION_MEMBER_LIST_TNAME = "__all_partition_member_list"; +const char *const OB_ALL_DBLINK_TNAME = "__all_dblink"; +const char *const OB_ALL_DBLINK_HISTORY_TNAME = "__all_dblink_history"; +const char *const OB_ALL_TENANT_PARTITION_META_TABLE_TNAME = "__all_tenant_partition_meta_table"; +const char *const OB_ALL_TENANT_ROLE_GRANTEE_MAP_TNAME = "__all_tenant_role_grantee_map"; +const char *const OB_ALL_TENANT_ROLE_GRANTEE_MAP_HISTORY_TNAME = "__all_tenant_role_grantee_map_history"; +const char *const OB_ALL_TENANT_KEYSTORE_TNAME = "__all_tenant_keystore"; +const char *const OB_ALL_TENANT_KEYSTORE_HISTORY_TNAME = "__all_tenant_keystore_history"; +const char *const OB_ALL_TENANT_TABLESPACE_TNAME = "__all_tenant_tablespace"; +const char *const OB_ALL_TENANT_TABLESPACE_HISTORY_TNAME = "__all_tenant_tablespace_history"; +const char *const OB_ALL_TENANT_USER_FAILED_LOGIN_STAT_TNAME = "__all_tenant_user_failed_login_stat"; +const char *const OB_ALL_TENANT_PROFILE_TNAME = "__all_tenant_profile"; +const char *const OB_ALL_TENANT_PROFILE_HISTORY_TNAME = "__all_tenant_profile_history"; +const char *const OB_ALL_TENANT_SECURITY_AUDIT_TNAME = "__all_tenant_security_audit"; +const char *const OB_ALL_TENANT_SECURITY_AUDIT_HISTORY_TNAME = "__all_tenant_security_audit_history"; +const char *const OB_ALL_TENANT_TRIGGER_TNAME = "__all_tenant_trigger"; +const char *const OB_ALL_TENANT_TRIGGER_HISTORY_TNAME = "__all_tenant_trigger_history"; +const char *const OB_ALL_SEED_PARAMETER_TNAME = "__all_seed_parameter"; +const char *const OB_ALL_TENANT_SSTABLE_COLUMN_CHECKSUM_TNAME = "__all_tenant_sstable_column_checksum"; +const char *const OB_ALL_TENANT_SECURITY_AUDIT_RECORD_TNAME = "__all_tenant_security_audit_record"; +const char *const OB_ALL_TENANT_SYSAUTH_TNAME = "__all_tenant_sysauth"; +const char *const OB_ALL_TENANT_SYSAUTH_HISTORY_TNAME = "__all_tenant_sysauth_history"; +const char *const OB_ALL_TENANT_OBJAUTH_TNAME = "__all_tenant_objauth"; +const char *const OB_ALL_TENANT_OBJAUTH_HISTORY_TNAME = "__all_tenant_objauth_history"; +const char *const OB_ALL_TENANT_BACKUP_INFO_TNAME = "__all_tenant_backup_info"; +const char *const OB_ALL_RESTORE_INFO_TNAME = "__all_restore_info"; +const char *const OB_ALL_TENANT_BACKUP_LOG_ARCHIVE_STATUS_TNAME = "__all_tenant_backup_log_archive_status"; +const char *const OB_ALL_BACKUP_LOG_ARCHIVE_STATUS_HISTORY_TNAME = "__all_backup_log_archive_status_history"; +const char *const OB_ALL_TENANT_BACKUP_TASK_TNAME = "__all_tenant_backup_task"; +const char *const OB_ALL_BACKUP_TASK_HISTORY_TNAME = "__all_backup_task_history"; +const char *const OB_ALL_TENANT_PG_BACKUP_TASK_TNAME = "__all_tenant_pg_backup_task"; +const char *const OB_ALL_TENANT_ERROR_TNAME = "__all_tenant_error"; +const char *const OB_ALL_SERVER_RECOVERY_STATUS_TNAME = "__all_server_recovery_status"; +const char *const OB_ALL_DATAFILE_RECOVERY_STATUS_TNAME = "__all_datafile_recovery_status"; +const char *const OB_ALL_TENANT_BACKUP_CLEAN_INFO_TNAME = "__all_tenant_backup_clean_info"; +const char *const OB_ALL_BACKUP_CLEAN_INFO_HISTORY_TNAME = "__all_backup_clean_info_history"; +const char *const OB_ALL_BACKUP_TASK_CLEAN_HISTORY_TNAME = "__all_backup_task_clean_history"; +const char *const OB_ALL_RESTORE_PROGRESS_TNAME = "__all_restore_progress"; +const char *const OB_ALL_RESTORE_HISTORY_TNAME = "__all_restore_history"; +const char *const OB_ALL_TENANT_RESTORE_PG_INFO_TNAME = "__all_tenant_restore_pg_info"; +const char *const OB_ALL_TABLE_V2_HISTORY_TNAME = "__all_table_v2_history"; +const char *const OB_ALL_TENANT_OBJECT_TYPE_TNAME = "__all_tenant_object_type"; +const char *const OB_ALL_TENANT_OBJECT_TYPE_HISTORY_TNAME = "__all_tenant_object_type_history"; +const char *const OB_ALL_BACKUP_VALIDATION_JOB_TNAME = "__all_backup_validation_job"; +const char *const OB_ALL_BACKUP_VALIDATION_JOB_HISTORY_TNAME = "__all_backup_validation_job_history"; +const char *const OB_ALL_TENANT_BACKUP_VALIDATION_TASK_TNAME = "__all_tenant_backup_validation_task"; +const char *const OB_ALL_BACKUP_VALIDATION_TASK_HISTORY_TNAME = "__all_backup_validation_task_history"; +const char *const OB_ALL_TENANT_PG_BACKUP_VALIDATION_TASK_TNAME = "__all_tenant_pg_backup_validation_task"; +const char *const OB_ALL_TENANT_TIME_ZONE_TNAME = "__all_tenant_time_zone"; +const char *const OB_ALL_TENANT_TIME_ZONE_NAME_TNAME = "__all_tenant_time_zone_name"; +const char *const OB_ALL_TENANT_TIME_ZONE_TRANSITION_TNAME = "__all_tenant_time_zone_transition"; +const char *const OB_ALL_TENANT_TIME_ZONE_TRANSITION_TYPE_TNAME = "__all_tenant_time_zone_transition_type"; +const char *const OB_ALL_TENANT_CONSTRAINT_COLUMN_TNAME = "__all_tenant_constraint_column"; +const char *const OB_ALL_TENANT_CONSTRAINT_COLUMN_HISTORY_TNAME = "__all_tenant_constraint_column_history"; +const char *const OB_ALL_TENANT_GLOBAL_TRANSACTION_TNAME = "__all_tenant_global_transaction"; +const char *const OB_ALL_TENANT_DEPENDENCY_TNAME = "__all_tenant_dependency"; +const char *const OB_ALL_BACKUP_BACKUPSET_JOB_TNAME = "__all_backup_backupset_job"; +const char *const OB_ALL_BACKUP_BACKUPSET_JOB_HISTORY_TNAME = "__all_backup_backupset_job_history"; +const char *const OB_ALL_TENANT_BACKUP_BACKUPSET_TASK_TNAME = "__all_tenant_backup_backupset_task"; +const char *const OB_ALL_BACKUP_BACKUPSET_TASK_HISTORY_TNAME = "__all_backup_backupset_task_history"; +const char *const OB_ALL_TENANT_PG_BACKUP_BACKUPSET_TASK_TNAME = "__all_tenant_pg_backup_backupset_task"; +const char *const OB_ALL_TENANT_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TNAME = "__all_tenant_backup_backup_log_archive_status"; +const char *const OB_ALL_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_HISTORY_TNAME = "__all_backup_backup_log_archive_status_history"; +const char *const OB_ALL_RES_MGR_PLAN_TNAME = "__all_res_mgr_plan"; +const char *const OB_ALL_RES_MGR_DIRECTIVE_TNAME = "__all_res_mgr_directive"; +const char *const OB_ALL_RES_MGR_MAPPING_RULE_TNAME = "__all_res_mgr_mapping_rule"; +const char *const OB_ALL_RES_MGR_CONSUMER_GROUP_TNAME = "__all_res_mgr_consumer_group"; +const char *const OB_TENANT_VIRTUAL_ALL_TABLE_TNAME = "__tenant_virtual_all_table"; +const char *const OB_TENANT_VIRTUAL_TABLE_COLUMN_TNAME = "__tenant_virtual_table_column"; +const char *const OB_TENANT_VIRTUAL_TABLE_INDEX_TNAME = "__tenant_virtual_table_index"; +const char *const OB_TENANT_VIRTUAL_SHOW_CREATE_DATABASE_TNAME = "__tenant_virtual_show_create_database"; +const char *const OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_TNAME = "__tenant_virtual_show_create_table"; +const char *const OB_TENANT_VIRTUAL_SESSION_VARIABLE_TNAME = "__tenant_virtual_session_variable"; +const char *const OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_TNAME = "__tenant_virtual_privilege_grant"; +const char *const OB_ALL_VIRTUAL_PROCESSLIST_TNAME = "__all_virtual_processlist"; +const char *const OB_TENANT_VIRTUAL_WARNING_TNAME = "__tenant_virtual_warning"; +const char *const OB_TENANT_VIRTUAL_CURRENT_TENANT_TNAME = "__tenant_virtual_current_tenant"; +const char *const OB_TENANT_VIRTUAL_DATABASE_STATUS_TNAME = "__tenant_virtual_database_status"; +const char *const OB_TENANT_VIRTUAL_TENANT_STATUS_TNAME = "__tenant_virtual_tenant_status"; +const char *const OB_TENANT_VIRTUAL_INTERM_RESULT_TNAME = "__tenant_virtual_interm_result"; +const char *const OB_TENANT_VIRTUAL_PARTITION_STAT_TNAME = "__tenant_virtual_partition_stat"; +const char *const OB_TENANT_VIRTUAL_STATNAME_TNAME = "__tenant_virtual_statname"; +const char *const OB_TENANT_VIRTUAL_EVENT_NAME_TNAME = "__tenant_virtual_event_name"; +const char *const OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_TNAME = "__tenant_virtual_global_variable"; +const char *const OB_TENANT_VIRTUAL_SHOW_TABLES_TNAME = "__tenant_virtual_show_tables"; +const char *const OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_TNAME = "__tenant_virtual_show_create_procedure"; +const char *const OB_ALL_VIRTUAL_CORE_META_TABLE_TNAME = "__all_virtual_core_meta_table"; +const char *const OB_ALL_VIRTUAL_ZONE_STAT_TNAME = "__all_virtual_zone_stat"; +const char *const OB_ALL_VIRTUAL_PLAN_CACHE_STAT_TNAME = "__all_virtual_plan_cache_stat"; +const char *const OB_ALL_VIRTUAL_PLAN_STAT_TNAME = "__all_virtual_plan_stat"; +const char *const OB_ALL_VIRTUAL_MEM_LEAK_CHECKER_INFO_TNAME = "__all_virtual_mem_leak_checker_info"; +const char *const OB_ALL_VIRTUAL_LATCH_TNAME = "__all_virtual_latch"; +const char *const OB_ALL_VIRTUAL_KVCACHE_INFO_TNAME = "__all_virtual_kvcache_info"; +const char *const OB_ALL_VIRTUAL_DATA_TYPE_CLASS_TNAME = "__all_virtual_data_type_class"; +const char *const OB_ALL_VIRTUAL_DATA_TYPE_TNAME = "__all_virtual_data_type"; +const char *const OB_ALL_VIRTUAL_SERVER_STAT_TNAME = "__all_virtual_server_stat"; +const char *const OB_ALL_VIRTUAL_REBALANCE_TASK_STAT_TNAME = "__all_virtual_rebalance_task_stat"; +const char *const OB_ALL_VIRTUAL_SESSION_EVENT_TNAME = "__all_virtual_session_event"; +const char *const OB_ALL_VIRTUAL_SESSION_WAIT_TNAME = "__all_virtual_session_wait"; +const char *const OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_TNAME = "__all_virtual_session_wait_history"; +const char *const OB_ALL_VIRTUAL_SYSTEM_EVENT_TNAME = "__all_virtual_system_event"; +const char *const OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_TNAME = "__all_virtual_tenant_memstore_info"; +const char *const OB_ALL_VIRTUAL_CONCURRENCY_OBJECT_POOL_TNAME = "__all_virtual_concurrency_object_pool"; +const char *const OB_ALL_VIRTUAL_SESSTAT_TNAME = "__all_virtual_sesstat"; +const char *const OB_ALL_VIRTUAL_SYSSTAT_TNAME = "__all_virtual_sysstat"; +const char *const OB_ALL_VIRTUAL_STORAGE_STAT_TNAME = "__all_virtual_storage_stat"; +const char *const OB_ALL_VIRTUAL_DISK_STAT_TNAME = "__all_virtual_disk_stat"; +const char *const OB_ALL_VIRTUAL_MEMSTORE_INFO_TNAME = "__all_virtual_memstore_info"; +const char *const OB_ALL_VIRTUAL_PARTITION_INFO_TNAME = "__all_virtual_partition_info"; +const char *const OB_ALL_VIRTUAL_UPGRADE_INSPECTION_TNAME = "__all_virtual_upgrade_inspection"; +const char *const OB_ALL_VIRTUAL_TRANS_STAT_TNAME = "__all_virtual_trans_stat"; +const char *const OB_ALL_VIRTUAL_TRANS_MGR_STAT_TNAME = "__all_virtual_trans_mgr_stat"; +const char *const OB_ALL_VIRTUAL_ELECTION_INFO_TNAME = "__all_virtual_election_info"; +const char *const OB_ALL_VIRTUAL_ELECTION_MEM_STAT_TNAME = "__all_virtual_election_mem_stat"; +const char *const OB_ALL_VIRTUAL_SQL_AUDIT_TNAME = "__all_virtual_sql_audit"; +const char *const OB_ALL_VIRTUAL_TRANS_MEM_STAT_TNAME = "__all_virtual_trans_mem_stat"; +const char *const OB_ALL_VIRTUAL_PARTITION_SSTABLE_IMAGE_INFO_TNAME = "__all_virtual_partition_sstable_image_info"; +const char *const OB_ALL_VIRTUAL_CORE_ROOT_TABLE_TNAME = "__all_virtual_core_root_table"; +const char *const OB_ALL_VIRTUAL_CORE_ALL_TABLE_TNAME = "__all_virtual_core_all_table"; +const char *const OB_ALL_VIRTUAL_CORE_COLUMN_TABLE_TNAME = "__all_virtual_core_column_table"; +const char *const OB_ALL_VIRTUAL_MEMORY_INFO_TNAME = "__all_virtual_memory_info"; +const char *const OB_ALL_VIRTUAL_TENANT_STAT_TNAME = "__all_virtual_tenant_stat"; +const char *const OB_ALL_VIRTUAL_SYS_PARAMETER_STAT_TNAME = "__all_virtual_sys_parameter_stat"; +const char *const OB_ALL_VIRTUAL_PARTITION_REPLAY_STATUS_TNAME = "__all_virtual_partition_replay_status"; +const char *const OB_ALL_VIRTUAL_CLOG_STAT_TNAME = "__all_virtual_clog_stat"; +const char *const OB_ALL_VIRTUAL_TRACE_LOG_TNAME = "__all_virtual_trace_log"; +const char *const OB_ALL_VIRTUAL_ENGINE_TNAME = "__all_virtual_engine"; +const char *const OB_ALL_VIRTUAL_PROXY_SERVER_STAT_TNAME = "__all_virtual_proxy_server_stat"; +const char *const OB_ALL_VIRTUAL_PROXY_SYS_VARIABLE_TNAME = "__all_virtual_proxy_sys_variable"; +const char *const OB_ALL_VIRTUAL_PROXY_SCHEMA_TNAME = "__all_virtual_proxy_schema"; +const char *const OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_TNAME = "__all_virtual_plan_cache_plan_explain"; +const char *const OB_ALL_VIRTUAL_OBRPC_STAT_TNAME = "__all_virtual_obrpc_stat"; +const char *const OB_ALL_VIRTUAL_PARTITION_SSTABLE_MERGE_INFO_TNAME = "__all_virtual_partition_sstable_merge_info"; +const char *const OB_ALL_VIRTUAL_SQL_MONITOR_TNAME = "__all_virtual_sql_monitor"; +const char *const OB_TENANT_VIRTUAL_OUTLINE_TNAME = "__tenant_virtual_outline"; +const char *const OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_TNAME = "__tenant_virtual_concurrent_limit_sql"; +const char *const OB_ALL_VIRTUAL_SQL_PLAN_STATISTICS_TNAME = "__all_virtual_sql_plan_statistics"; +const char *const OB_ALL_VIRTUAL_PARTITION_SSTABLE_MACRO_INFO_TNAME = "__all_virtual_partition_sstable_macro_info"; +const char *const OB_ALL_VIRTUAL_PROXY_PARTITION_INFO_TNAME = "__all_virtual_proxy_partition_info"; +const char *const OB_ALL_VIRTUAL_PROXY_PARTITION_TNAME = "__all_virtual_proxy_partition"; +const char *const OB_ALL_VIRTUAL_PROXY_SUB_PARTITION_TNAME = "__all_virtual_proxy_sub_partition"; +const char *const OB_ALL_VIRTUAL_PROXY_ROUTE_TNAME = "__all_virtual_proxy_route"; +const char *const OB_ALL_VIRTUAL_REBALANCE_TENANT_STAT_TNAME = "__all_virtual_rebalance_tenant_stat"; +const char *const OB_ALL_VIRTUAL_REBALANCE_UNIT_STAT_TNAME = "__all_virtual_rebalance_unit_stat"; +const char *const OB_ALL_VIRTUAL_REBALANCE_REPLICA_STAT_TNAME = "__all_virtual_rebalance_replica_stat"; +const char *const OB_ALL_VIRTUAL_PARTITION_AMPLIFICATION_STAT_TNAME = "__all_virtual_partition_amplification_stat"; +const char *const OB_ALL_VIRTUAL_ELECTION_EVENT_HISTORY_TNAME = "__all_virtual_election_event_history"; +const char *const OB_ALL_VIRTUAL_PARTITION_STORE_INFO_TNAME = "__all_virtual_partition_store_info"; +const char *const OB_ALL_VIRTUAL_LEADER_STAT_TNAME = "__all_virtual_leader_stat"; +const char *const OB_ALL_VIRTUAL_PARTITION_MIGRATION_STATUS_TNAME = "__all_virtual_partition_migration_status"; +const char *const OB_ALL_VIRTUAL_SYS_TASK_STATUS_TNAME = "__all_virtual_sys_task_status"; +const char *const OB_ALL_VIRTUAL_MACRO_BLOCK_MARKER_STATUS_TNAME = "__all_virtual_macro_block_marker_status"; +const char *const OB_ALL_VIRTUAL_SERVER_CLOG_STAT_TNAME = "__all_virtual_server_clog_stat"; +const char *const OB_ALL_VIRTUAL_ROOTSERVICE_STAT_TNAME = "__all_virtual_rootservice_stat"; +const char *const OB_ALL_VIRTUAL_ELECTION_PRIORITY_TNAME = "__all_virtual_election_priority"; +const char *const OB_ALL_VIRTUAL_TENANT_DISK_STAT_TNAME = "__all_virtual_tenant_disk_stat"; +const char *const OB_ALL_VIRTUAL_REBALANCE_MAP_STAT_TNAME = "__all_virtual_rebalance_map_stat"; +const char *const OB_ALL_VIRTUAL_REBALANCE_MAP_ITEM_STAT_TNAME = "__all_virtual_rebalance_map_item_stat"; +const char *const OB_ALL_VIRTUAL_IO_STAT_TNAME = "__all_virtual_io_stat"; +const char *const OB_ALL_VIRTUAL_LONG_OPS_STATUS_TNAME = "__all_virtual_long_ops_status"; +const char *const OB_ALL_VIRTUAL_REBALANCE_UNIT_MIGRATE_STAT_TNAME = "__all_virtual_rebalance_unit_migrate_stat"; +const char *const OB_ALL_VIRTUAL_REBALANCE_UNIT_DISTRIBUTION_STAT_TNAME = "__all_virtual_rebalance_unit_distribution_stat"; +const char *const OB_ALL_VIRTUAL_SERVER_OBJECT_POOL_TNAME = "__all_virtual_server_object_pool"; +const char *const OB_ALL_VIRTUAL_TRANS_LOCK_STAT_TNAME = "__all_virtual_trans_lock_stat"; +const char *const OB_ALL_VIRTUAL_ELECTION_GROUP_INFO_TNAME = "__all_virtual_election_group_info"; +const char *const OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_TNAME = "__tenant_virtual_show_create_tablegroup"; +const char *const OB_ALL_VIRTUAL_SERVER_BLACKLIST_TNAME = "__all_virtual_server_blacklist"; +const char *const OB_ALL_VIRTUAL_PARTITION_SPLIT_INFO_TNAME = "__all_virtual_partition_split_info"; +const char *const OB_ALL_VIRTUAL_TRANS_RESULT_INFO_STAT_TNAME = "__all_virtual_trans_result_info_stat"; +const char *const OB_ALL_VIRTUAL_DUPLICATE_PARTITION_MGR_STAT_TNAME = "__all_virtual_duplicate_partition_mgr_stat"; +const char *const OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_TNAME = "__all_virtual_tenant_parameter_stat"; +const char *const OB_ALL_VIRTUAL_SERVER_SCHEMA_INFO_TNAME = "__all_virtual_server_schema_info"; +const char *const OB_ALL_VIRTUAL_MEMORY_CONTEXT_STAT_TNAME = "__all_virtual_memory_context_stat"; +const char *const OB_ALL_VIRTUAL_DUMP_TENANT_INFO_TNAME = "__all_virtual_dump_tenant_info"; +const char *const OB_ALL_VIRTUAL_TENANT_PARAMETER_INFO_TNAME = "__all_virtual_tenant_parameter_info"; +const char *const OB_ALL_VIRTUAL_DAG_WARNING_HISTORY_TNAME = "__all_virtual_dag_warning_history"; +const char *const OB_SESSION_VARIABLES_TNAME = "SESSION_VARIABLES"; +const char *const OB_TABLE_PRIVILEGES_TNAME = "TABLE_PRIVILEGES"; +const char *const OB_USER_PRIVILEGES_TNAME = "USER_PRIVILEGES"; +const char *const OB_SCHEMA_PRIVILEGES_TNAME = "SCHEMA_PRIVILEGES"; +const char *const OB_TABLE_CONSTRAINTS_TNAME = "TABLE_CONSTRAINTS"; +const char *const OB_GLOBAL_STATUS_TNAME = "GLOBAL_STATUS"; +const char *const OB_PARTITIONS_TNAME = "PARTITIONS"; +const char *const OB_SESSION_STATUS_TNAME = "SESSION_STATUS"; +const char *const OB_USER_TNAME = "user"; +const char *const OB_DB_TNAME = "db"; +const char *const OB_ALL_VIRTUAL_SERVER_MEMORY_INFO_TNAME = "__all_virtual_server_memory_info"; +const char *const OB_ALL_VIRTUAL_PARTITION_TABLE_TNAME = "__all_virtual_partition_table"; +const char *const OB_ALL_VIRTUAL_LOCK_WAIT_STAT_TNAME = "__all_virtual_lock_wait_stat"; +const char *const OB_ALL_VIRTUAL_PARTITION_ITEM_TNAME = "__all_virtual_partition_item"; +const char *const OB_ALL_VIRTUAL_REPLICA_TASK_TNAME = "__all_virtual_replica_task"; +const char *const OB_ALL_VIRTUAL_PARTITION_LOCATION_TNAME = "__all_virtual_partition_location"; +const char *const OB_PROC_TNAME = "proc"; +const char *const OB_TENANT_VIRTUAL_COLLATION_TNAME = "__tenant_virtual_collation"; +const char *const OB_TENANT_VIRTUAL_CHARSET_TNAME = "__tenant_virtual_charset"; +const char *const OB_ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_TNAME = "__all_virtual_tenant_memstore_allocator_info"; +const char *const OB_ALL_VIRTUAL_TABLE_MGR_TNAME = "__all_virtual_table_mgr"; +const char *const OB_ALL_VIRTUAL_META_TABLE_TNAME = "__all_virtual_meta_table"; +const char *const OB_ALL_VIRTUAL_FREEZE_INFO_TNAME = "__all_virtual_freeze_info"; +const char *const OB_PARAMETERS_TNAME = "PARAMETERS"; +const char *const OB_ALL_VIRTUAL_BAD_BLOCK_TABLE_TNAME = "__all_virtual_bad_block_table"; +const char *const OB_ALL_VIRTUAL_PX_WORKER_STAT_TNAME = "__all_virtual_px_worker_stat"; +const char *const OB_ALL_VIRTUAL_TRANS_AUDIT_TNAME = "__all_virtual_trans_audit"; +const char *const OB_ALL_VIRTUAL_TRANS_SQL_AUDIT_TNAME = "__all_virtual_trans_sql_audit"; +const char *const OB_ALL_VIRTUAL_WEAK_READ_STAT_TNAME = "__all_virtual_weak_read_stat"; +const char *const OB_ALL_VIRTUAL_PARTITION_AUDIT_TNAME = "__all_virtual_partition_audit"; +const char *const OB_ALL_VIRTUAL_SEQUENCE_V2_TNAME = "__all_virtual_sequence_v2"; +const char *const OB_ALL_VIRTUAL_SEQUENCE_VALUE_TNAME = "__all_virtual_sequence_value"; +const char *const OB_ALL_VIRTUAL_CLUSTER_TNAME = "__all_virtual_cluster"; +const char *const OB_ALL_VIRTUAL_PARTITION_TABLE_STORE_STAT_TNAME = "__all_virtual_partition_table_store_stat"; +const char *const OB_ALL_VIRTUAL_DDL_OPERATION_TNAME = "__all_virtual_ddl_operation"; +const char *const OB_ALL_VIRTUAL_OUTLINE_TNAME = "__all_virtual_outline"; +const char *const OB_ALL_VIRTUAL_OUTLINE_HISTORY_TNAME = "__all_virtual_outline_history"; +const char *const OB_ALL_VIRTUAL_SYNONYM_TNAME = "__all_virtual_synonym"; +const char *const OB_ALL_VIRTUAL_SYNONYM_HISTORY_TNAME = "__all_virtual_synonym_history"; +const char *const OB_ALL_VIRTUAL_DATABASE_PRIVILEGE_TNAME = "__all_virtual_database_privilege"; +const char *const OB_ALL_VIRTUAL_DATABASE_PRIVILEGE_HISTORY_TNAME = "__all_virtual_database_privilege_history"; +const char *const OB_ALL_VIRTUAL_TABLE_PRIVILEGE_TNAME = "__all_virtual_table_privilege"; +const char *const OB_ALL_VIRTUAL_TABLE_PRIVILEGE_HISTORY_TNAME = "__all_virtual_table_privilege_history"; +const char *const OB_ALL_VIRTUAL_DATABASE_TNAME = "__all_virtual_database"; +const char *const OB_ALL_VIRTUAL_DATABASE_HISTORY_TNAME = "__all_virtual_database_history"; +const char *const OB_ALL_VIRTUAL_TABLEGROUP_TNAME = "__all_virtual_tablegroup"; +const char *const OB_ALL_VIRTUAL_TABLEGROUP_HISTORY_TNAME = "__all_virtual_tablegroup_history"; +const char *const OB_ALL_VIRTUAL_TABLE_TNAME = "__all_virtual_table"; +const char *const OB_ALL_VIRTUAL_TABLE_HISTORY_TNAME = "__all_virtual_table_history"; +const char *const OB_ALL_VIRTUAL_COLUMN_TNAME = "__all_virtual_column"; +const char *const OB_ALL_VIRTUAL_COLUMN_HISTORY_TNAME = "__all_virtual_column_history"; +const char *const OB_ALL_VIRTUAL_PART_TNAME = "__all_virtual_part"; +const char *const OB_ALL_VIRTUAL_PART_HISTORY_TNAME = "__all_virtual_part_history"; +const char *const OB_ALL_VIRTUAL_PART_INFO_TNAME = "__all_virtual_part_info"; +const char *const OB_ALL_VIRTUAL_PART_INFO_HISTORY_TNAME = "__all_virtual_part_info_history"; +const char *const OB_ALL_VIRTUAL_DEF_SUB_PART_TNAME = "__all_virtual_def_sub_part"; +const char *const OB_ALL_VIRTUAL_DEF_SUB_PART_HISTORY_TNAME = "__all_virtual_def_sub_part_history"; +const char *const OB_ALL_VIRTUAL_SUB_PART_TNAME = "__all_virtual_sub_part"; +const char *const OB_ALL_VIRTUAL_SUB_PART_HISTORY_TNAME = "__all_virtual_sub_part_history"; +const char *const OB_ALL_VIRTUAL_CONSTRAINT_TNAME = "__all_virtual_constraint"; +const char *const OB_ALL_VIRTUAL_CONSTRAINT_HISTORY_TNAME = "__all_virtual_constraint_history"; +const char *const OB_ALL_VIRTUAL_FOREIGN_KEY_TNAME = "__all_virtual_foreign_key"; +const char *const OB_ALL_VIRTUAL_FOREIGN_KEY_HISTORY_TNAME = "__all_virtual_foreign_key_history"; +const char *const OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_TNAME = "__all_virtual_foreign_key_column"; +const char *const OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_HISTORY_TNAME = "__all_virtual_foreign_key_column_history"; +const char *const OB_ALL_VIRTUAL_TEMP_TABLE_TNAME = "__all_virtual_temp_table"; +const char *const OB_ALL_VIRTUAL_ORI_SCHEMA_VERSION_TNAME = "__all_virtual_ori_schema_version"; +const char *const OB_ALL_VIRTUAL_SYS_STAT_TNAME = "__all_virtual_sys_stat"; +const char *const OB_ALL_VIRTUAL_USER_TNAME = "__all_virtual_user"; +const char *const OB_ALL_VIRTUAL_USER_HISTORY_TNAME = "__all_virtual_user_history"; +const char *const OB_ALL_VIRTUAL_SYS_VARIABLE_TNAME = "__all_virtual_sys_variable"; +const char *const OB_ALL_VIRTUAL_SYS_VARIABLE_HISTORY_TNAME = "__all_virtual_sys_variable_history"; +const char *const OB_ALL_VIRTUAL_FUNC_TNAME = "__all_virtual_func"; +const char *const OB_ALL_VIRTUAL_FUNC_HISTORY_TNAME = "__all_virtual_func_history"; +const char *const OB_ALL_VIRTUAL_PACKAGE_TNAME = "__all_virtual_package"; +const char *const OB_ALL_VIRTUAL_PACKAGE_HISTORY_TNAME = "__all_virtual_package_history"; +const char *const OB_ALL_VIRTUAL_ROUTINE_TNAME = "__all_virtual_routine"; +const char *const OB_ALL_VIRTUAL_ROUTINE_HISTORY_TNAME = "__all_virtual_routine_history"; +const char *const OB_ALL_VIRTUAL_ROUTINE_PARAM_TNAME = "__all_virtual_routine_param"; +const char *const OB_ALL_VIRTUAL_ROUTINE_PARAM_HISTORY_TNAME = "__all_virtual_routine_param_history"; +const char *const OB_ALL_VIRTUAL_TYPE_TNAME = "__all_virtual_type"; +const char *const OB_ALL_VIRTUAL_TYPE_HISTORY_TNAME = "__all_virtual_type_history"; +const char *const OB_ALL_VIRTUAL_TYPE_ATTR_TNAME = "__all_virtual_type_attr"; +const char *const OB_ALL_VIRTUAL_TYPE_ATTR_HISTORY_TNAME = "__all_virtual_type_attr_history"; +const char *const OB_ALL_VIRTUAL_COLL_TYPE_TNAME = "__all_virtual_coll_type"; +const char *const OB_ALL_VIRTUAL_COLL_TYPE_HISTORY_TNAME = "__all_virtual_coll_type_history"; +const char *const OB_ALL_VIRTUAL_COLUMN_STAT_TNAME = "__all_virtual_column_stat"; +const char *const OB_ALL_VIRTUAL_TABLE_STAT_TNAME = "__all_virtual_table_stat"; +const char *const OB_ALL_VIRTUAL_HISTOGRAM_STAT_TNAME = "__all_virtual_histogram_stat"; +const char *const OB_ALL_VIRTUAL_COLUMN_STATISTIC_TNAME = "__all_virtual_column_statistic"; +const char *const OB_ALL_VIRTUAL_RECYCLEBIN_TNAME = "__all_virtual_recyclebin"; +const char *const OB_ALL_VIRTUAL_TENANT_GC_PARTITION_INFO_TNAME = "__all_virtual_tenant_gc_partition_info"; +const char *const OB_ALL_VIRTUAL_TENANT_PLAN_BASELINE_TNAME = "__all_virtual_tenant_plan_baseline"; +const char *const OB_ALL_VIRTUAL_TENANT_PLAN_BASELINE_HISTORY_TNAME = "__all_virtual_tenant_plan_baseline_history"; +const char *const OB_ALL_VIRTUAL_SEQUENCE_OBJECT_TNAME = "__all_virtual_sequence_object"; +const char *const OB_ALL_VIRTUAL_SEQUENCE_OBJECT_HISTORY_TNAME = "__all_virtual_sequence_object_history"; +const char *const OB_ALL_VIRTUAL_RAID_STAT_TNAME = "__all_virtual_raid_stat"; +const char *const OB_ALL_VIRTUAL_SERVER_LOG_META_TNAME = "__all_virtual_server_log_meta"; +const char *const OB_ALL_VIRTUAL_DTL_CHANNEL_TNAME = "__all_virtual_dtl_channel"; +const char *const OB_ALL_VIRTUAL_DTL_MEMORY_TNAME = "__all_virtual_dtl_memory"; +const char *const OB_ALL_VIRTUAL_DTL_FIRST_CACHED_BUFFER_TNAME = "__all_virtual_dtl_first_cached_buffer"; +const char *const OB_ALL_VIRTUAL_DBLINK_TNAME = "__all_virtual_dblink"; +const char *const OB_ALL_VIRTUAL_DBLINK_HISTORY_TNAME = "__all_virtual_dblink_history"; +const char *const OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_TNAME = "__all_virtual_tenant_partition_meta_table"; +const char *const OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_TNAME = "__all_virtual_tenant_role_grantee_map"; +const char *const OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_HISTORY_TNAME = "__all_virtual_tenant_role_grantee_map_history"; +const char *const OB_ALL_VIRTUAL_TENANT_KEYSTORE_TNAME = "__all_virtual_tenant_keystore"; +const char *const OB_ALL_VIRTUAL_TENANT_KEYSTORE_HISTORY_TNAME = "__all_virtual_tenant_keystore_history"; +const char *const OB_ALL_VIRTUAL_DEADLOCK_STAT_TNAME = "__all_virtual_deadlock_stat"; +const char *const OB_ALL_VIRTUAL_TENANT_TABLESPACE_TNAME = "__all_virtual_tenant_tablespace"; +const char *const OB_ALL_VIRTUAL_TENANT_TABLESPACE_HISTORY_TNAME = "__all_virtual_tenant_tablespace_history"; +const char *const OB_ALL_VIRTUAL_INFORMATION_COLUMNS_TNAME = "__ALL_VIRTUAL_INFORMATION_COLUMNS"; +const char *const OB_ALL_VIRTUAL_PG_PARTITION_INFO_TNAME = "__all_virtual_pg_partition_info"; +const char *const OB_ALL_VIRTUAL_TENANT_USER_FAILED_LOGIN_STAT_TNAME = "__all_virtual_tenant_user_failed_login_stat"; +const char *const OB_ALL_VIRTUAL_TENANT_PROFILE_TNAME = "__all_virtual_tenant_profile"; +const char *const OB_ALL_VIRTUAL_TENANT_PROFILE_HISTORY_TNAME = "__all_virtual_tenant_profile_history"; +const char *const OB_ALL_VIRTUAL_SECURITY_AUDIT_TNAME = "__all_virtual_security_audit"; +const char *const OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_TNAME = "__all_virtual_security_audit_history"; +const char *const OB_ALL_VIRTUAL_TRIGGER_TNAME = "__all_virtual_trigger"; +const char *const OB_ALL_VIRTUAL_TRIGGER_HISTORY_TNAME = "__all_virtual_trigger_history"; +const char *const OB_ALL_VIRTUAL_CLUSTER_STATS_TNAME = "__all_virtual_cluster_stats"; +const char *const OB_ALL_VIRTUAL_SSTABLE_COLUMN_CHECKSUM_TNAME = "__all_virtual_sstable_column_checksum"; +const char *const OB_ALL_VIRTUAL_PS_STAT_TNAME = "__all_virtual_ps_stat"; +const char *const OB_ALL_VIRTUAL_PS_ITEM_INFO_TNAME = "__all_virtual_ps_item_info"; +const char *const OB_ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_TNAME = "__all_virtual_sql_workarea_history_stat"; +const char *const OB_ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_TNAME = "__all_virtual_sql_workarea_active"; +const char *const OB_ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_TNAME = "__all_virtual_sql_workarea_histogram"; +const char *const OB_ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_TNAME = "__all_virtual_sql_workarea_memory_info"; +const char *const OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_TNAME = "__all_virtual_security_audit_record"; +const char *const OB_ALL_VIRTUAL_SYSAUTH_TNAME = "__all_virtual_sysauth"; +const char *const OB_ALL_VIRTUAL_SYSAUTH_HISTORY_TNAME = "__all_virtual_sysauth_history"; +const char *const OB_ALL_VIRTUAL_OBJAUTH_TNAME = "__all_virtual_objauth"; +const char *const OB_ALL_VIRTUAL_OBJAUTH_HISTORY_TNAME = "__all_virtual_objauth_history"; +const char *const OB_ALL_VIRTUAL_BACKUP_INFO_TNAME = "__all_virtual_backup_info"; +const char *const OB_ALL_VIRTUAL_BACKUP_LOG_ARCHIVE_STATUS_TNAME = "__all_virtual_backup_log_archive_status"; +const char *const OB_ALL_VIRTUAL_BACKUP_TASK_TNAME = "__all_virtual_backup_task"; +const char *const OB_ALL_VIRTUAL_PG_BACKUP_TASK_TNAME = "__all_virtual_pg_backup_task"; +const char *const OB_ALL_VIRTUAL_PG_BACKUP_LOG_ARCHIVE_STATUS_TNAME = "__all_virtual_pg_backup_log_archive_status"; +const char *const OB_ALL_VIRTUAL_SERVER_BACKUP_LOG_ARCHIVE_STATUS_TNAME = "__all_virtual_server_backup_log_archive_status"; +const char *const OB_ALL_VIRTUAL_ERROR_TNAME = "__all_virtual_error"; +const char *const OB_ALL_VIRTUAL_TIMESTAMP_SERVICE_TNAME = "__all_virtual_timestamp_service"; +const char *const OB_REFERENTIAL_CONSTRAINTS_TNAME = "REFERENTIAL_CONSTRAINTS"; +const char *const OB_ALL_VIRTUAL_TABLE_MODIFICATIONS_TNAME = "__all_virtual_table_modifications"; +const char *const OB_ALL_VIRTUAL_BACKUP_CLEAN_INFO_TNAME = "__all_virtual_backup_clean_info"; +const char *const OB_ALL_VIRTUAL_RESTORE_PG_INFO_TNAME = "__all_virtual_restore_pg_info"; +const char *const OB_ALL_VIRTUAL_OBJECT_TYPE_TNAME = "__all_virtual_object_type"; +const char *const OB_ALL_VIRTUAL_TRANS_TABLE_STATUS_TNAME = "__all_virtual_trans_table_status"; +const char *const OB_ALL_VIRTUAL_PG_LOG_ARCHIVE_STAT_TNAME = "__all_virtual_pg_log_archive_stat"; +const char *const OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_TNAME = "__all_virtual_sql_plan_monitor"; +const char *const OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_TNAME = "__all_virtual_sql_monitor_statname"; +const char *const OB_ALL_VIRTUAL_OPEN_CURSOR_TNAME = "__all_virtual_open_cursor"; +const char *const OB_ALL_VIRTUAL_BACKUP_VALIDATION_TASK_TNAME = "__all_virtual_backup_validation_task"; +const char *const OB_ALL_VIRTUAL_PG_BACKUP_VALIDATION_TASK_TNAME = "__all_virtual_pg_backup_validation_task"; +const char *const OB_ALL_VIRTUAL_TIME_ZONE_TNAME = "__all_virtual_time_zone"; +const char *const OB_ALL_VIRTUAL_TIME_ZONE_NAME_TNAME = "__all_virtual_time_zone_name"; +const char *const OB_ALL_VIRTUAL_TIME_ZONE_TRANSITION_TNAME = "__all_virtual_time_zone_transition"; +const char *const OB_ALL_VIRTUAL_TIME_ZONE_TRANSITION_TYPE_TNAME = "__all_virtual_time_zone_transition_type"; +const char *const OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_TNAME = "__all_virtual_constraint_column"; +const char *const OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_HISTORY_TNAME = "__all_virtual_constraint_column_history"; +const char *const OB_ALL_VIRTUAL_FILES_TNAME = "__all_virtual_files"; +const char *const OB_FILES_TNAME = "FILES"; +const char *const OB_ALL_VIRTUAL_DEPENDENCY_TNAME = "__all_virtual_dependency"; +const char *const OB_TENANT_VIRTUAL_OBJECT_DEFINITION_TNAME = "__tenant_virtual_object_definition"; +const char *const OB_ALL_VIRTUAL_RESERVED_TABLE_MGR_TNAME = "__all_virtual_reserved_table_mgr"; +const char *const OB_ALL_VIRTUAL_BACKUPSET_HISTORY_MGR_TNAME = "__all_virtual_backupset_history_mgr"; +const char *const OB_ALL_VIRTUAL_BACKUP_BACKUPSET_TASK_TNAME = "__all_virtual_backup_backupset_task"; +const char *const OB_ALL_VIRTUAL_PG_BACKUP_BACKUPSET_TASK_TNAME = "__all_virtual_pg_backup_backupset_task"; +const char *const OB_ALL_VIRTUAL_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TNAME = "__all_virtual_backup_backup_log_archive_status"; +const char *const OB_ALL_VIRTUAL_GLOBAL_TRANSACTION_TNAME = "__all_virtual_global_transaction"; +const char *const OB_ALL_VIRTUAL_TABLE_AGENT_TNAME = "ALL_VIRTUAL_TABLE_AGENT"; +const char *const OB_ALL_VIRTUAL_COLUMN_AGENT_TNAME = "ALL_VIRTUAL_COLUMN_AGENT"; +const char *const OB_ALL_VIRTUAL_DATABASE_AGENT_TNAME = "ALL_VIRTUAL_DATABASE_AGENT"; +const char *const OB_ALL_VIRTUAL_SEQUENCE_V2_AGENT_TNAME = "ALL_VIRTUAL_SEQUENCE_V2_AGENT"; +const char *const OB_ALL_VIRTUAL_PART_AGENT_TNAME = "ALL_VIRTUAL_PART_AGENT"; +const char *const OB_ALL_VIRTUAL_SUB_PART_AGENT_TNAME = "ALL_VIRTUAL_SUB_PART_AGENT"; +const char *const OB_ALL_VIRTUAL_PACKAGE_AGENT_TNAME = "ALL_VIRTUAL_PACKAGE_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_META_TABLE_AGENT_TNAME = "ALL_VIRTUAL_TENANT_META_TABLE_AGENT"; +const char *const OB_ALL_VIRTUAL_SQL_AUDIT_ORA_TNAME = "ALL_VIRTUAL_SQL_AUDIT"; +const char *const OB_ALL_VIRTUAL_PLAN_STAT_ORA_TNAME = "ALL_VIRTUAL_PLAN_STAT"; +const char *const OB_ALL_VIRTUAL_SQL_PLAN_STATISTICS_AGENT_TNAME = "ALL_VIRTUAL_SQL_PLAN_STATISTICS_AGENT"; +const char *const OB_ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN_ORA_TNAME = "ALL_VIRTUAL_PLAN_CACHE_PLAN_EXPLAIN"; +const char *const OB_ALL_VIRTUAL_SEQUENCE_VALUE_AGENT_TNAME = "ALL_VIRTUAL_SEQUENCE_VALUE_AGENT"; +const char *const OB_ALL_VIRTUAL_SEQUENCE_OBJECT_AGENT_TNAME = "ALL_VIRTUAL_SEQUENCE_OBJECT_AGENT"; +const char *const OB_ALL_VIRTUAL_USER_AGENT_TNAME = "ALL_VIRTUAL_USER_AGENT"; +const char *const OB_ALL_VIRTUAL_SYNONYM_AGENT_TNAME = "ALL_VIRTUAL_SYNONYM_AGENT"; +const char *const OB_ALL_VIRTUAL_FOREIGN_KEY_AGENT_TNAME = "ALL_VIRTUAL_FOREIGN_KEY_AGENT"; +const char *const OB_ALL_VIRTUAL_COLUMN_STAT_AGENT_TNAME = "ALL_VIRTUAL_COLUMN_STAT_AGENT"; +const char *const OB_ALL_VIRTUAL_COLUMN_STATISTIC_AGENT_TNAME = "ALL_VIRTUAL_COLUMN_STATISTIC_AGENT"; +const char *const OB_ALL_VIRTUAL_PARTITION_TABLE_AGENT_TNAME = "ALL_VIRTUAL_PARTITION_TABLE_AGENT"; +const char *const OB_ALL_VIRTUAL_TABLE_STAT_AGENT_TNAME = "ALL_VIRTUAL_TABLE_STAT_AGENT"; +const char *const OB_ALL_VIRTUAL_RECYCLEBIN_AGENT_TNAME = "ALL_VIRTUAL_RECYCLEBIN_AGENT"; +const char *const OB_TENANT_VIRTUAL_OUTLINE_AGENT_TNAME = "TENANT_VIRTUAL_OUTLINE_AGENT"; +const char *const OB_ALL_VIRTUAL_ROUTINE_AGENT_TNAME = "ALL_VIRTUAL_ROUTINE_AGENT"; +const char *const OB_ALL_VIRTUAL_TABLEGROUP_AGENT_TNAME = "ALL_VIRTUAL_TABLEGROUP_AGENT"; +const char *const OB_ALL_VIRTUAL_PRIVILEGE_AGENT_TNAME = "ALL_VIRTUAL_PRIVILEGE_AGENT"; +const char *const OB_ALL_VIRTUAL_SYS_PARAMETER_STAT_AGENT_TNAME = "ALL_VIRTUAL_SYS_PARAMETER_STAT_AGENT"; +const char *const OB_TENANT_VIRTUAL_TABLE_INDEX_AGENT_TNAME = "TENANT_VIRTUAL_TABLE_INDEX_AGENT"; +const char *const OB_TENANT_VIRTUAL_CHARSET_AGENT_TNAME = "TENANT_VIRTUAL_CHARSET_AGENT"; +const char *const OB_TENANT_VIRTUAL_ALL_TABLE_AGENT_TNAME = "TENANT_VIRTUAL_ALL_TABLE_AGENT"; +const char *const OB_TENANT_VIRTUAL_COLLATION_AGENT_TNAME = "TENANT_VIRTUAL_COLLATION_AGENT"; +const char *const OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_AGENT_TNAME = "ALL_VIRTUAL_FOREIGN_KEY_COLUMN_AGENT"; +const char *const OB_ALL_VIRTUAL_SERVER_AGENT_TNAME = "ALL_VIRTUAL_SERVER_AGENT"; +const char *const OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_TNAME = "ALL_VIRTUAL_PLAN_CACHE_STAT"; +const char *const OB_ALL_VIRTUAL_PROCESSLIST_ORA_TNAME = "ALL_VIRTUAL_PROCESSLIST"; +const char *const OB_ALL_VIRTUAL_SESSION_WAIT_ORA_TNAME = "ALL_VIRTUAL_SESSION_WAIT"; +const char *const OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_TNAME = "ALL_VIRTUAL_SESSION_WAIT_HISTORY"; +const char *const OB_ALL_VIRTUAL_MEMORY_INFO_ORA_TNAME = "ALL_VIRTUAL_MEMORY_INFO"; +const char *const OB_ALL_VIRTUAL_TENANT_MEMSTORE_INFO_ORA_TNAME = "ALL_VIRTUAL_TENANT_MEMSTORE_INFO"; +const char *const OB_ALL_VIRTUAL_MEMSTORE_INFO_ORA_TNAME = "ALL_VIRTUAL_MEMSTORE_INFO"; +const char *const OB_ALL_VIRTUAL_SERVER_MEMORY_INFO_AGENT_TNAME = "ALL_VIRTUAL_SERVER_MEMORY_INFO_AGENT"; +const char *const OB_ALL_VIRTUAL_SESSTAT_ORA_TNAME = "ALL_VIRTUAL_SESSTAT"; +const char *const OB_ALL_VIRTUAL_SYSSTAT_ORA_TNAME = "ALL_VIRTUAL_SYSSTAT"; +const char *const OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_TNAME = "ALL_VIRTUAL_SYSTEM_EVENT"; +const char *const OB_ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_AGENT_TNAME = "ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_AGENT"; +const char *const OB_TENANT_VIRTUAL_SESSION_VARIABLE_ORA_TNAME = "TENANT_VIRTUAL_SESSION_VARIABLE"; +const char *const OB_TENANT_VIRTUAL_GLOBAL_VARIABLE_ORA_TNAME = "TENANT_VIRTUAL_GLOBAL_VARIABLE"; +const char *const OB_TENANT_VIRTUAL_SHOW_CREATE_TABLE_ORA_TNAME = "TENANT_VIRTUAL_SHOW_CREATE_TABLE"; +const char *const OB_TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE_ORA_TNAME = "TENANT_VIRTUAL_SHOW_CREATE_PROCEDURE"; +const char *const OB_TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP_ORA_TNAME = "TENANT_VIRTUAL_SHOW_CREATE_TABLEGROUP"; +const char *const OB_TENANT_VIRTUAL_PRIVILEGE_GRANT_ORA_TNAME = "TENANT_VIRTUAL_PRIVILEGE_GRANT"; +const char *const OB_TENANT_VIRTUAL_TABLE_COLUMN_ORA_TNAME = "TENANT_VIRTUAL_TABLE_COLUMN"; +const char *const OB_ALL_VIRTUAL_TRACE_LOG_ORA_TNAME = "ALL_VIRTUAL_TRACE_LOG"; +const char *const OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_AGENT_TNAME = "TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_AGENT"; +const char *const OB_ALL_VIRTUAL_CONSTRAINT_AGENT_TNAME = "ALL_VIRTUAL_CONSTRAINT_AGENT"; +const char *const OB_ALL_VIRTUAL_TYPE_AGENT_TNAME = "ALL_VIRTUAL_TYPE_AGENT"; +const char *const OB_ALL_VIRTUAL_TYPE_ATTR_AGENT_TNAME = "ALL_VIRTUAL_TYPE_ATTR_AGENT"; +const char *const OB_ALL_VIRTUAL_COLL_TYPE_AGENT_TNAME = "ALL_VIRTUAL_COLL_TYPE_AGENT"; +const char *const OB_ALL_VIRTUAL_ROUTINE_PARAM_AGENT_TNAME = "ALL_VIRTUAL_ROUTINE_PARAM_AGENT"; +const char *const OB_ALL_VIRTUAL_DATA_TYPE_ORA_TNAME = "ALL_VIRTUAL_DATA_TYPE"; +const char *const OB_ALL_VIRTUAL_TABLE_SYS_AGENT_TNAME = "ALL_VIRTUAL_TABLE_SYS_AGENT"; +const char *const OB_ALL_VIRTUAL_SSTABLE_CHECKSUM_AGENT_TNAME = "ALL_VIRTUAL_SSTABLE_CHECKSUM_AGENT"; +const char *const OB_ALL_VIRTUAL_PARTITION_INFO_AGENT_TNAME = "ALL_VIRTUAL_PARTITION_INFO_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_AGENT_TNAME = "ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_KEYSTORE_AGENT_TNAME = "ALL_VIRTUAL_TENANT_KEYSTORE_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_TABLESPACE_AGENT_TNAME = "ALL_VIRTUAL_TENANT_TABLESPACE_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_PROFILE_AGENT_TNAME = "ALL_VIRTUAL_TENANT_PROFILE_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT_TNAME = "ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT"; +const char *const OB_ALL_VIRTUAL_TABLE_PRIVILEGE_AGENT_TNAME = "ALL_VIRTUAL_TABLE_PRIVILEGE_AGENT"; +const char *const OB_ALL_VIRTUAL_SECURITY_AUDIT_AGENT_TNAME = "ALL_VIRTUAL_SECURITY_AUDIT_AGENT"; +const char *const OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_AGENT_TNAME = "ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_AGENT"; +const char *const OB_ALL_VIRTUAL_TRIGGER_AGENT_TNAME = "ALL_VIRTUAL_TRIGGER_AGENT"; +const char *const OB_ALL_VIRTUAL_PX_WORKER_STAT_ORA_TNAME = "ALL_VIRTUAL_PX_WORKER_STAT"; +const char *const OB_ALL_VIRTUAL_PS_STAT_ORA_TNAME = "ALL_VIRTUAL_PS_STAT"; +const char *const OB_ALL_VIRTUAL_PS_ITEM_INFO_ORA_TNAME = "ALL_VIRTUAL_PS_ITEM_INFO"; +const char *const OB_ALL_VIRTUAL_TENANT_PARAMETER_STAT_ORA_TNAME = "ALL_VIRTUAL_TENANT_PARAMETER_STAT"; +const char *const OB_ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT_TNAME = "ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT"; +const char *const OB_ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT_TNAME = "ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT"; +const char *const OB_ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT_TNAME = "ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT"; +const char *const OB_ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT_TNAME = "ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT"; +const char *const OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_AGENT_TNAME = "ALL_VIRTUAL_SECURITY_AUDIT_RECORD_AGENT"; +const char *const OB_ALL_VIRTUAL_SYSAUTH_AGENT_TNAME = "ALL_VIRTUAL_SYSAUTH_AGENT"; +const char *const OB_ALL_VIRTUAL_SYSAUTH_HISTORY_AGENT_TNAME = "ALL_VIRTUAL_SYSAUTH_HISTORY_AGENT"; +const char *const OB_ALL_VIRTUAL_OBJAUTH_AGENT_TNAME = "ALL_VIRTUAL_OBJAUTH_AGENT"; +const char *const OB_ALL_VIRTUAL_OBJAUTH_HISTORY_AGENT_TNAME = "ALL_VIRTUAL_OBJAUTH_HISTORY_AGENT"; +const char *const OB_ALL_VIRTUAL_ERROR_AGENT_TNAME = "ALL_VIRTUAL_ERROR_AGENT"; +const char *const OB_ALL_VIRTUAL_TABLE_MGR_AGENT_TNAME = "ALL_VIRTUAL_TABLE_MGR_AGENT"; +const char *const OB_ALL_VIRTUAL_DEF_SUB_PART_AGENT_TNAME = "ALL_VIRTUAL_DEF_SUB_PART_AGENT"; +const char *const OB_ALL_VIRTUAL_OBJECT_TYPE_AGENT_TNAME = "ALL_VIRTUAL_OBJECT_TYPE_AGENT"; +const char *const OB_ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT_TNAME = "ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT"; +const char *const OB_ALL_VIRTUAL_DBLINK_AGENT_TNAME = "ALL_VIRTUAL_DBLINK_AGENT"; +const char *const OB_ALL_VIRTUAL_DBLINK_HISTORY_AGENT_TNAME = "ALL_VIRTUAL_DBLINK_HISTORY_AGENT"; +const char *const OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_TNAME = "ALL_VIRTUAL_SQL_PLAN_MONITOR"; +const char *const OB_ALL_VIRTUAL_SQL_MONITOR_STATNAME_ORA_TNAME = "ALL_VIRTUAL_SQL_MONITOR_STATNAME"; +const char *const OB_ALL_VIRTUAL_LOCK_WAIT_STAT_ORA_TNAME = "ALL_VIRTUAL_LOCK_WAIT_STAT"; +const char *const OB_ALL_VIRTUAL_OPEN_CURSOR_ORA_TNAME = "ALL_VIRTUAL_OPEN_CURSOR"; +const char *const OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_AGENT_TNAME = "ALL_VIRTUAL_CONSTRAINT_COLUMN_AGENT"; +const char *const OB_ALL_VIRTUAL_DEPENDENCY_AGENT_TNAME = "ALL_VIRTUAL_DEPENDENCY_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_TIME_ZONE_AGENT_TNAME = "ALL_VIRTUAL_TENANT_TIME_ZONE_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_AGENT_TNAME = "ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_AGENT_TNAME = "ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_AGENT_TNAME = "ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_AGENT"; +const char *const OB_TENANT_VIRTUAL_OBJECT_DEFINITION_ORA_TNAME = "TENANT_VIRTUAL_OBJECT_DEFINITION"; +const char *const OB_ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT_TNAME = "ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT"; +const char *const OB_ALL_VIRTUAL_TYPE_SYS_AGENT_TNAME = "ALL_VIRTUAL_TYPE_SYS_AGENT"; +const char *const OB_ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT_TNAME = "ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT"; +const char *const OB_ALL_VIRTUAL_COLL_TYPE_SYS_AGENT_TNAME = "ALL_VIRTUAL_COLL_TYPE_SYS_AGENT"; +const char *const OB_ALL_VIRTUAL_PACKAGE_SYS_AGENT_TNAME = "ALL_VIRTUAL_PACKAGE_SYS_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT_TNAME = "ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT"; +const char *const OB_ALL_VIRTUAL_ROUTINE_SYS_AGENT_TNAME = "ALL_VIRTUAL_ROUTINE_SYS_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT_TNAME = "ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT"; +const char *const OB_ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT_TNAME = "ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT"; +const char *const OB_ALL_VIRTUAL_TABLE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TABLE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_COLUMN_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_COLUMN_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_DATABASE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_DATABASE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_SEQUENCE_V2_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_SEQUENCE_V2_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_PART_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_PART_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_SUB_PART_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_SUB_PART_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_PACKAGE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_PACKAGE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_SEQUENCE_VALUE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_SEQUENCE_OBJECT_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_USER_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_USER_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_SYNONYM_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_SYNONYM_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_FOREIGN_KEY_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_COLUMN_STAT_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_COLUMN_STAT_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_COLUMN_STATISTIC_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_COLUMN_STATISTIC_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TABLE_STAT_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TABLE_STAT_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_RECYCLEBIN_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_ROUTINE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_ROUTINE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TABLEGROUP_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TABLEGROUP_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_FOREIGN_KEY_COLUMN_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_CONSTRAINT_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_CONSTRAINT_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TYPE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TYPE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TYPE_ATTR_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_COLL_TYPE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_COLL_TYPE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_ROUTINE_PARAM_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_KEYSTORE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_KEYSTORE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_TABLESPACE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_PROFILE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TABLE_PRIVILEGE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TABLE_PRIVILEGE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_SECURITY_AUDIT_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_HISTORY_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_SECURITY_AUDIT_HISTORY_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_TRIGGER_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_SECURITY_AUDIT_RECORD_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_SECURITY_AUDIT_RECORD_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_SYSAUTH_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_SYSAUTH_HISTORY_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_SYSAUTH_HISTORY_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_OBJAUTH_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_OBJAUTH_HISTORY_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_OBJAUTH_HISTORY_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_DEF_SUB_PART_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_OBJECT_TYPE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_OBJECT_TYPE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_DBLINK_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_DBLINK_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_DBLINK_HISTORY_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_DBLINK_HISTORY_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_CONSTRAINT_COLUMN_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_CONSTRAINT_COLUMN_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_DEPENDENCY_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_DEPENDENCY_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_META_TABLE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_TIME_ZONE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_TIME_ZONE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_RES_MGR_PLAN_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_RES_MGR_PLAN_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_RES_MGR_DIRECTIVE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_RES_MGR_DIRECTIVE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_TRANS_LOCK_STAT_ORA_TNAME = "ALL_VIRTUAL_TRANS_LOCK_STAT"; +const char *const OB_ALL_VIRTUAL_RES_MGR_MAPPING_RULE_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_RES_MGR_MAPPING_RULE_REAL_AGENT"; +const char *const OB_ALL_VIRTUAL_RES_MGR_CONSUMER_GROUP_REAL_AGENT_ORA_TNAME = "ALL_VIRTUAL_RES_MGR_CONSUMER_GROUP_REAL_AGENT"; +const char *const OB_GV_PLAN_CACHE_STAT_TNAME = "gv$plan_cache_stat"; +const char *const OB_GV_PLAN_CACHE_PLAN_STAT_TNAME = "gv$plan_cache_plan_stat"; +const char *const OB_SCHEMATA_TNAME = "SCHEMATA"; +const char *const OB_CHARACTER_SETS_TNAME = "CHARACTER_SETS"; +const char *const OB_GLOBAL_VARIABLES_TNAME = "GLOBAL_VARIABLES"; +const char *const OB_STATISTICS_TNAME = "STATISTICS"; +const char *const OB_VIEWS_TNAME = "VIEWS"; +const char *const OB_TABLES_TNAME = "TABLES"; +const char *const OB_COLLATIONS_TNAME = "COLLATIONS"; +const char *const OB_COLLATION_CHARACTER_SET_APPLICABILITY_TNAME = "COLLATION_CHARACTER_SET_APPLICABILITY"; +const char *const OB_PROCESSLIST_TNAME = "PROCESSLIST"; +const char *const OB_KEY_COLUMN_USAGE_TNAME = "KEY_COLUMN_USAGE"; +const char *const OB_DBA_OUTLINES_TNAME = "DBA_OUTLINES"; +const char *const OB_ENGINES_TNAME = "ENGINES"; +const char *const OB_ROUTINES_TNAME = "ROUTINES"; +const char *const OB_GV_SESSION_EVENT_TNAME = "gv$session_event"; +const char *const OB_GV_SESSION_WAIT_TNAME = "gv$session_wait"; +const char *const OB_GV_SESSION_WAIT_HISTORY_TNAME = "gv$session_wait_history"; +const char *const OB_GV_SYSTEM_EVENT_TNAME = "gv$system_event"; +const char *const OB_GV_SESSTAT_TNAME = "gv$sesstat"; +const char *const OB_GV_SYSSTAT_TNAME = "gv$sysstat"; +const char *const OB_V_STATNAME_TNAME = "v$statname"; +const char *const OB_V_EVENT_NAME_TNAME = "v$event_name"; +const char *const OB_V_SESSION_EVENT_TNAME = "v$session_event"; +const char *const OB_V_SESSION_WAIT_TNAME = "v$session_wait"; +const char *const OB_V_SESSION_WAIT_HISTORY_TNAME = "v$session_wait_history"; +const char *const OB_V_SESSTAT_TNAME = "v$sesstat"; +const char *const OB_V_SYSSTAT_TNAME = "v$sysstat"; +const char *const OB_V_SYSTEM_EVENT_TNAME = "v$system_event"; +const char *const OB_GV_SQL_AUDIT_TNAME = "gv$sql_audit"; +const char *const OB_GV_LATCH_TNAME = "gv$latch"; +const char *const OB_GV_MEMORY_TNAME = "gv$memory"; +const char *const OB_V_MEMORY_TNAME = "v$memory"; +const char *const OB_GV_MEMSTORE_TNAME = "gv$memstore"; +const char *const OB_V_MEMSTORE_TNAME = "v$memstore"; +const char *const OB_GV_MEMSTORE_INFO_TNAME = "gv$memstore_info"; +const char *const OB_V_MEMSTORE_INFO_TNAME = "v$memstore_info"; +const char *const OB_V_PLAN_CACHE_STAT_TNAME = "v$plan_cache_stat"; +const char *const OB_V_PLAN_CACHE_PLAN_STAT_TNAME = "v$plan_cache_plan_stat"; +const char *const OB_GV_PLAN_CACHE_PLAN_EXPLAIN_TNAME = "gv$plan_cache_plan_explain"; +const char *const OB_V_PLAN_CACHE_PLAN_EXPLAIN_TNAME = "v$plan_cache_plan_explain"; +const char *const OB_V_SQL_AUDIT_TNAME = "v$sql_audit"; +const char *const OB_V_LATCH_TNAME = "v$latch"; +const char *const OB_GV_OBRPC_OUTGOING_TNAME = "gv$obrpc_outgoing"; +const char *const OB_V_OBRPC_OUTGOING_TNAME = "v$obrpc_outgoing"; +const char *const OB_GV_OBRPC_INCOMING_TNAME = "gv$obrpc_incoming"; +const char *const OB_V_OBRPC_INCOMING_TNAME = "v$obrpc_incoming"; +const char *const OB_GV_SQL_TNAME = "gv$sql"; +const char *const OB_V_SQL_TNAME = "v$sql"; +const char *const OB_GV_SQL_MONITOR_TNAME = "gv$sql_monitor"; +const char *const OB_V_SQL_MONITOR_TNAME = "v$sql_monitor"; +const char *const OB_GV_SQL_PLAN_MONITOR_TNAME = "gv$sql_plan_monitor"; +const char *const OB_V_SQL_PLAN_MONITOR_TNAME = "v$sql_plan_monitor"; +const char *const OB_USER_RECYCLEBIN_TNAME = "USER_RECYCLEBIN"; +const char *const OB_GV_OUTLINE_TNAME = "gv$outline"; +const char *const OB_GV_CONCURRENT_LIMIT_SQL_TNAME = "gv$concurrent_limit_sql"; +const char *const OB_GV_SQL_PLAN_STATISTICS_TNAME = "gv$sql_plan_statistics"; +const char *const OB_V_SQL_PLAN_STATISTICS_TNAME = "v$sql_plan_statistics"; +const char *const OB_GV_SERVER_MEMSTORE_TNAME = "gv$server_memstore"; +const char *const OB_GV_UNIT_LOAD_BALANCE_EVENT_HISTORY_TNAME = "gv$unit_load_balance_event_history"; +const char *const OB_GV_TENANT_TNAME = "gv$tenant"; +const char *const OB_GV_DATABASE_TNAME = "gv$database"; +const char *const OB_GV_TABLE_TNAME = "gv$table"; +const char *const OB_GV_UNIT_TNAME = "gv$unit"; +const char *const OB_V_UNIT_TNAME = "v$unit"; +const char *const OB_GV_PARTITION_TNAME = "gv$partition"; +const char *const OB_V_PARTITION_TNAME = "v$partition"; +const char *const OB_GV_LOCK_WAIT_STAT_TNAME = "gv$lock_wait_stat"; +const char *const OB_V_LOCK_WAIT_STAT_TNAME = "v$lock_wait_stat"; +const char *const OB_TIME_ZONE_TNAME = "time_zone"; +const char *const OB_TIME_ZONE_NAME_TNAME = "time_zone_name"; +const char *const OB_TIME_ZONE_TRANSITION_TNAME = "time_zone_transition"; +const char *const OB_TIME_ZONE_TRANSITION_TYPE_TNAME = "time_zone_transition_type"; +const char *const OB_GV_SESSION_LONGOPS_TNAME = "gv$session_longops"; +const char *const OB_V_SESSION_LONGOPS_TNAME = "v$session_longops"; +const char *const OB_GV_TENANT_MEMSTORE_ALLOCATOR_INFO_TNAME = "gv$tenant_memstore_allocator_info"; +const char *const OB_V_TENANT_MEMSTORE_ALLOCATOR_INFO_TNAME = "v$tenant_memstore_allocator_info"; +const char *const OB_GV_TENANT_SEQUENCE_OBJECT_TNAME = "gv$tenant_sequence_object"; +const char *const OB_COLUMNS_TNAME = "COLUMNS"; +const char *const OB_GV_MINOR_MERGE_INFO_TNAME = "gv$minor_merge_info"; +const char *const OB_GV_TENANT_PX_WORKER_STAT_TNAME = "gv$tenant_px_worker_stat"; +const char *const OB_V_TENANT_PX_WORKER_STAT_TNAME = "v$tenant_px_worker_stat"; +const char *const OB_GV_PARTITION_AUDIT_TNAME = "gv$partition_audit"; +const char *const OB_V_PARTITION_AUDIT_TNAME = "v$partition_audit"; +const char *const OB_V_OB_CLUSTER_TNAME = "v$ob_cluster"; +const char *const OB_GV_PS_STAT_TNAME = "gv$ps_stat"; +const char *const OB_V_PS_STAT_TNAME = "v$ps_stat"; +const char *const OB_GV_PS_ITEM_INFO_TNAME = "gv$ps_item_info"; +const char *const OB_V_PS_ITEM_INFO_TNAME = "v$ps_item_info"; +const char *const OB_GV_SQL_WORKAREA_TNAME = "gv$sql_workarea"; +const char *const OB_V_SQL_WORKAREA_TNAME = "v$sql_workarea"; +const char *const OB_GV_SQL_WORKAREA_ACTIVE_TNAME = "gv$sql_workarea_active"; +const char *const OB_V_SQL_WORKAREA_ACTIVE_TNAME = "v$sql_workarea_active"; +const char *const OB_GV_SQL_WORKAREA_HISTOGRAM_TNAME = "gv$sql_workarea_histogram"; +const char *const OB_V_SQL_WORKAREA_HISTOGRAM_TNAME = "v$sql_workarea_histogram"; +const char *const OB_GV_OB_SQL_WORKAREA_MEMORY_INFO_TNAME = "gv$ob_sql_workarea_memory_info"; +const char *const OB_V_OB_SQL_WORKAREA_MEMORY_INFO_TNAME = "v$ob_sql_workarea_memory_info"; +const char *const OB_GV_PLAN_CACHE_REFERENCE_INFO_TNAME = "gv$plan_cache_reference_info"; +const char *const OB_V_PLAN_CACHE_REFERENCE_INFO_TNAME = "v$plan_cache_reference_info"; +const char *const OB_V_OB_TIMESTAMP_SERVICE_TNAME = "v$ob_timestamp_service"; +const char *const OB_GV_SSTABLE_TNAME = "gv$sstable"; +const char *const OB_V_SSTABLE_TNAME = "v$sstable"; +const char *const OB_CDB_OB_BACKUP_ARCHIVELOG_SUMMARY_TNAME = "CDB_OB_BACKUP_ARCHIVELOG_SUMMARY"; +const char *const OB_CDB_OB_BACKUP_JOB_DETAILS_TNAME = "CDB_OB_BACKUP_JOB_DETAILS"; +const char *const OB_CDB_OB_BACKUP_SET_DETAILS_TNAME = "CDB_OB_BACKUP_SET_DETAILS"; +const char *const OB_CDB_OB_BACKUP_SET_EXPIRED_TNAME = "CDB_OB_BACKUP_SET_EXPIRED"; +const char *const OB_CDB_OB_BACKUP_PROGRESS_TNAME = "CDB_OB_BACKUP_PROGRESS"; +const char *const OB_CDB_OB_BACKUP_ARCHIVELOG_PROGRESS_TNAME = "CDB_OB_BACKUP_ARCHIVELOG_PROGRESS"; +const char *const OB_CDB_OB_BACKUP_CLEAN_HISTORY_TNAME = "CDB_OB_BACKUP_CLEAN_HISTORY"; +const char *const OB_CDB_OB_BACKUP_TASK_CLEAN_HISTORY_TNAME = "CDB_OB_BACKUP_TASK_CLEAN_HISTORY"; +const char *const OB_CDB_OB_RESTORE_PROGRESS_TNAME = "CDB_OB_RESTORE_PROGRESS"; +const char *const OB_CDB_OB_RESTORE_HISTORY_TNAME = "CDB_OB_RESTORE_HISTORY"; +const char *const OB_GV_SERVER_SCHEMA_INFO_TNAME = "gv$server_schema_info"; +const char *const OB_V_SERVER_SCHEMA_INFO_TNAME = "v$server_schema_info"; +const char *const OB_CDB_CKPT_HISTORY_TNAME = "CDB_CKPT_HISTORY"; +const char *const OB_GV_OB_TRANS_TABLE_STATUS_TNAME = "gv$ob_trans_table_status"; +const char *const OB_V_OB_TRANS_TABLE_STATUS_TNAME = "v$ob_trans_table_status"; +const char *const OB_V_SQL_MONITOR_STATNAME_TNAME = "v$sql_monitor_statname"; +const char *const OB_GV_MERGE_INFO_TNAME = "gv$merge_info"; +const char *const OB_V_MERGE_INFO_TNAME = "v$merge_info"; +const char *const OB_GV_LOCK_TNAME = "gv$lock"; +const char *const OB_V_LOCK_TNAME = "v$lock"; +const char *const OB_CDB_OB_BACKUP_VALIDATION_JOB_TNAME = "CDB_OB_BACKUP_VALIDATION_JOB"; +const char *const OB_CDB_OB_BACKUP_VALIDATION_JOB_HISTORY_TNAME = "CDB_OB_BACKUP_VALIDATION_JOB_HISTORY"; +const char *const OB_CDB_OB_TENANT_BACKUP_VALIDATION_TASK_TNAME = "CDB_OB_TENANT_BACKUP_VALIDATION_TASK"; +const char *const OB_CDB_OB_BACKUP_VALIDATION_TASK_HISTORY_TNAME = "CDB_OB_BACKUP_VALIDATION_TASK_HISTORY"; +const char *const OB_V_RESTORE_POINT_TNAME = "v$restore_point"; +const char *const OB_CDB_OB_BACKUP_SET_OBSOLETE_TNAME = "CDB_OB_BACKUP_SET_OBSOLETE"; +const char *const OB_CDB_OB_BACKUP_BACKUPSET_JOB_TNAME = "CDB_OB_BACKUP_BACKUPSET_JOB"; +const char *const OB_CDB_OB_BACKUP_BACKUPSET_JOB_HISTORY_TNAME = "CDB_OB_BACKUP_BACKUPSET_JOB_HISTORY"; +const char *const OB_CDB_OB_BACKUP_BACKUPSET_TASK_TNAME = "CDB_OB_BACKUP_BACKUPSET_TASK"; +const char *const OB_CDB_OB_BACKUP_BACKUPSET_TASK_HISTORY_TNAME = "CDB_OB_BACKUP_BACKUPSET_TASK_HISTORY"; +const char *const OB_CDB_OB_BACKUP_BACKUP_ARCHIVELOG_SUMMARY_TNAME = "CDB_OB_BACKUP_BACKUP_ARCHIVELOG_SUMMARY"; +const char *const OB_DBA_SYNONYMS_TNAME = "DBA_SYNONYMS"; +const char *const OB_DBA_OBJECTS_TNAME = "DBA_OBJECTS"; +const char *const OB_ALL_OBJECTS_TNAME = "ALL_OBJECTS"; +const char *const OB_USER_OBJECTS_TNAME = "USER_OBJECTS"; +const char *const OB_DBA_SEQUENCES_TNAME = "DBA_SEQUENCES"; +const char *const OB_ALL_SEQUENCES_TNAME = "ALL_SEQUENCES"; +const char *const OB_USER_SEQUENCES_TNAME = "USER_SEQUENCES"; +const char *const OB_DBA_USERS_TNAME = "DBA_USERS"; +const char *const OB_ALL_USERS_TNAME = "ALL_USERS"; +const char *const OB_ALL_SYNONYMS_TNAME = "ALL_SYNONYMS"; +const char *const OB_USER_SYNONYMS_TNAME = "USER_SYNONYMS"; +const char *const OB_DBA_IND_COLUMNS_TNAME = "DBA_IND_COLUMNS"; +const char *const OB_ALL_IND_COLUMNS_TNAME = "ALL_IND_COLUMNS"; +const char *const OB_USER_IND_COLUMNS_TNAME = "USER_IND_COLUMNS"; +const char *const OB_DBA_CONSTRAINTS_TNAME = "DBA_CONSTRAINTS"; +const char *const OB_ALL_CONSTRAINTS_TNAME = "ALL_CONSTRAINTS"; +const char *const OB_USER_CONSTRAINTS_TNAME = "USER_CONSTRAINTS"; +const char *const OB_ALL_TAB_COLS_V_TNAME = "ALL_TAB_COLS_V$"; +const char *const OB_DBA_TAB_COLS_V_TNAME = "DBA_TAB_COLS_V$"; +const char *const OB_USER_TAB_COLS_V_TNAME = "USER_TAB_COLS_V$"; +const char *const OB_ALL_TAB_COLS_TNAME = "ALL_TAB_COLS"; +const char *const OB_DBA_TAB_COLS_TNAME = "DBA_TAB_COLS"; +const char *const OB_USER_TAB_COLS_TNAME = "USER_TAB_COLS"; +const char *const OB_ALL_TAB_COLUMNS_TNAME = "ALL_TAB_COLUMNS"; +const char *const OB_DBA_TAB_COLUMNS_TNAME = "DBA_TAB_COLUMNS"; +const char *const OB_USER_TAB_COLUMNS_TNAME = "USER_TAB_COLUMNS"; +const char *const OB_ALL_TABLES_TNAME = "ALL_TABLES"; +const char *const OB_DBA_TABLES_TNAME = "DBA_TABLES"; +const char *const OB_USER_TABLES_TNAME = "USER_TABLES"; +const char *const OB_DBA_TAB_COMMENTS_TNAME = "DBA_TAB_COMMENTS"; +const char *const OB_ALL_TAB_COMMENTS_TNAME = "ALL_TAB_COMMENTS"; +const char *const OB_USER_TAB_COMMENTS_TNAME = "USER_TAB_COMMENTS"; +const char *const OB_DBA_COL_COMMENTS_TNAME = "DBA_COL_COMMENTS"; +const char *const OB_ALL_COL_COMMENTS_TNAME = "ALL_COL_COMMENTS"; +const char *const OB_USER_COL_COMMENTS_TNAME = "USER_COL_COMMENTS"; +const char *const OB_DBA_INDEXES_TNAME = "DBA_INDEXES"; +const char *const OB_ALL_INDEXES_TNAME = "ALL_INDEXES"; +const char *const OB_USER_INDEXES_TNAME = "USER_INDEXES"; +const char *const OB_DBA_CONS_COLUMNS_TNAME = "DBA_CONS_COLUMNS"; +const char *const OB_ALL_CONS_COLUMNS_TNAME = "ALL_CONS_COLUMNS"; +const char *const OB_USER_CONS_COLUMNS_TNAME = "USER_CONS_COLUMNS"; +const char *const OB_USER_SEGMENTS_TNAME = "USER_SEGMENTS"; +const char *const OB_DBA_SEGMENTS_TNAME = "DBA_SEGMENTS"; +const char *const OB_DBA_TYPES_TNAME = "DBA_TYPES"; +const char *const OB_ALL_TYPES_TNAME = "ALL_TYPES"; +const char *const OB_USER_TYPES_TNAME = "USER_TYPES"; +const char *const OB_DBA_TYPE_ATTRS_TNAME = "DBA_TYPE_ATTRS"; +const char *const OB_ALL_TYPE_ATTRS_TNAME = "ALL_TYPE_ATTRS"; +const char *const OB_USER_TYPE_ATTRS_TNAME = "USER_TYPE_ATTRS"; +const char *const OB_DBA_COLL_TYPES_TNAME = "DBA_COLL_TYPES"; +const char *const OB_ALL_COLL_TYPES_TNAME = "ALL_COLL_TYPES"; +const char *const OB_USER_COLL_TYPES_TNAME = "USER_COLL_TYPES"; +const char *const OB_DBA_PROCEDURES_TNAME = "DBA_PROCEDURES"; +const char *const OB_DBA_ARGUMENTS_TNAME = "DBA_ARGUMENTS"; +const char *const OB_DBA_SOURCE_TNAME = "DBA_SOURCE"; +const char *const OB_ALL_PROCEDURES_TNAME = "ALL_PROCEDURES"; +const char *const OB_ALL_ARGUMENTS_TNAME = "ALL_ARGUMENTS"; +const char *const OB_ALL_SOURCE_TNAME = "ALL_SOURCE"; +const char *const OB_USER_PROCEDURES_TNAME = "USER_PROCEDURES"; +const char *const OB_USER_ARGUMENTS_TNAME = "USER_ARGUMENTS"; +const char *const OB_USER_SOURCE_TNAME = "USER_SOURCE"; +const char *const OB_DBA_PART_KEY_COLUMNS_TNAME = "DBA_PART_KEY_COLUMNS"; +const char *const OB_ALL_PART_KEY_COLUMNS_TNAME = "ALL_PART_KEY_COLUMNS"; +const char *const OB_USER_PART_KEY_COLUMNS_TNAME = "USER_PART_KEY_COLUMNS"; +const char *const OB_DBA_SUBPART_KEY_COLUMNS_TNAME = "DBA_SUBPART_KEY_COLUMNS"; +const char *const OB_ALL_SUBPART_KEY_COLUMNS_TNAME = "ALL_SUBPART_KEY_COLUMNS"; +const char *const OB_USER_SUBPART_KEY_COLUMNS_TNAME = "USER_SUBPART_KEY_COLUMNS"; +const char *const OB_DBA_VIEWS_TNAME = "DBA_VIEWS"; +const char *const OB_ALL_VIEWS_TNAME = "ALL_VIEWS"; +const char *const OB_USER_VIEWS_TNAME = "USER_VIEWS"; +const char *const OB_ALL_TAB_PARTITIONS_ORA_TNAME = "ALL_TAB_PARTITIONS"; +const char *const OB_ALL_TAB_SUBPARTITIONS_ORA_TNAME = "ALL_TAB_SUBPARTITIONS"; +const char *const OB_ALL_PART_TABLES_ORA_TNAME = "ALL_PART_TABLES"; +const char *const OB_DBA_PART_TABLES_ORA_TNAME = "DBA_PART_TABLES"; +const char *const OB_USER_PART_TABLES_ORA_TNAME = "USER_PART_TABLES"; +const char *const OB_DBA_TAB_PARTITIONS_ORA_TNAME = "DBA_TAB_PARTITIONS"; +const char *const OB_USER_TAB_PARTITIONS_ORA_TNAME = "USER_TAB_PARTITIONS"; +const char *const OB_DBA_TAB_SUBPARTITIONS_ORA_TNAME = "DBA_TAB_SUBPARTITIONS"; +const char *const OB_USER_TAB_SUBPARTITIONS_ORA_TNAME = "USER_TAB_SUBPARTITIONS"; +const char *const OB_DBA_SUBPARTITION_TEMPLATES_ORA_TNAME = "DBA_SUBPARTITION_TEMPLATES"; +const char *const OB_ALL_SUBPARTITION_TEMPLATES_ORA_TNAME = "ALL_SUBPARTITION_TEMPLATES"; +const char *const OB_USER_SUBPARTITION_TEMPLATES_ORA_TNAME = "USER_SUBPARTITION_TEMPLATES"; +const char *const OB_DBA_PART_INDEXES_TNAME = "DBA_PART_INDEXES"; +const char *const OB_ALL_PART_INDEXES_TNAME = "ALL_PART_INDEXES"; +const char *const OB_USER_PART_INDEXES_TNAME = "USER_PART_INDEXES"; +const char *const OB_ALL_ALL_TABLES_ORA_TNAME = "ALL_ALL_TABLES"; +const char *const OB_DBA_ALL_TABLES_ORA_TNAME = "DBA_ALL_TABLES"; +const char *const OB_USER_ALL_TABLES_ORA_TNAME = "USER_ALL_TABLES"; +const char *const OB_DBA_PROFILES_ORA_TNAME = "DBA_PROFILES"; +const char *const OB_USER_PROFILES_ORA_TNAME = "USER_PROFILES"; +const char *const OB_ALL_PROFILES_ORA_TNAME = "ALL_PROFILES"; +const char *const OB_ALL_MVIEW_COMMENTS_ORA_TNAME = "ALL_MVIEW_COMMENTS"; +const char *const OB_USER_MVIEW_COMMENTS_ORA_TNAME = "USER_MVIEW_COMMENTS"; +const char *const OB_DBA_MVIEW_COMMENTS_ORA_TNAME = "DBA_MVIEW_COMMENTS"; +const char *const OB_ALL_SCHEDULER_PROGRAM_ARGS_ORA_TNAME = "ALL_SCHEDULER_PROGRAM_ARGS"; +const char *const OB_DBA_SCHEDULER_PROGRAM_ARGS_ORA_TNAME = "DBA_SCHEDULER_PROGRAM_ARGS"; +const char *const OB_USER_SCHEDULER_PROGRAM_ARGS_ORA_TNAME = "USER_SCHEDULER_PROGRAM_ARGS"; +const char *const OB_ALL_SCHEDULER_JOB_ARGS_ORA_TNAME = "ALL_SCHEDULER_JOB_ARGS"; +const char *const OB_DBA_SCHEDULER_JOB_ARGS_ORA_TNAME = "DBA_SCHEDULER_JOB_ARGS"; +const char *const OB_USER_SCHEDULER_JOB_ARGS_ORA_TNAME = "USER_SCHEDULER_JOB_ARGS"; +const char *const OB_ALL_ERRORS_ORA_TNAME = "ALL_ERRORS"; +const char *const OB_DBA_ERRORS_ORA_TNAME = "DBA_ERRORS"; +const char *const OB_USER_ERRORS_ORA_TNAME = "USER_ERRORS"; +const char *const OB_ALL_TYPE_METHODS_ORA_TNAME = "ALL_TYPE_METHODS"; +const char *const OB_DBA_TYPE_METHODS_ORA_TNAME = "DBA_TYPE_METHODS"; +const char *const OB_USER_TYPE_METHODS_ORA_TNAME = "USER_TYPE_METHODS"; +const char *const OB_ALL_METHOD_PARAMS_ORA_TNAME = "ALL_METHOD_PARAMS"; +const char *const OB_DBA_METHOD_PARAMS_ORA_TNAME = "DBA_METHOD_PARAMS"; +const char *const OB_USER_METHOD_PARAMS_ORA_TNAME = "USER_METHOD_PARAMS"; +const char *const OB_DBA_TABLESPACES_ORA_TNAME = "DBA_TABLESPACES"; +const char *const OB_USER_TABLESPACES_ORA_TNAME = "USER_TABLESPACES"; +const char *const OB_DBA_IND_EXPRESSIONS_TNAME = "DBA_IND_EXPRESSIONS"; +const char *const OB_USER_IND_EXPRESSIONS_TNAME = "USER_IND_EXPRESSIONS"; +const char *const OB_ALL_IND_EXPRESSIONS_TNAME = "ALL_IND_EXPRESSIONS"; +const char *const OB_ALL_IND_PARTITIONS_TNAME = "ALL_IND_PARTITIONS"; +const char *const OB_USER_IND_PARTITIONS_TNAME = "USER_IND_PARTITIONS"; +const char *const OB_DBA_IND_PARTITIONS_TNAME = "DBA_IND_PARTITIONS"; +const char *const OB_DBA_IND_SUBPARTITIONS_TNAME = "DBA_IND_SUBPARTITIONS"; +const char *const OB_ALL_IND_SUBPARTITIONS_TNAME = "ALL_IND_SUBPARTITIONS"; +const char *const OB_USER_IND_SUBPARTITIONS_TNAME = "USER_IND_SUBPARTITIONS"; +const char *const OB_DBA_ROLES_TNAME = "DBA_ROLES"; +const char *const OB_DBA_ROLE_PRIVS_TNAME = "DBA_ROLE_PRIVS"; +const char *const OB_USER_ROLE_PRIVS_TNAME = "USER_ROLE_PRIVS"; +const char *const OB_DBA_TAB_PRIVS_TNAME = "DBA_TAB_PRIVS"; +const char *const OB_ALL_TAB_PRIVS_TNAME = "ALL_TAB_PRIVS"; +const char *const OB_USER_TAB_PRIVS_TNAME = "USER_TAB_PRIVS"; +const char *const OB_DBA_SYS_PRIVS_TNAME = "DBA_SYS_PRIVS"; +const char *const OB_USER_SYS_PRIVS_TNAME = "USER_SYS_PRIVS"; +const char *const OB_DBA_COL_PRIVS_ORA_TNAME = "DBA_COL_PRIVS"; +const char *const OB_USER_COL_PRIVS_ORA_TNAME = "USER_COL_PRIVS"; +const char *const OB_ALL_COL_PRIVS_ORA_TNAME = "ALL_COL_PRIVS"; +const char *const OB_ROLE_TAB_PRIVS_ORA_TNAME = "ROLE_TAB_PRIVS"; +const char *const OB_ROLE_SYS_PRIVS_ORA_TNAME = "ROLE_SYS_PRIVS"; +const char *const OB_ROLE_ROLE_PRIVS_ORA_TNAME = "ROLE_ROLE_PRIVS"; +const char *const OB_DICTIONARY_ORA_TNAME = "DICTIONARY"; +const char *const OB_DICT_ORA_TNAME = "DICT"; +const char *const OB_ALL_TRIGGERS_TNAME = "ALL_TRIGGERS"; +const char *const OB_DBA_TRIGGERS_TNAME = "DBA_TRIGGERS"; +const char *const OB_USER_TRIGGERS_TNAME = "USER_TRIGGERS"; +const char *const OB_ALL_DEPENDENCIES_ORA_TNAME = "ALL_DEPENDENCIES"; +const char *const OB_DBA_DEPENDENCIES_ORA_TNAME = "DBA_DEPENDENCIES"; +const char *const OB_USER_DEPENDENCIES_ORA_TNAME = "USER_DEPENDENCIES"; +const char *const OB_DBA_RSRC_PLANS_TNAME = "DBA_RSRC_PLANS"; +const char *const OB_DBA_RSRC_PLAN_DIRECTIVES_TNAME = "DBA_RSRC_PLAN_DIRECTIVES"; +const char *const OB_DBA_RSRC_GROUP_MAPPINGS_TNAME = "DBA_RSRC_GROUP_MAPPINGS"; +const char *const OB_DBA_RECYCLEBIN_ORA_TNAME = "DBA_RECYCLEBIN"; +const char *const OB_USER_RECYCLEBIN_ORA_TNAME = "USER_RECYCLEBIN"; +const char *const OB_DBA_RSRC_CONSUMER_GROUPS_TNAME = "DBA_RSRC_CONSUMER_GROUPS"; +const char *const OB_GV_OUTLINE_ORA_TNAME = "GV$OUTLINE"; +const char *const OB_GV_SQL_AUDIT_ORA_TNAME = "GV$SQL_AUDIT"; +const char *const OB_V_SQL_AUDIT_ORA_TNAME = "V$SQL_AUDIT"; +const char *const OB_GV_INSTANCE_TNAME = "GV$INSTANCE"; +const char *const OB_V_INSTANCE_TNAME = "V$INSTANCE"; +const char *const OB_GV_PLAN_CACHE_PLAN_STAT_ORA_TNAME = "GV$PLAN_CACHE_PLAN_STAT"; +const char *const OB_V_PLAN_CACHE_PLAN_STAT_ORA_TNAME = "V$PLAN_CACHE_PLAN_STAT"; +const char *const OB_GV_PLAN_CACHE_PLAN_EXPLAIN_ORA_TNAME = "GV$PLAN_CACHE_PLAN_EXPLAIN"; +const char *const OB_V_PLAN_CACHE_PLAN_EXPLAIN_ORA_TNAME = "V$PLAN_CACHE_PLAN_EXPLAIN"; +const char *const OB_GV_SESSION_WAIT_ORA_TNAME = "GV$SESSION_WAIT"; +const char *const OB_V_SESSION_WAIT_ORA_TNAME = "V$SESSION_WAIT"; +const char *const OB_GV_SESSION_WAIT_HISTORY_ORA_TNAME = "GV$SESSION_WAIT_HISTORY"; +const char *const OB_V_SESSION_WAIT_HISTORY_ORA_TNAME = "V$SESSION_WAIT_HISTORY"; +const char *const OB_GV_MEMORY_ORA_TNAME = "GV$MEMORY"; +const char *const OB_V_MEMORY_ORA_TNAME = "V$MEMORY"; +const char *const OB_GV_MEMSTORE_ORA_TNAME = "GV$MEMSTORE"; +const char *const OB_V_MEMSTORE_ORA_TNAME = "V$MEMSTORE"; +const char *const OB_GV_MEMSTORE_INFO_ORA_TNAME = "GV$MEMSTORE_INFO"; +const char *const OB_V_MEMSTORE_INFO_ORA_TNAME = "V$MEMSTORE_INFO"; +const char *const OB_GV_SERVER_MEMSTORE_ORA_TNAME = "GV$SERVER_MEMSTORE"; +const char *const OB_GV_SESSTAT_ORA_TNAME = "GV$SESSTAT"; +const char *const OB_V_SESSTAT_ORA_TNAME = "V$SESSTAT"; +const char *const OB_GV_SYSSTAT_ORA_TNAME = "GV$SYSSTAT"; +const char *const OB_V_SYSSTAT_ORA_TNAME = "V$SYSSTAT"; +const char *const OB_GV_SYSTEM_EVENT_ORA_TNAME = "GV$SYSTEM_EVENT"; +const char *const OB_V_SYSTEM_EVENT_ORA_TNAME = "V$SYSTEM_EVENT"; +const char *const OB_GV_TENANT_MEMSTORE_ALLOCATOR_INFO_ORA_TNAME = "GV$TENANT_MEMSTORE_ALLOCATOR_INFO"; +const char *const OB_V_TENANT_MEMSTORE_ALLOCATOR_INFO_ORA_TNAME = "V$TENANT_MEMSTORE_ALLOCATOR_INFO"; +const char *const OB_GV_PLAN_CACHE_STAT_ORA_TNAME = "GV$PLAN_CACHE_STAT"; +const char *const OB_V_PLAN_CACHE_STAT_ORA_TNAME = "V$PLAN_CACHE_STAT"; +const char *const OB_GV_CONCURRENT_LIMIT_SQL_ORA_TNAME = "GV$CONCURRENT_LIMIT_SQL"; +const char *const OB_NLS_SESSION_PARAMETERS_ORA_TNAME = "NLS_SESSION_PARAMETERS"; +const char *const OB_NLS_INSTANCE_PARAMETERS_ORA_TNAME = "NLS_INSTANCE_PARAMETERS"; +const char *const OB_NLS_DATABASE_PARAMETERS_ORA_TNAME = "NLS_DATABASE_PARAMETERS"; +const char *const OB_V_NLS_PARAMETERS_ORA_TNAME = "V$NLS_PARAMETERS"; +const char *const OB_V_VERSION_ORA_TNAME = "V$VERSION"; +const char *const OB_GV_TENANT_PX_WORKER_STAT_ORA_TNAME = "GV$TENANT_PX_WORKER_STAT"; +const char *const OB_V_TENANT_PX_WORKER_STAT_ORA_TNAME = "V$TENANT_PX_WORKER_STAT"; +const char *const OB_GV_PS_STAT_ORA_TNAME = "GV$PS_STAT"; +const char *const OB_V_PS_STAT_ORA_TNAME = "V$PS_STAT"; +const char *const OB_GV_PS_ITEM_INFO_ORA_TNAME = "GV$PS_ITEM_INFO"; +const char *const OB_V_PS_ITEM_INFO_ORA_TNAME = "V$PS_ITEM_INFO"; +const char *const OB_GV_SQL_WORKAREA_ACTIVE_ORA_TNAME = "GV$SQL_WORKAREA_ACTIVE"; +const char *const OB_V_SQL_WORKAREA_ACTIVE_ORA_TNAME = "V$SQL_WORKAREA_ACTIVE"; +const char *const OB_GV_SQL_WORKAREA_HISTOGRAM_ORA_TNAME = "GV$SQL_WORKAREA_HISTOGRAM"; +const char *const OB_V_SQL_WORKAREA_HISTOGRAM_ORA_TNAME = "V$SQL_WORKAREA_HISTOGRAM"; +const char *const OB_GV_OB_SQL_WORKAREA_MEMORY_INFO_ORA_TNAME = "GV$OB_SQL_WORKAREA_MEMORY_INFO"; +const char *const OB_V_OB_SQL_WORKAREA_MEMORY_INFO_ORA_TNAME = "V$OB_SQL_WORKAREA_MEMORY_INFO"; +const char *const OB_GV_PLAN_CACHE_REFERENCE_INFO_ORA_TNAME = "GV$PLAN_CACHE_REFERENCE_INFO"; +const char *const OB_V_PLAN_CACHE_REFERENCE_INFO_ORA_TNAME = "V$PLAN_CACHE_REFERENCE_INFO"; +const char *const OB_GV_SQL_WORKAREA_ORA_TNAME = "GV$SQL_WORKAREA"; +const char *const OB_V_SQL_WORKAREA_ORA_TNAME = "V$SQL_WORKAREA"; +const char *const OB_GV_SSTABLE_ORA_TNAME = "GV$SSTABLE"; +const char *const OB_V_SSTABLE_ORA_TNAME = "V$SSTABLE"; +const char *const OB_GV_SERVER_SCHEMA_INFO_ORA_TNAME = "GV$SERVER_SCHEMA_INFO"; +const char *const OB_V_SERVER_SCHEMA_INFO_ORA_TNAME = "V$SERVER_SCHEMA_INFO"; +const char *const OB_GV_SQL_PLAN_MONITOR_ORA_TNAME = "GV$SQL_PLAN_MONITOR"; +const char *const OB_V_SQL_PLAN_MONITOR_ORA_TNAME = "V$SQL_PLAN_MONITOR"; +const char *const OB_V_SQL_MONITOR_STATNAME_ORA_TNAME = "V$SQL_MONITOR_STATNAME"; +const char *const OB_GV_LOCK_ORA_TNAME = "GV$LOCK"; +const char *const OB_V_LOCK_ORA_TNAME = "V$LOCK"; +const char *const OB_GV_OPEN_CURSOR_ORA_TNAME = "GV$OPEN_CURSOR"; +const char *const OB_V_OPEN_CURSOR_ORA_TNAME = "V$OPEN_CURSOR"; +const char *const OB_V_TIMEZONE_NAMES_ORA_TNAME = "V$TIMEZONE_NAMES"; +const char *const OB_GV_GLOBAL_TRANSACTION_ORA_TNAME = "GV$GLOBAL_TRANSACTION"; +const char *const OB_V_GLOBAL_TRANSACTION_ORA_TNAME = "V$GLOBAL_TRANSACTION"; +const char *const OB_V_RESTORE_POINT_ORA_TNAME = "V$RESTORE_POINT"; +const char *const OB_V_RSRC_PLAN_ORA_TNAME = "V$RSRC_PLAN"; +const char *const OB_TRIGGERS_TNAME = "TRIGGERS"; +const char *const OB_ALL_TABLE_V2_HISTORY_IDX_DATA_TABLE_ID_TNAME = "__idx_1099511628058_idx_data_table_id"; +const char *const OB_ALL_TABLE_HISTORY_IDX_DATA_TABLE_ID_TNAME = "__idx_1099511627890_idx_data_table_id"; +const char *const OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TNAME = "__idx_1099511638779_all_virtual_plan_cache_stat_i1"; +const char *const OB_ALL_VIRTUAL_SESSION_EVENT_ALL_VIRTUAL_SESSION_EVENT_I1_TNAME = "__idx_1099511638789_all_virtual_session_event_i1"; +const char *const OB_ALL_VIRTUAL_SESSION_WAIT_ALL_VIRTUAL_SESSION_WAIT_I1_TNAME = "__idx_1099511638790_all_virtual_session_wait_i1"; +const char *const OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TNAME = "__idx_1099511638791_all_virtual_session_wait_history_i1"; +const char *const OB_ALL_VIRTUAL_SYSTEM_EVENT_ALL_VIRTUAL_SYSTEM_EVENT_I1_TNAME = "__idx_1099511638793_all_virtual_system_event_i1"; +const char *const OB_ALL_VIRTUAL_SESSTAT_ALL_VIRTUAL_SESSTAT_I1_TNAME = "__idx_1099511638796_all_virtual_sesstat_i1"; +const char *const OB_ALL_VIRTUAL_SYSSTAT_ALL_VIRTUAL_SYSSTAT_I1_TNAME = "__idx_1099511638797_all_virtual_sysstat_i1"; +const char *const OB_ALL_VIRTUAL_SQL_AUDIT_ALL_VIRTUAL_SQL_AUDIT_I1_TNAME = "__idx_1099511638807_all_virtual_sql_audit_i1"; +const char *const OB_ALL_VIRTUAL_REPLICA_TASK_ALL_VIRTUAL_REPLICA_TASK_I1_TNAME = "__idx_1099511639791_all_virtual_replica_task_i1"; +const char *const OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TNAME = "__idx_1099511639961_all_virtual_sql_plan_monitor_i1"; +const char *const OB_ALL_VIRTUAL_SQL_AUDIT_ORA_ALL_VIRTUAL_SQL_AUDIT_I1_TNAME = "__idx_1099511642785_all_virtual_sql_audit_i1"; +const char *const OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ORA_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TNAME = "__idx_1099511642810_all_virtual_plan_cache_stat_i1"; +const char *const OB_ALL_VIRTUAL_SESSION_WAIT_ORA_ALL_VIRTUAL_SESSION_WAIT_I1_TNAME = "__idx_1099511642812_all_virtual_session_wait_i1"; +const char *const OB_ALL_VIRTUAL_SESSION_WAIT_HISTORY_ORA_ALL_VIRTUAL_SESSION_WAIT_HISTORY_I1_TNAME = "__idx_1099511642813_all_virtual_session_wait_history_i1"; +const char *const OB_ALL_VIRTUAL_SESSTAT_ORA_ALL_VIRTUAL_SESSTAT_I1_TNAME = "__idx_1099511642818_all_virtual_sesstat_i1"; +const char *const OB_ALL_VIRTUAL_SYSSTAT_ORA_ALL_VIRTUAL_SYSSTAT_I1_TNAME = "__idx_1099511642819_all_virtual_sysstat_i1"; +const char *const OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_ALL_VIRTUAL_SYSTEM_EVENT_I1_TNAME = "__idx_1099511642820_all_virtual_system_event_i1"; +const char *const OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TNAME = "__idx_1099511642876_all_virtual_sql_plan_monitor_i1"; // initial data for __all_privilege struct PrivilegeRow { - const char* privilege_; - const char* context_; - const char* comment_; + const char *privilege_; + const char *context_; + const char *comment_; }; -const char* const ALTER_TB_MSG = "To alter the table"; -const char* const CREATE_DB_TB_MSG = "To create new databases and tables"; -const char* const CREATE_VIEW_MSG = "To create new views"; -const char* const CREATE_USER_MSG = "To create new users"; -const char* const DELETE_ROWS_MSG = "To delete existing rows"; -const char* const DROP_DB_TB_VIEWS_MSG = "To drop databases, tables, and views"; -const char* const GRANT_OPTION_MSG = "To give to other users those privileges you possess"; -const char* const INDEX_MSG = "To create or drop indexes"; -const char* const INSERT_MSG = "To insert data into tables"; -const char* const PROCESS_MSG = "To view the plain text of currently executing queries"; -const char* const SELECT_MSG = "To retrieve rows from table"; -const char* const SHOW_DB_MSG = "To see all databases with SHOW DATABASES"; -const char* const SHOW_VIEW_MSG = "To see views with SHOW CREATE VIEW"; -const char* const SUPER_MSG = "To use KILL thread, SET GLOBAL, CHANGE MASTER, etc."; -const char* const UPDATE_MSG = "To update existing rows"; -const char* const USAGE_MSG = "No privileges - allow connect only"; -static const PrivilegeRow all_privileges[] = { - {"Alter", "Tables", ALTER_TB_MSG}, - {"Create", "Databases,Tables,Indexes", CREATE_DB_TB_MSG}, - {"Create view", "Tables", CREATE_VIEW_MSG}, - {"Create user", "Server Admin", CREATE_USER_MSG}, - {"Delete", "Tables", DELETE_ROWS_MSG}, - {"Drop", "Databases,Tables", DROP_DB_TB_VIEWS_MSG}, - {"Grant option", "Databases,Tables,Functions,Procedures", GRANT_OPTION_MSG}, - {"Index", "Tables", INDEX_MSG}, - {"Insert", "Tables", INSERT_MSG}, - {"Process", "Server Admin", PROCESS_MSG}, - {"Select", "Tables", SELECT_MSG}, - {"Show databases", "Server Admin", SHOW_DB_MSG}, - {"Show view", "Tables", SHOW_VIEW_MSG}, - {"Super", "Server Admin", SUPER_MSG}, - {"Update", "Tables", UPDATE_MSG}, - {"Usage", "Server Admin", USAGE_MSG}, - {NULL, NULL, NULL}, + const char* const ALTER_TB_MSG = "To alter the table"; + const char* const CREATE_DB_TB_MSG = "To create new databases and tables"; + const char* const CREATE_VIEW_MSG = "To create new views"; + const char* const CREATE_USER_MSG = "To create new users"; + const char* const DELETE_ROWS_MSG = "To delete existing rows"; + const char* const DROP_DB_TB_VIEWS_MSG = "To drop databases, tables, and views"; + const char* const GRANT_OPTION_MSG = "To give to other users those privileges you possess"; + const char* const INDEX_MSG = "To create or drop indexes"; + const char* const INSERT_MSG = "To insert data into tables"; + const char* const PROCESS_MSG = "To view the plain text of currently executing queries"; + const char* const SELECT_MSG = "To retrieve rows from table"; + const char* const SHOW_DB_MSG = "To see all databases with SHOW DATABASES"; + const char* const SHOW_VIEW_MSG = "To see views with SHOW CREATE VIEW"; + const char* const SUPER_MSG = "To use KILL thread, SET GLOBAL, CHANGE MASTER, etc."; + const char* const UPDATE_MSG = "To update existing rows"; + const char* const USAGE_MSG = "No privileges - allow connect only"; +static const PrivilegeRow all_privileges[] = +{ + {"Alter", "Tables", ALTER_TB_MSG}, + {"Create", "Databases,Tables,Indexes", CREATE_DB_TB_MSG}, + {"Create view", "Tables", CREATE_VIEW_MSG}, + {"Create user", "Server Admin", CREATE_USER_MSG}, + {"Delete", "Tables", DELETE_ROWS_MSG}, + {"Drop", "Databases,Tables", DROP_DB_TB_VIEWS_MSG}, + {"Grant option", "Databases,Tables,Functions,Procedures", GRANT_OPTION_MSG}, + {"Index", "Tables", INDEX_MSG}, + {"Insert", "Tables", INSERT_MSG}, + {"Process", "Server Admin", PROCESS_MSG}, + {"Select", "Tables", SELECT_MSG}, + {"Show databases","Server Admin", SHOW_DB_MSG}, + {"Show view","Tables", SHOW_VIEW_MSG}, + {"Super","Server Admin", SUPER_MSG}, + {"Update", "Tables", UPDATE_MSG}, + {"Usage","Server Admin",USAGE_MSG}, + {NULL, NULL, NULL}, }; -} // end namespace share -} // end namespace oceanbase +} // end namespace share +} // end namespace oceanbase #endif /* _OB_INNER_TABLE_SCHEMA_CONSTANTS_H_ */ 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 aee23efa5..7d5638a83 100644 --- a/src/share/inner_table/ob_inner_table_schema_def.py +++ b/src/share/inner_table/ob_inner_table_schema_def.py @@ -5644,6 +5644,7 @@ def_table_schema( ('replica_type', 'int', 'false', '0'), ('last_replay_log_id', 'int', 'false', '0'), ('schema_version', 'int', 'false', '0'), + ('last_replay_log_ts', 'int', 'false', '0'), ], partition_columns = ['svr_ip', 'svr_port'], ) diff --git a/src/share/inner_table/ob_inner_table_schema_misc.ipp b/src/share/inner_table/ob_inner_table_schema_misc.ipp index f0ca7d212..36afe5b89 100644 --- a/src/share/inner_table/ob_inner_table_schema_misc.ipp +++ b/src/share/inner_table/ob_inner_table_schema_misc.ipp @@ -10,6 +10,8 @@ * See the Mulan PubL v2 for more details. */ + + #ifdef AGENT_VIRTUAL_TABLE_LOCATION_SWITCH case OB_ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT_TID: @@ -96,1468 +98,1471 @@ case OB_TENANT_VIRTUAL_TABLE_INDEX_AGENT_TID: #endif + #ifdef AGENT_VIRTUAL_TABLE_CREATE_ITER -case OB_ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_ACQUIRED_SNAPSHOT_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_COLL_TYPE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_COLL_TYPE_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_COLL_TYPE_SYS_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_COLL_TYPE_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_COLUMN_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_COLUMN_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_COLUMN_STATISTIC_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_COLUMN_STATISTIC_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_COLUMN_STAT_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_COLUMN_STAT_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_CONSTRAINT_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_CONSTRAINT_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_DATABASE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_DATABASE_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_DBLINK_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_DBLINK_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_DBLINK_HISTORY_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_DBLINK_HISTORY_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_DEF_SUB_PART_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_DEF_SUB_PART_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_DEPENDENCY_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_DEPENDENCY_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_ERROR_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_ERROR_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_FOREIGN_KEY_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_FOREIGN_KEY_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_OBJAUTH_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_OBJAUTH_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_OBJAUTH_HISTORY_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_OBJAUTH_HISTORY_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_OBJECT_TYPE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_OBJECT_TYPE_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_PACKAGE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_PACKAGE_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_PACKAGE_SYS_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_PACKAGE_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_PARTITION_INFO_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_PARTITION_INFO_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_PARTITION_TABLE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_PARTITION_TABLE_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_PART_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_PART_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_PRIVILEGE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_PRIVILEGE_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_RECYCLEBIN_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_RECYCLEBIN_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_ROUTINE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_ROUTINE_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_ROUTINE_PARAM_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_ROUTINE_PARAM_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_ROUTINE_PARAM_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_ROUTINE_SYS_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_ROUTINE_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SECURITY_AUDIT_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SECURITY_AUDIT_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SEQUENCE_OBJECT_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SEQUENCE_OBJECT_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SEQUENCE_V2_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SEQUENCE_V2_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SEQUENCE_VALUE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SEQUENCE_VALUE_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SERVER_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_SERVER_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SERVER_MEMORY_INFO_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SERVER_MEMORY_INFO_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SERVER_SCHEMA_INFO_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SQL_PLAN_STATISTICS_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SQL_PLAN_STATISTICS_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SSTABLE_CHECKSUM_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_SSTABLE_CHECKSUM_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SUB_PART_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SUB_PART_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SYNONYM_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SYNONYM_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SYSAUTH_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SYSAUTH_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SYSAUTH_HISTORY_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SYSAUTH_HISTORY_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_SYS_PARAMETER_STAT_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_SYS_PARAMETER_STAT_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TABLEGROUP_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_TABLEGROUP_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TABLE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_TABLE_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TABLE_MGR_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_TABLE_MGR_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TABLE_PRIVILEGE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_TABLE_PRIVILEGE_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TABLE_STAT_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_TABLE_STAT_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TABLE_SYS_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_TABLE_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_TENANT_GLOBAL_TRANSACTION_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_KEYSTORE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_TENANT_KEYSTORE_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_META_TABLE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_TENANT_META_TABLE_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_PROFILE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_TENANT_PROFILE_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_TABLESPACE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_TENANT_TABLESPACE_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_TIME_ZONE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_TENANT_TIME_ZONE_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_TENANT_TIME_ZONE_NAME_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_TENANT_TIME_ZONE_TRANSITION_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_TENANT_TIME_ZONE_TRANSITION_TYPE_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_TENANT_TRIGGER_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TRIGGER_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_TRIGGER_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TYPE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_TYPE_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TYPE_ATTR_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_TYPE_ATTR_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_TYPE_ATTR_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_TYPE_SYS_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_TYPE_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_ALL_VIRTUAL_USER_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_ALL_VIRTUAL_USER_TID; - const bool sys_tenant_base_table = true; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_TENANT_VIRTUAL_ALL_TABLE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_TENANT_VIRTUAL_ALL_TABLE_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_TENANT_VIRTUAL_CHARSET_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_TENANT_VIRTUAL_CHARSET_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_TENANT_VIRTUAL_COLLATION_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_TENANT_VIRTUAL_COLLATION_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_TENANT_VIRTUAL_OUTLINE_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_TENANT_VIRTUAL_OUTLINE_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} - -case OB_TENANT_VIRTUAL_TABLE_INDEX_AGENT_TID: { - ObAgentVirtualTable* agent_iter = NULL; - const uint64_t base_tid = OB_TENANT_VIRTUAL_TABLE_INDEX_TID; - const bool sys_tenant_base_table = false; - const bool only_sys_data = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - agent_iter->~ObAgentVirtualTable(); - allocator.free(agent_iter); - agent_iter = NULL; - } else { - vt_iter = agent_iter; - } - break; -} + + case OB_ALL_VIRTUAL_ACQUIRED_SNAPSHOT_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_ACQUIRED_SNAPSHOT_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_COLL_TYPE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_COLL_TYPE_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_COLL_TYPE_SYS_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_COLL_TYPE_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_COLUMN_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_COLUMN_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_COLUMN_STATISTIC_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_COLUMN_STATISTIC_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_COLUMN_STAT_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_COLUMN_STAT_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_CONSTRAINT_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_CONSTRAINT_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_DATABASE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_DATABASE_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_DBLINK_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_DBLINK_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_DBLINK_HISTORY_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_DBLINK_HISTORY_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_DEF_SUB_PART_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_DEF_SUB_PART_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_DEPENDENCY_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_DEPENDENCY_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_ERROR_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_ERROR_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_FOREIGN_KEY_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_FOREIGN_KEY_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_OBJAUTH_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_OBJAUTH_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_OBJAUTH_HISTORY_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_OBJAUTH_HISTORY_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_OBJECT_TYPE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_OBJECT_TYPE_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_PACKAGE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_PACKAGE_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_PACKAGE_SYS_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_PACKAGE_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_PARTITION_INFO_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_PARTITION_INFO_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_PARTITION_TABLE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_PARTITION_TABLE_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_PART_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_PART_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_PRIVILEGE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_PRIVILEGE_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_RECYCLEBIN_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_RECYCLEBIN_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_ROUTINE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_ROUTINE_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_ROUTINE_PARAM_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_ROUTINE_PARAM_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_ROUTINE_PARAM_SYS_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_ROUTINE_PARAM_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_ROUTINE_SYS_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_ROUTINE_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SECURITY_AUDIT_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SECURITY_AUDIT_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SEQUENCE_OBJECT_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SEQUENCE_OBJECT_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SEQUENCE_V2_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SEQUENCE_V2_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SEQUENCE_VALUE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SEQUENCE_VALUE_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SERVER_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_SERVER_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SERVER_MEMORY_INFO_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SERVER_MEMORY_INFO_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SERVER_SCHEMA_INFO_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SERVER_SCHEMA_INFO_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SQL_PLAN_STATISTICS_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SQL_PLAN_STATISTICS_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SQL_WORKAREA_ACTIVE_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SQL_WORKAREA_HISTOGRAM_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SQL_WORKAREA_HISTORY_STAT_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SQL_WORKAREA_MEMORY_INFO_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SSTABLE_CHECKSUM_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_SSTABLE_CHECKSUM_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SUB_PART_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SUB_PART_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SYNONYM_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SYNONYM_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SYSAUTH_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SYSAUTH_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SYSAUTH_HISTORY_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SYSAUTH_HISTORY_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_SYS_PARAMETER_STAT_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_SYS_PARAMETER_STAT_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TABLEGROUP_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_TABLEGROUP_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TABLE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_TABLE_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TABLE_MGR_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_TABLE_MGR_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TABLE_PRIVILEGE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_TABLE_PRIVILEGE_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TABLE_STAT_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_TABLE_STAT_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TABLE_SYS_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_TABLE_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_GLOBAL_TRANSACTION_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_TENANT_GLOBAL_TRANSACTION_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_KEYSTORE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_TENANT_KEYSTORE_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_TENANT_MEMSTORE_ALLOCATOR_INFO_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_META_TABLE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_TENANT_META_TABLE_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_PROFILE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_TENANT_PROFILE_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_TABLESPACE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_TENANT_TABLESPACE_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_TIME_ZONE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_TENANT_TIME_ZONE_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_TIME_ZONE_NAME_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_TENANT_TIME_ZONE_NAME_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_TENANT_TIME_ZONE_TRANSITION_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_TIME_ZONE_TRANSITION_TYPE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_TENANT_TIME_ZONE_TRANSITION_TYPE_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_TRIGGER_SYS_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_TENANT_TRIGGER_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TRIGGER_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_TRIGGER_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TYPE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_TYPE_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TYPE_ATTR_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_TYPE_ATTR_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TYPE_ATTR_SYS_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_TYPE_ATTR_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_TYPE_SYS_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_TYPE_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_ALL_VIRTUAL_USER_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_ALL_VIRTUAL_USER_TID; + const bool sys_tenant_base_table = true; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_TENANT_VIRTUAL_ALL_TABLE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_TENANT_VIRTUAL_ALL_TABLE_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_TENANT_VIRTUAL_CHARSET_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_TENANT_VIRTUAL_CHARSET_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_TENANT_VIRTUAL_COLLATION_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_TENANT_VIRTUAL_COLLATION_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_TENANT_VIRTUAL_CONCURRENT_LIMIT_SQL_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_TENANT_VIRTUAL_OUTLINE_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_TENANT_VIRTUAL_OUTLINE_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } + + case OB_TENANT_VIRTUAL_TABLE_INDEX_AGENT_TID: { + ObAgentVirtualTable *agent_iter = NULL; + const uint64_t base_tid = OB_TENANT_VIRTUAL_TABLE_INDEX_TID; + const bool sys_tenant_base_table = false; + const bool only_sys_data = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObAgentVirtualTable, agent_iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(agent_iter->init(base_tid, sys_tenant_base_table, index_schema, params, only_sys_data))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + agent_iter->~ObAgentVirtualTable(); + allocator.free(agent_iter); + agent_iter = NULL; + } else { + vt_iter = agent_iter; + } + break; + } #endif + #ifdef ITERATE_VIRTUAL_TABLE_LOCATION_SWITCH case OB_ALL_VIRTUAL_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TID: @@ -1672,2122 +1677,2288 @@ case OB_ALL_VIRTUAL_USER_HISTORY_TID: #endif + #ifdef ITERATE_VIRTUAL_TABLE_CREATE_ITER -case OB_ALL_VIRTUAL_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init( - OB_ALL_TENANT_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_BACKUP_BACKUPSET_TASK_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL( - iter->init(OB_ALL_TENANT_BACKUP_BACKUPSET_TASK_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_BACKUP_CLEAN_INFO_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_BACKUP_CLEAN_INFO_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_BACKUP_INFO_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_BACKUP_INFO_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_BACKUP_LOG_ARCHIVE_STATUS_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init( - OB_ALL_TENANT_BACKUP_LOG_ARCHIVE_STATUS_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_BACKUP_TASK_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_BACKUP_TASK_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_BACKUP_VALIDATION_TASK_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL( - iter->init(OB_ALL_TENANT_BACKUP_VALIDATION_TASK_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_COLL_TYPE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_COLL_TYPE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("coll_type_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "coll_type_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("elem_type_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "elem_type_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("package_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "package_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_COLL_TYPE_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_COLL_TYPE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("coll_type_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "coll_type_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("elem_type_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "elem_type_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("package_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "package_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_COLUMN_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_COLUMN_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_COLUMN_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_COLUMN_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_COLUMN_STAT_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_COLUMN_STAT_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_COLUMN_STATISTIC_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_COLUMN_STATISTIC_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_CONSTRAINT_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_CONSTRAINT_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_CONSTRAINT_COLUMN_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init( - OB_ALL_TENANT_CONSTRAINT_COLUMN_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_CONSTRAINT_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_CONSTRAINT_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_DATABASE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_DATABASE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("default_tablegroup_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "default_tablegroup_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_DATABASE_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_DATABASE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("default_tablegroup_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "default_tablegroup_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_DATABASE_PRIVILEGE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_DATABASE_PRIVILEGE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("user_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "user_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_DATABASE_PRIVILEGE_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_DATABASE_PRIVILEGE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("user_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "user_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_DBLINK_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_DBLINK_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("dblink_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "dblink_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "owner_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_DBLINK_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_DBLINK_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("dblink_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "dblink_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "owner_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_DDL_OPERATION_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_DDL_OPERATION_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("user_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "user_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablegroup_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "tablegroup_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_DEF_SUB_PART_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_DEF_SUB_PART_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "tablespace_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_DEF_SUB_PART_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_DEF_SUB_PART_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "tablespace_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_DEPENDENCY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_DEPENDENCY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("dep_obj_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "dep_obj_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("ref_obj_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "ref_obj_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("dep_obj_owner_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "dep_obj_owner_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_ERROR_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_ERROR_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("obj_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "obj_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_FOREIGN_KEY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_FOREIGN_KEY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("foreign_key_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "foreign_key_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("child_table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "child_table_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("parent_table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "parent_table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_FOREIGN_KEY_COLUMN_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("foreign_key_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "foreign_key_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_FOREIGN_KEY_COLUMN_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("foreign_key_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "foreign_key_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_FOREIGN_KEY_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_FOREIGN_KEY_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("foreign_key_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "foreign_key_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("child_table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "child_table_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("parent_table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "parent_table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_FUNC_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_FUNC_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("udf_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "udf_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_FUNC_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_FUNC_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("udf_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "udf_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_GLOBAL_TRANSACTION_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_GLOBAL_TRANSACTION_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_HISTOGRAM_STAT_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_HISTOGRAM_STAT_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_META_TABLE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_META_TABLE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_OBJAUTH_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_OBJAUTH_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("obj_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "obj_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("grantor_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "grantor_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("grantee_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "grantee_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_OBJAUTH_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_OBJAUTH_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("obj_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "obj_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("grantor_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "grantor_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("grantee_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "grantee_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_OBJECT_TYPE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_OBJECT_TYPE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "owner_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("object_type_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "object_type_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_ORI_SCHEMA_VERSION_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_ORI_SCHEMA_VERSION_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_OUTLINE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_OUTLINE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("outline_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "outline_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_OUTLINE_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_OUTLINE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("outline_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "outline_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_PACKAGE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_PACKAGE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("package_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "package_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "owner_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_PACKAGE_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_PACKAGE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("package_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "package_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "owner_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_PART_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_PART_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "tablespace_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_PART_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_PART_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "tablespace_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_PART_INFO_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_PART_INFO_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_PART_INFO_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_PART_INFO_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_PG_BACKUP_BACKUPSET_TASK_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL( - iter->init(OB_ALL_TENANT_PG_BACKUP_BACKUPSET_TASK_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_PG_BACKUP_TASK_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_PG_BACKUP_TASK_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_PG_BACKUP_VALIDATION_TASK_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init( - OB_ALL_TENANT_PG_BACKUP_VALIDATION_TASK_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_RECYCLEBIN_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_RECYCLEBIN_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablegroup_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "tablegroup_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_RESTORE_PG_INFO_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_RESTORE_PG_INFO_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_ROUTINE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_ROUTINE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("routine_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "routine_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("package_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "package_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "owner_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_ROUTINE_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_ROUTINE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("routine_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "routine_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("package_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "package_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "owner_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_ROUTINE_PARAM_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_ROUTINE_PARAM_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("routine_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "routine_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("type_owner"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "type_owner"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_ROUTINE_PARAM_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_ROUTINE_PARAM_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("routine_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "routine_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("type_owner"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "type_owner"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SECURITY_AUDIT_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_SECURITY_AUDIT_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("audit_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "audit_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "owner_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL( - iter->init(OB_ALL_TENANT_SECURITY_AUDIT_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("audit_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "audit_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "owner_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL( - iter->init(OB_ALL_TENANT_SECURITY_AUDIT_RECORD_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("user_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "user_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("effective_user_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "effective_user_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("db_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "db_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("cur_db_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "cur_db_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("audit_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "audit_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SEQUENCE_OBJECT_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_SEQUENCE_OBJECT_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("sequence_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "sequence_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SEQUENCE_OBJECT_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_SEQUENCE_OBJECT_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("sequence_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "sequence_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SEQUENCE_V2_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_SEQUENCE_V2_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("sequence_key"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "sequence_key"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SEQUENCE_VALUE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_SEQUENCE_VALUE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("sequence_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "sequence_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SERVER_LOG_META_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_CLOG_HISTORY_INFO_V2_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SSTABLE_COLUMN_CHECKSUM_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL( - iter->init(OB_ALL_TENANT_SSTABLE_COLUMN_CHECKSUM_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("data_table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "data_table_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("index_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "index_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SUB_PART_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_SUB_PART_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "tablespace_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SUB_PART_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_SUB_PART_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "tablespace_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SYNONYM_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_SYNONYM_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("synonym_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "synonym_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("object_database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "object_database_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SYNONYM_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_SYNONYM_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("synonym_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "synonym_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("object_database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "object_database_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SYS_STAT_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_SYS_STAT_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("value"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "value"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SYS_VARIABLE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_SYS_VARIABLE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SYS_VARIABLE_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_SYS_VARIABLE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SYSAUTH_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_SYSAUTH_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("grantee_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "grantee_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_SYSAUTH_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_SYSAUTH_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("grantee_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "grantee_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TABLE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TABLE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("data_table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "data_table_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablegroup_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "tablegroup_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "tablespace_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TABLE_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TABLE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("data_table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "data_table_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablegroup_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "tablegroup_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "tablespace_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TABLE_PRIVILEGE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TABLE_PRIVILEGE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("user_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "user_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TABLE_PRIVILEGE_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TABLE_PRIVILEGE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("user_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "user_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TABLE_STAT_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TABLE_STAT_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TABLEGROUP_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TABLEGROUP_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablegroup_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "tablegroup_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TABLEGROUP_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TABLEGROUP_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablegroup_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "tablegroup_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TEMP_TABLE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TEMP_TABLE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_GC_PARTITION_INFO_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_GC_PARTITION_INFO_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "table_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_KEYSTORE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_KEYSTORE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("keystore_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "keystore_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("master_key_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "master_key_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_KEYSTORE_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_KEYSTORE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("keystore_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "keystore_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("master_key_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "master_key_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_PARTITION_META_TABLE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_PLAN_BASELINE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_PLAN_BASELINE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("plan_baseline_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "plan_baseline_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_PLAN_BASELINE_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL( - iter->init(OB_ALL_TENANT_PLAN_BASELINE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("plan_baseline_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "plan_baseline_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_PROFILE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_PROFILE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("profile_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "profile_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_PROFILE_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_PROFILE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("profile_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "profile_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_ROLE_GRANTEE_MAP_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("grantee_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "grantee_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("role_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "role_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL( - iter->init(OB_ALL_TENANT_ROLE_GRANTEE_MAP_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("grantee_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "grantee_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("role_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "role_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_TABLESPACE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_TABLESPACE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "tablespace_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("master_key_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "master_key_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_TABLESPACE_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_TABLESPACE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "tablespace_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("master_key_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "master_key_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TENANT_USER_FAILED_LOGIN_STAT_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL( - iter->init(OB_ALL_TENANT_USER_FAILED_LOGIN_STAT_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TIME_ZONE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_TIME_ZONE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TIME_ZONE_NAME_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_TIME_ZONE_NAME_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TIME_ZONE_TRANSITION_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_TIME_ZONE_TRANSITION_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TIME_ZONE_TRANSITION_TYPE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = true; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init( - OB_ALL_TENANT_TIME_ZONE_TRANSITION_TYPE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TRIGGER_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_TRIGGER_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("trigger_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "trigger_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "owner_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("base_object_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "base_object_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TRIGGER_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TENANT_TRIGGER_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("trigger_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "trigger_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "owner_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("base_object_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "base_object_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TYPE_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TYPE_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("type_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "type_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("supertypeid"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "supertypeid"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("package_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "package_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TYPE_ATTR_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TYPE_ATTR_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("type_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "type_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("type_attr_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "type_attr_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TYPE_ATTR_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TYPE_ATTR_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("type_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "type_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("type_attr_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "type_attr_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_TYPE_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_TYPE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("type_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "type_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "database_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("supertypeid"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "supertypeid"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("package_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "package_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_USER_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_USER_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("user_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "user_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("profile_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "profile_id"); - } else { - vt_iter = iter; - } - break; -} - -case OB_ALL_VIRTUAL_USER_HISTORY_TID: { - ObIterateVirtualTable* iter = NULL; - const bool record_real_tenant_id = false; - if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { - SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); - } else if (OB_FAIL(iter->init(OB_ALL_USER_HISTORY_TID, record_real_tenant_id, index_schema, params))) { - SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); - iter->~ObIterateVirtualTable(); - allocator.free(iter); - iter = NULL; - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("user_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "user_id"); - } else if (OB_FAIL(iter->set_column_name_with_tenant_id("profile_id"))) { - SERVER_LOG(WARN, "set column_name with tenant_id failed", K(ret), "column_name", "profile_id"); - } else { - vt_iter = iter; - } - break; -} + + case OB_ALL_VIRTUAL_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_BACKUP_BACKUP_LOG_ARCHIVE_STATUS_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_BACKUP_BACKUPSET_TASK_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_BACKUP_BACKUPSET_TASK_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_BACKUP_CLEAN_INFO_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_BACKUP_CLEAN_INFO_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_BACKUP_INFO_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_BACKUP_INFO_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_BACKUP_LOG_ARCHIVE_STATUS_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_BACKUP_LOG_ARCHIVE_STATUS_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_BACKUP_TASK_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_BACKUP_TASK_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_BACKUP_VALIDATION_TASK_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_BACKUP_VALIDATION_TASK_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_COLL_TYPE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_COLL_TYPE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("coll_type_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "coll_type_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("elem_type_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "elem_type_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("package_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "package_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_COLL_TYPE_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_COLL_TYPE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("coll_type_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "coll_type_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("elem_type_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "elem_type_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("package_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "package_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_COLUMN_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_COLUMN_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_COLUMN_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_COLUMN_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_COLUMN_STAT_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_COLUMN_STAT_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_COLUMN_STATISTIC_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_COLUMN_STATISTIC_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_CONSTRAINT_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_CONSTRAINT_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_CONSTRAINT_COLUMN_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_CONSTRAINT_COLUMN_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_CONSTRAINT_COLUMN_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_CONSTRAINT_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_CONSTRAINT_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_DATABASE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_DATABASE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("default_tablegroup_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "default_tablegroup_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_DATABASE_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_DATABASE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("default_tablegroup_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "default_tablegroup_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_DATABASE_PRIVILEGE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_DATABASE_PRIVILEGE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("user_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "user_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_DATABASE_PRIVILEGE_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_DATABASE_PRIVILEGE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("user_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "user_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_DBLINK_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_DBLINK_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("dblink_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "dblink_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "owner_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_DBLINK_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_DBLINK_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("dblink_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "dblink_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "owner_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_DDL_OPERATION_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_DDL_OPERATION_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("user_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "user_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablegroup_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "tablegroup_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_DEF_SUB_PART_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_DEF_SUB_PART_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "tablespace_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_DEF_SUB_PART_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_DEF_SUB_PART_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "tablespace_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_DEPENDENCY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_DEPENDENCY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("dep_obj_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "dep_obj_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("ref_obj_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "ref_obj_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("dep_obj_owner_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "dep_obj_owner_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_ERROR_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_ERROR_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("obj_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "obj_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_FOREIGN_KEY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_FOREIGN_KEY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("foreign_key_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "foreign_key_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("child_table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "child_table_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("parent_table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "parent_table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_FOREIGN_KEY_COLUMN_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("foreign_key_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "foreign_key_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_FOREIGN_KEY_COLUMN_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_FOREIGN_KEY_COLUMN_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("foreign_key_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "foreign_key_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_FOREIGN_KEY_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_FOREIGN_KEY_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("foreign_key_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "foreign_key_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("child_table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "child_table_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("parent_table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "parent_table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_FUNC_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_FUNC_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("udf_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "udf_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_FUNC_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_FUNC_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("udf_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "udf_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_GLOBAL_TRANSACTION_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_GLOBAL_TRANSACTION_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_HISTOGRAM_STAT_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_HISTOGRAM_STAT_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_META_TABLE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_META_TABLE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_OBJAUTH_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_OBJAUTH_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("obj_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "obj_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("grantor_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "grantor_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("grantee_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "grantee_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_OBJAUTH_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_OBJAUTH_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("obj_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "obj_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("grantor_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "grantor_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("grantee_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "grantee_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_OBJECT_TYPE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_OBJECT_TYPE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "owner_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("object_type_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "object_type_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_ORI_SCHEMA_VERSION_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_ORI_SCHEMA_VERSION_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_OUTLINE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_OUTLINE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("outline_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "outline_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_OUTLINE_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_OUTLINE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("outline_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "outline_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_PACKAGE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_PACKAGE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("package_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "package_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "owner_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_PACKAGE_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_PACKAGE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("package_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "package_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "owner_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_PART_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_PART_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "tablespace_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_PART_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_PART_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "tablespace_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_PART_INFO_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_PART_INFO_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_PART_INFO_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_PART_INFO_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_PG_BACKUP_BACKUPSET_TASK_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_PG_BACKUP_BACKUPSET_TASK_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_PG_BACKUP_TASK_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_PG_BACKUP_TASK_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_PG_BACKUP_VALIDATION_TASK_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_PG_BACKUP_VALIDATION_TASK_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_RECYCLEBIN_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_RECYCLEBIN_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablegroup_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "tablegroup_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_RESTORE_PG_INFO_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_RESTORE_PG_INFO_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_ROUTINE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_ROUTINE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("routine_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "routine_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("package_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "package_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "owner_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_ROUTINE_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_ROUTINE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("routine_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "routine_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("package_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "package_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "owner_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_ROUTINE_PARAM_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_ROUTINE_PARAM_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("routine_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "routine_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("type_owner"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "type_owner"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_ROUTINE_PARAM_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_ROUTINE_PARAM_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("routine_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "routine_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("type_owner"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "type_owner"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SECURITY_AUDIT_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_SECURITY_AUDIT_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("audit_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "audit_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "owner_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SECURITY_AUDIT_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_SECURITY_AUDIT_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("audit_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "audit_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "owner_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SECURITY_AUDIT_RECORD_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_SECURITY_AUDIT_RECORD_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("user_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "user_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("effective_user_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "effective_user_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("db_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "db_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("cur_db_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "cur_db_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("audit_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "audit_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SEQUENCE_OBJECT_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_SEQUENCE_OBJECT_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("sequence_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "sequence_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SEQUENCE_OBJECT_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_SEQUENCE_OBJECT_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("sequence_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "sequence_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SEQUENCE_V2_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_SEQUENCE_V2_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("sequence_key"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "sequence_key"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SEQUENCE_VALUE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_SEQUENCE_VALUE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("sequence_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "sequence_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SERVER_LOG_META_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_CLOG_HISTORY_INFO_V2_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SSTABLE_COLUMN_CHECKSUM_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_SSTABLE_COLUMN_CHECKSUM_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("data_table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "data_table_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("index_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "index_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SUB_PART_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_SUB_PART_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "tablespace_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SUB_PART_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_SUB_PART_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "tablespace_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SYNONYM_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_SYNONYM_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("synonym_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "synonym_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("object_database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "object_database_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SYNONYM_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_SYNONYM_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("synonym_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "synonym_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("object_database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "object_database_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SYS_STAT_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_SYS_STAT_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("value"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "value"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SYS_VARIABLE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_SYS_VARIABLE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SYS_VARIABLE_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_SYS_VARIABLE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SYSAUTH_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_SYSAUTH_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("grantee_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "grantee_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_SYSAUTH_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_SYSAUTH_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("grantee_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "grantee_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TABLE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TABLE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("data_table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "data_table_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablegroup_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "tablegroup_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "tablespace_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TABLE_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TABLE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("data_table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "data_table_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablegroup_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "tablegroup_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "tablespace_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TABLE_PRIVILEGE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TABLE_PRIVILEGE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("user_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "user_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TABLE_PRIVILEGE_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TABLE_PRIVILEGE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("user_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "user_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TABLE_STAT_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TABLE_STAT_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TABLEGROUP_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TABLEGROUP_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablegroup_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "tablegroup_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TABLEGROUP_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TABLEGROUP_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablegroup_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "tablegroup_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TEMP_TABLE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TEMP_TABLE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_GC_PARTITION_INFO_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_GC_PARTITION_INFO_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("table_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "table_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_KEYSTORE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_KEYSTORE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("keystore_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "keystore_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("master_key_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "master_key_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_KEYSTORE_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_KEYSTORE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("keystore_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "keystore_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("master_key_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "master_key_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_PARTITION_META_TABLE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_PARTITION_META_TABLE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_PLAN_BASELINE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_PLAN_BASELINE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("plan_baseline_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "plan_baseline_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_PLAN_BASELINE_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_PLAN_BASELINE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("plan_baseline_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "plan_baseline_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_PROFILE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_PROFILE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("profile_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "profile_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_PROFILE_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_PROFILE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("profile_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "profile_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_ROLE_GRANTEE_MAP_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("grantee_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "grantee_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("role_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "role_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_ROLE_GRANTEE_MAP_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_ROLE_GRANTEE_MAP_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("grantee_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "grantee_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("role_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "role_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_TABLESPACE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_TABLESPACE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "tablespace_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("master_key_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "master_key_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_TABLESPACE_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_TABLESPACE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("tablespace_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "tablespace_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("master_key_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "master_key_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TENANT_USER_FAILED_LOGIN_STAT_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_USER_FAILED_LOGIN_STAT_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TIME_ZONE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_TIME_ZONE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TIME_ZONE_NAME_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_TIME_ZONE_NAME_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TIME_ZONE_TRANSITION_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_TIME_ZONE_TRANSITION_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TIME_ZONE_TRANSITION_TYPE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = true; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_TIME_ZONE_TRANSITION_TYPE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TRIGGER_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_TRIGGER_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("trigger_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "trigger_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "owner_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("base_object_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "base_object_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TRIGGER_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TENANT_TRIGGER_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("trigger_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "trigger_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("owner_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "owner_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("base_object_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "base_object_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TYPE_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TYPE_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("type_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "type_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("supertypeid"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "supertypeid"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("package_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "package_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TYPE_ATTR_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TYPE_ATTR_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("type_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "type_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("type_attr_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "type_attr_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TYPE_ATTR_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TYPE_ATTR_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("type_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "type_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("type_attr_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "type_attr_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_TYPE_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_TYPE_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("type_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "type_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("database_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "database_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("supertypeid"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "supertypeid"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("package_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "package_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_USER_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_USER_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("user_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "user_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("profile_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "profile_id"); + } else { + vt_iter = iter; + } + break; + } + + case OB_ALL_VIRTUAL_USER_HISTORY_TID: { + ObIterateVirtualTable *iter = NULL; + const bool record_real_tenant_id = false; + if (OB_FAIL(NEW_VIRTUAL_TABLE(ObIterateVirtualTable, iter))) { + SERVER_LOG(WARN, "create virtual table iterator failed", K(ret)); + } else if (OB_FAIL(iter->init(OB_ALL_USER_HISTORY_TID, record_real_tenant_id, index_schema, params))) { + SERVER_LOG(WARN, "virtual table iter init failed", K(ret)); + iter->~ObIterateVirtualTable(); + allocator.free(iter); + iter = NULL; + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("user_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "user_id"); + } else if (OB_FAIL(iter->set_column_name_with_tenant_id("profile_id"))) { + SERVER_LOG(WARN, "set column_name with tenant_id failed", + K(ret), "column_name", "profile_id"); + } else { + vt_iter = iter; + } + break; + } #endif + #ifdef MIGRATE_TABLE_BEFORE_2200_SWITCH case OB_ALL_CLOG_HISTORY_INFO_V2_TID: @@ -3861,6 +4032,7 @@ case OB_ALL_USER_HISTORY_TID: #endif + #ifdef CLUSTER_PRIVATE_TABLE_SWITCH case OB_ALL_CLOG_HISTORY_INFO_V2_TID: @@ -3895,6 +4067,7 @@ case OB_TENANT_PARAMETER_TID: #endif + #ifdef BACKUP_PRIVATE_TABLE_SWITCH case OB_ALL_CLOG_HISTORY_INFO_V2_TID: @@ -3920,6 +4093,7 @@ case OB_ALL_WEAK_READ_SERVICE_TID: #endif + #ifdef RS_RESTART_RELATED case OB_ALL_ACQUIRED_SNAPSHOT_TID: diff --git a/src/storage/blocksstable/ob_micro_block_index_transformer.cpp b/src/storage/blocksstable/ob_micro_block_index_transformer.cpp index 00eeddb33..52dc3359b 100644 --- a/src/storage/blocksstable/ob_micro_block_index_transformer.cpp +++ b/src/storage/blocksstable/ob_micro_block_index_transformer.cpp @@ -54,18 +54,17 @@ int ObMicroBlockIndexTransformer::NodeArray::ensure_space(common::ObIAllocator& } ObMicroBlockIndexTransformer::ObMicroBlockIndexTransformer() - : block_count_(0), - rowkey_column_count_(0), - data_offset_(0), - node_vector_(), - node_vector_count_(0), - node_array_(), - micro_index_mgr_(NULL), - allocator_(ObModIds::OB_SSTABLE_GET_SCAN) + : block_count_(0), + rowkey_column_count_(0), + data_offset_(0), + allocator_(ObModIds::OB_SSTABLE_GET_SCAN), + vec_allocator_(ObModIds::OB_MICRO_INDEX_TRANSFORMER), + node_vector_(), + node_vector_count_(0), + node_array_(), + vec_inited_(false) { - for (int64_t i = 0; i < common::OB_MAX_ROWKEY_COLUMN_NUMBER; ++i) { - node_vector_[i].set_label(ObModIds::OB_MICRO_INDEX_TRANSFORMER); - } + MEMSET(node_vector_, 0, OB_MAX_ROWKEY_COLUMN_NUMBER); } int ObMicroBlockIndexTransformer::transform( @@ -93,9 +92,11 @@ int ObMicroBlockIndexTransformer::transform(const char* index_buf, const ObFullM if (OB_UNLIKELY(NULL == index_buf || !full_meta.is_valid())) { ret = OB_INVALID_ARGUMENT; STORAGE_LOG(WARN, "Invalid argument, ", K(ret), KP(index_buf), K(full_meta)); + } else if (!vec_inited_ && OB_FAIL(init_node_vector())) { + STORAGE_LOG(WARN, "Failed to init node vector", K(ret)); } else { - reset(); - const ObMacroBlockMetaV2& meta = *full_meta.meta_; + reuse(); + const ObMacroBlockMetaV2 &meta = *full_meta.meta_; block_count_ = meta.micro_block_count_; rowkey_column_count_ = meta.rowkey_column_number_; node_vector_count_ = rowkey_column_count_; @@ -112,20 +113,69 @@ int ObMicroBlockIndexTransformer::transform(const char* index_buf, const ObFullM return ret; } +void ObMicroBlockIndexTransformer::reuse() +{ + index_reader_.reset(); + block_count_ = 0; + rowkey_column_count_ = 0; + data_offset_ = 0; + if (vec_inited_) { + for (int i = 0; i < node_vector_count_; i++) { + if (OB_NOT_NULL(node_vector_[i])) { + node_vector_[i]->reset(); + } + } + } + node_vector_count_ = 0; + node_array_.reset(); + allocator_.reuse(); +} + void ObMicroBlockIndexTransformer::reset() { index_reader_.reset(); block_count_ = 0; rowkey_column_count_ = 0; data_offset_ = 0; - for (int i = 0; i < node_vector_count_; i++) { - node_vector_[i].reset(); - } node_vector_count_ = 0; + for (int i = 0; i < OB_MAX_ROWKEY_COLUMN_NUMBER; i++) { + if (OB_NOT_NULL(node_vector_[i])) { + node_vector_[i]->~ObVector(); + node_vector_[i] = nullptr; + } + } + vec_inited_ = false; node_array_.reset(); allocator_.reset(); - // column_map_ - // micro_index_mgr_ + vec_allocator_.reset(); +} + +int ObMicroBlockIndexTransformer::init_node_vector() +{ + int ret = OB_SUCCESS; + void *buf = nullptr; + + if (OB_UNLIKELY(vec_inited_)) { + ret = OB_INIT_TWICE; + STORAGE_LOG(WARN, "ObMicroBlockIndexTransformer init node vector twice", K(ret), K_(vec_inited)); + } else { + for (int64_t i = 0; OB_SUCC(ret) && i < OB_MAX_ROWKEY_COLUMN_NUMBER; i++) { + if (OB_NOT_NULL(node_vector_[i])) { + ret = OB_ERR_UNEXPECTED; + STORAGE_LOG(WARN, "Unexpected valid node vector", K(ret), K(i), KPC(node_vector_[i])); + } else if (OB_ISNULL(buf = vec_allocator_.alloc(sizeof(ObVector)))) { + ret = OB_ALLOCATE_MEMORY_FAILED; + STORAGE_LOG(WARN, "Failed to alloc memory for node vector", K(ret)); + } else { + node_vector_[i] = new (buf) ObVector (&vec_allocator_, ObModIds::OB_MICRO_INDEX_TRANSFORMER); + } + } + if (OB_SUCC(ret)) { + vec_inited_ = true; + } + } + + return ret; } int ObMicroBlockIndexTransformer::block_index_to_node_vector() @@ -206,7 +256,12 @@ int ObMicroBlockIndexTransformer::node_vector_to_node_array() int32_t node_index = 2; for (int64_t i = 0; i < rowkey_column_count_; ++i) { - node_num += node_vector_[i].size(); + if (OB_ISNULL(node_vector_[i])) { + ret = OB_ERR_UNEXPECTED; + STORAGE_LOG(WARN, "Unexpected null node vector", K(ret), K(i), KP(node_vector_[i])); + } else { + node_num += node_vector_[i]->size(); + } } if (OB_FAIL(node_array_.ensure_space(allocator_, node_num))) { STORAGE_LOG(WARN, "node array fail to ensure space.", K(ret), K(node_num)); @@ -215,7 +270,7 @@ int ObMicroBlockIndexTransformer::node_vector_to_node_array() node_array_[0].obj_.reset(); node_array_[0].first_child_index_ = 2; node_array_[0].first_micro_index_ = 0; - node_array_[0].child_num_ = node_vector_[0].size(); + node_array_[0].child_num_ = node_vector_[0]->size(); node_array_.cur_count_++; node_array_[1].obj_.reset(); node_array_[1].first_child_index_ = 0; @@ -223,12 +278,13 @@ int ObMicroBlockIndexTransformer::node_vector_to_node_array() node_array_[1].child_num_ = 0; node_array_.cur_count_++; for (int32_t i = 0; i < rowkey_column_count_; ++i) { - cur_node_num = node_vector_[i].size(); + cur_node_num = node_vector_[i]->size(); for (int32_t j = 0; j < cur_node_num; ++j) { - tmp_node = node_vector_[i].at(j); + tmp_node = node_vector_[i]->at(j); node_array_[node_index + j].obj_ = tmp_node.obj_; if (0 != tmp_node.child_num_) { - node_array_[node_index + j].first_child_index_ = node_index + cur_node_num + tmp_node.first_child_index_; + node_array_[node_index + j].first_child_index_ + = node_index + cur_node_num + tmp_node.first_child_index_; } else { node_array_[node_index + j].first_child_index_ = 0; } @@ -252,17 +308,27 @@ inline int ObMicroBlockIndexTransformer::add_node_to_vector(MediumNode& cur_node if (!cur_node.is_valid() || index < 0 || index >= rowkey_column_count_) { ret = OB_INVALID_ARGUMENT; STORAGE_LOG(WARN, "invalid argument, ", K(ret), K(cur_node), K(index), K_(rowkey_column_count)); - } else if (OB_FAIL(node_vector_[index].push_back(cur_node))) { - STORAGE_LOG(WARN, "node vector fail to push back cur node.", K(ret), K(index), K(cur_node)); + } else if (OB_ISNULL(node_vector_[index])) { + ret = OB_ERR_UNEXPECTED; + STORAGE_LOG(WARN, "Unexpected null node vector", K(ret), K(index), KP(node_vector_[index])); + } else if (OB_FAIL(node_vector_[index]->push_back(cur_node))) { + STORAGE_LOG(WARN, "node vector fail to push back cur node.", + K(ret), K(index), K(cur_node)); } else if (OB_FAIL(add_extra_space_size(cur_node.obj_))) { STORAGE_LOG(WARN, "transformer fail to add extra space size.", K(ret), "obj", cur_node.obj_); } else if (index > 0) { - parent_index = node_vector_[index - 1].size() - 1; - parent_node = &node_vector_[index - 1].at(parent_index); - if (0 == parent_node->child_num_) { - parent_node->first_child_index_ = node_vector_[index].size() - 1; + if (OB_ISNULL(node_vector_[index - 1])) { + ret = OB_ERR_UNEXPECTED; + STORAGE_LOG(WARN, "Unexpected null node vector", K(ret), K(index-1), KP(node_vector_[index-1])); + } else { + + parent_index = node_vector_[index - 1]->size() - 1; + parent_node = &node_vector_[index - 1]->at(parent_index); + if (0 == parent_node->child_num_) { + parent_node->first_child_index_ = node_vector_[index]->size() - 1; + } + parent_node->child_num_ ++; } - parent_node->child_num_++; } return ret; } @@ -305,32 +371,23 @@ int ObMicroBlockIndexTransformer::create_block_index_mgr( const ObFullMacroBlockMeta& meta, char* buffer, const int64_t size, const ObMicroBlockIndexMgr*& idx_mgr) { int ret = OB_SUCCESS; - + ObMicroBlockIndexMgr *index_mgr = nullptr; idx_mgr = nullptr; - if (OB_ISNULL(micro_index_mgr_ = new (buffer) ObMicroBlockIndexMgr())) { + if (OB_ISNULL(index_mgr = new (buffer) ObMicroBlockIndexMgr())) { ret = OB_ERR_UNEXPECTED; STORAGE_LOG(WARN, "transformer fail to new block index mgr, ", K(ret)); - } else if (OB_FAIL( - micro_index_mgr_->init(meta, node_array_.get_node_array_size(), node_array_.get_extra_space_size()))) { - STORAGE_LOG(WARN, - "micro index mgr fail to init.", - K(ret), - K(block_count_), - "node_array_size", - node_array_.get_node_array_size(), - "extra_space_size", - node_array_.get_extra_space_size(), - "mark_deletion_flag size", - index_reader_.get_mark_deletion_flags_size(), - "delta size", - index_reader_.get_delta_size(), - K(rowkey_column_count_), - K(data_offset_), - K(meta)); + } else if (OB_FAIL(index_mgr->init( + meta, node_array_.get_node_array_size(), node_array_.get_extra_space_size()))) { + STORAGE_LOG(WARN, "micro index mgr fail to init.", + K(ret), K(block_count_), "node_array_size", node_array_.get_node_array_size(), + "extra_space_size", node_array_.get_extra_space_size(), + "mark_deletion_flag size", index_reader_.get_mark_deletion_flags_size(), + "delta size", index_reader_.get_delta_size(), + K(rowkey_column_count_), K(data_offset_), K(meta)); } else if (OB_FAIL(fill_block_index_mgr(buffer, size))) { STORAGE_LOG(WARN, "transformer fail to fill block index mgr.", K(ret)); } else { - idx_mgr = micro_index_mgr_; + idx_mgr = index_mgr; } return ret; } diff --git a/src/storage/blocksstable/ob_micro_block_index_transformer.h b/src/storage/blocksstable/ob_micro_block_index_transformer.h index a138cd221..bf9782728 100644 --- a/src/storage/blocksstable/ob_micro_block_index_transformer.h +++ b/src/storage/blocksstable/ob_micro_block_index_transformer.h @@ -66,6 +66,8 @@ private: private: void reset(); + void reuse(); + int init_node_vector(); int block_index_to_node_vector(); int node_vector_to_node_array(); int add_node_to_vector(MediumNode& cur_node, int index); @@ -112,14 +114,13 @@ private: int64_t block_count_; // count of micro blocks int64_t rowkey_column_count_; int64_t data_offset_; + common::ObArenaAllocator allocator_; + common::ObArenaAllocator vec_allocator_; - common::ObVector node_vector_[common::OB_MAX_ROWKEY_COLUMN_NUMBER]; + common::ObVector *node_vector_[common::OB_MAX_ROWKEY_COLUMN_NUMBER]; int64_t node_vector_count_; NodeArray node_array_; - - ObMicroBlockIndexMgr* micro_index_mgr_; - common::ObArenaAllocator allocator_; - + bool vec_inited_; private: DISALLOW_COPY_AND_ASSIGN(ObMicroBlockIndexTransformer); }; diff --git a/src/storage/compaction/ob_partition_merge_util.cpp b/src/storage/compaction/ob_partition_merge_util.cpp index 5db7b87de..96a900580 100644 --- a/src/storage/compaction/ob_partition_merge_util.cpp +++ b/src/storage/compaction/ob_partition_merge_util.cpp @@ -1662,15 +1662,16 @@ int ObPartitionMergeUtil::merge_partition(memtable::ObIMemtableCtxFactory* memct if (0 == minimum_iters.count()) { ret = OB_ITER_END; } else if (1 == minimum_iters.count() && NULL == minimum_iters.at(0)->get_curr_row()) { - ObMacroRowIterator* iter = minimum_iters.at(0); - const storage::ObMacroBlockDesc& block_desc = iter->get_curr_macro_block(); - if (!iter->macro_block_opened() && - ((rewrite_block_cnt < need_rewrite_block_cnt && ctx.need_rewrite_macro_block(block_desc)) || - (iter->need_rewrite_current_macro_block()))) { + ObMacroRowIterator *iter = minimum_iters.at(0); + const storage::ObMacroBlockDesc &block_desc = iter->get_curr_macro_block(); + if (!iter->macro_block_opened() + && ((rewrite_block_cnt < need_rewrite_block_cnt + && ctx.need_rewrite_macro_block(block_desc)) + || (iter->need_rewrite_current_macro_block()))) { if (!ctx.param_.is_major_merge()) { ret = OB_ERR_UNEXPECTED; LOG_ERROR("only major merge can call rewrite_macro_block", K(ret), K(ctx), KPC(iter)); - } else if (OB_FAIL(rewrite_macro_block(minimum_iters, ctx.merge_level_, partition_fuser, processor))) { + } else if (OB_FAIL(rewrite_macro_block(minimum_iters, partition_fuser, processor))) { LOG_WARN("rewrite_macro_block failed", K(ret), K(ctx)); } else { ++rewrite_block_cnt; @@ -2237,8 +2238,10 @@ int ObPartitionMergeUtil::get_macro_block_count_to_rewrite(const storage::ObSSTa return ret; } -int ObPartitionMergeUtil::rewrite_macro_block(ObIPartitionMergeFuser::MERGE_ITER_ARRAY& minimum_iters, - const storage::ObMergeLevel& merge_level, ObIPartitionMergeFuser* partition_fuser, ObIStoreRowProcessor& processor) +int ObPartitionMergeUtil::rewrite_macro_block( + ObIPartitionMergeFuser::MERGE_ITER_ARRAY &minimum_iters, + ObIPartitionMergeFuser *partition_fuser, + ObIStoreRowProcessor &processor) { int ret = OB_SUCCESS; ObMacroRowIterator* iter = static_cast(minimum_iters.at(0)); @@ -2253,7 +2256,8 @@ int ObPartitionMergeUtil::rewrite_macro_block(ObIPartitionMergeFuser::MERGE_ITER } else { while (OB_SUCC(ret) && iter->macro_block_opened()) { // open the micro block if needed - if (MICRO_BLOCK_MERGE_LEVEL == merge_level && !iter->micro_block_opened()) { + if (MICRO_BLOCK_MERGE_LEVEL == iter->get_merge_level() + && !iter->micro_block_opened()) { if (OB_FAIL(iter->open_curr_micro_block())) { LOG_WARN("open_curr_micro_block failed", K(ret)); } diff --git a/src/storage/compaction/ob_partition_merge_util.h b/src/storage/compaction/ob_partition_merge_util.h index a44d0f99d..075aa6f69 100644 --- a/src/storage/compaction/ob_partition_merge_util.h +++ b/src/storage/compaction/ob_partition_merge_util.h @@ -504,9 +504,10 @@ private: static bool need_open_right(int64_t cmp_ret); static int purge_minimum_iters(common::ObIArray& minimum_iters, ObMacroRowIterator* base_iter); - static int rewrite_macro_block(ObIPartitionMergeFuser::MERGE_ITER_ARRAY& minimum_iters, - const storage::ObMergeLevel& merge_level, ObIPartitionMergeFuser* partition_fuser, - ObIStoreRowProcessor& processor); + static int rewrite_macro_block( + ObIPartitionMergeFuser::MERGE_ITER_ARRAY &minimum_iters, + ObIPartitionMergeFuser *partition_fuser, + ObIStoreRowProcessor &processor); static int fuse_row(const storage::ObSSTableMergeCtx& ctx, const common::ObIArray& macro_row_iters, ObRowFuseInfo& row_fuse_info, diff --git a/src/storage/ob_partition_merge_task.cpp b/src/storage/ob_partition_merge_task.cpp index 779690103..3f2eeac30 100644 --- a/src/storage/ob_partition_merge_task.cpp +++ b/src/storage/ob_partition_merge_task.cpp @@ -594,6 +594,7 @@ ObSSTableMergeCtx::ObSSTableMergeCtx() merge_log_ts_(INT_MAX), trans_table_end_log_ts_(0), trans_table_timestamp_(0), + pg_last_replay_log_ts_(0), read_base_version_(0) {} @@ -1037,8 +1038,11 @@ int ObSSTableMergePrepareTask::process() storage = static_cast(ctx->partition_guard_.get_pg_partition()->get_storage()))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("The partition storage must not NULL", K(ret), K(ctx)); - } else if (ctx->param_.is_multi_version_minor_merge() && - OB_FAIL(pg->get_pg_storage().get_trans_table_end_log_ts_and_timestamp( + } else if (ctx->param_.is_mini_merge() + && OB_FAIL(pg->get_pg_storage().get_last_replay_log_ts(ctx->pg_last_replay_log_ts_))) { + LOG_WARN("failed to get pg last replay log ts", K(ret), K(ctx->param_)); + } else if (ctx->param_.is_mini_merge() + && OB_FAIL(pg->get_pg_storage().get_trans_table_end_log_ts_and_timestamp( ctx->trans_table_end_log_ts_, ctx->trans_table_timestamp_))) { LOG_WARN("failed to get trans_table end_log_ts and timestamp", K(ret), K(ctx->param_)); } else if (OB_FAIL(storage->build_merge_ctx(*ctx))) { diff --git a/src/storage/ob_partition_merge_task.h b/src/storage/ob_partition_merge_task.h index ca789efd2..0b523ec0a 100644 --- a/src/storage/ob_partition_merge_task.h +++ b/src/storage/ob_partition_merge_task.h @@ -155,6 +155,7 @@ struct ObSSTableScheduleMergeParam { }; class ObMergeParameter; +//TODO such a massive context! struct ObSSTableMergeCtx { ObSSTableMergeCtx(); virtual ~ObSSTableMergeCtx(); @@ -250,18 +251,28 @@ struct ObSSTableMergeCtx { int64_t merge_log_ts_; int64_t trans_table_end_log_ts_; int64_t trans_table_timestamp_; - int64_t read_base_version_; // use for major merge - - TO_STRING_KV(K_(param), K_(sstable_version_range), K_(create_snapshot_version), K_(base_schema_version), - K_(schema_version), K_(dump_memtable_timestamp), KP_(table_schema), K_(is_full_merge), K_(stat_sampling_ratio), - K_(merge_level), K_(progressive_merge_num), K_(progressive_merge_start_version), K_(parallel_merge_ctx), - K_(checksum_method), K_(result_code), KP_(data_table_schema), KP_(mv_dep_table_schema), K_(index_stats), - "tables_handle count", tables_handle_.get_count(), K_(index_stats), K_(is_in_progressive_new_checksum), - K_(store_column_checksum_in_micro), K_(progressive_merge_round), K_(progressive_merge_step), - K_(use_new_progressive), K_(tables_handle), K_(base_table_handle), K_(create_sstable_for_large_snapshot), - K_(logical_data_version), K_(log_ts_range), K_(merge_log_ts), K_(trans_table_end_log_ts), - K_(trans_table_timestamp), K_(read_base_version)); + // we would push up last_replay_log_ts if the correspoding memtable has been merged, + // but this memtable may not be released due to the warming-up table_store + // if a new index is created, the schedule will also trigger a mini merge for it with the old frozen memtable + // now we get a table store with old end_log_ts within the pg which has a larger last_replay_log_ts + // so we need use last_replay_log_ts to prevent such uselsess mini merge happenning + int64_t pg_last_replay_log_ts_; + int64_t read_base_version_; // use for major merge + TO_STRING_KV(K_(param), K_(sstable_version_range), K_(create_snapshot_version), + K_(base_schema_version), K_(schema_version), K_(dump_memtable_timestamp), + KP_(table_schema), K_(is_full_merge), K_(stat_sampling_ratio), K_(merge_level), + K_(progressive_merge_num), K_(progressive_merge_start_version), + K_(parallel_merge_ctx), K_(checksum_method), K_(result_code), + KP_(data_table_schema), KP_(mv_dep_table_schema), + K_(index_stats), + "tables_handle count", tables_handle_.get_count(), K_(index_stats), + K_(is_in_progressive_new_checksum), K_(store_column_checksum_in_micro), + K_(progressive_merge_round), + K_(progressive_merge_step), K_(use_new_progressive), + K_(tables_handle), K_(base_table_handle), K_(create_sstable_for_large_snapshot), + K_(logical_data_version), K_(log_ts_range), K_(merge_log_ts), K_(trans_table_end_log_ts), + K_(trans_table_timestamp), K_(pg_last_replay_log_ts), K_(read_base_version)); private: DISALLOW_COPY_AND_ASSIGN(ObSSTableMergeCtx); }; diff --git a/src/storage/ob_partition_migrator.cpp b/src/storage/ob_partition_migrator.cpp index 60d91dfbe..444c23a1a 100644 --- a/src/storage/ob_partition_migrator.cpp +++ b/src/storage/ob_partition_migrator.cpp @@ -12503,7 +12503,7 @@ int ObMigrateUtil::wait_trans_table_merge_finish(ObMigrateCtx& ctx) do { if (OB_FAIL(ObDagScheduler::get_instance().check_dag_exist(&fake_dag, exist))) { LOG_WARN("failed to check dag exist", K(ret), K(fake_dag)); - } else if (!exist) { + } else if (exist) { if (ObTimeUtility::current_time() - start_ts > WAIT_TIMEOUT) { ret = OB_WAIT_TRANS_TABLE_MERGE_TIMEOUT; LOG_WARN("wait trans table merge finish timeout", K(ret), K(fake_dag)); diff --git a/src/storage/ob_partition_storage.cpp b/src/storage/ob_partition_storage.cpp index 0cca68999..29672d236 100644 --- a/src/storage/ob_partition_storage.cpp +++ b/src/storage/ob_partition_storage.cpp @@ -3967,6 +3967,8 @@ int ObPartitionStorage::build_merge_ctx(storage::ObSSTableMergeCtx& ctx) if (OB_FAIL(ret)) { } else if (OB_FAIL(get_schemas_to_merge(ctx))) { LOG_WARN("Fail to get schemas to merge, ", K(ret), K_(pkey), K(ctx)); + } else if (OB_FAIL(check_useless_index_mini_merge(ctx))) { + STORAGE_LOG(WARN, "Failed to check useless index mini merge", K(ret), K_(pkey), K(ctx)); } else { if (OB_SUCC(ret)) { if (ctx.param_.is_major_merge()) { @@ -3988,6 +3990,53 @@ int ObPartitionStorage::build_merge_ctx(storage::ObSSTableMergeCtx& ctx) return ret; } +int ObPartitionStorage::check_useless_index_mini_merge(const storage::ObSSTableMergeCtx &ctx) +{ + int ret = OB_SUCCESS; + + if (OB_ISNULL(ctx.table_schema_)) { + ret = OB_ERR_UNEXPECTED; + STORAGE_LOG(WARN, "Unexpected null table schema", K(ret), K(ctx)); + } else if (!ctx.param_.is_mini_merge()) { + } else if (ctx.log_ts_range_.end_log_ts_ < ctx.pg_last_replay_log_ts_) { + ObSEArray active_table_ids; + const uint64_t index_id = ctx.param_.index_id_; + ObMemtable *memtable = nullptr; + ObITable *table = nullptr; + for (int64_t i = 0; OB_SUCC(ret) && i < ctx.tables_handle_.get_count(); i++) { + if (OB_ISNULL(table = ctx.tables_handle_.get_table(i))) { + ret = OB_ERR_SYS; + STORAGE_LOG(ERROR, "Unexpected null table", K(ret), K(i), K(ctx.tables_handle_)); + } else if (!table->is_memtable()) { + ret = OB_ERR_UNEXPECTED; + STORAGE_LOG(ERROR, "Unexpected situation, new create table/index should not has sstable", + K(ret), K(ctx)); + } else if (FALSE_IT(memtable = reinterpret_cast(table))) { + } else if (OB_FAIL(memtable->get_active_table_ids(active_table_ids))) { + STORAGE_LOG(WARN, "Failed to get active table ids of memtable", K(ret), KPC(memtable)); + } else { + for (int64_t j = 0; OB_SUCC(ret) && j < active_table_ids.count(); j++) { + if (index_id == active_table_ids.at(j)) { + ret = OB_ERR_UNEXPECTED; + STORAGE_LOG(ERROR, "new create effective index should not has data within old frozen memtable", + K(ret), K(index_id), K(ctx.tables_handle_), K(ctx.pg_last_replay_log_ts_), K(ctx.log_ts_range_), + K(j), KPC(memtable)); + } + } + active_table_ids.reset(); + } + } + if (OB_FAIL(ret)) { + } else { + ret = OB_NO_NEED_MERGE; + STORAGE_LOG(WARN, "new create index should not mini for old memtable with lager last replay log ts", + K(ret), K(index_id), K(ctx.tables_handle_), K(ctx.pg_last_replay_log_ts_), K(ctx.log_ts_range_)); + } + } + + return ret; +} + int ObPartitionStorage::check_need_update_estimator( const ObTableSchema& table_schema, int64_t data_version, int64_t& stat_sampling_ratio) { diff --git a/src/storage/ob_partition_storage.h b/src/storage/ob_partition_storage.h index 56d669108..40deb94f0 100644 --- a/src/storage/ob_partition_storage.h +++ b/src/storage/ob_partition_storage.h @@ -690,6 +690,7 @@ private: const common::ObNewRow& row, ObLockFlag lock_flag, RowReshape*& row_reshape); int lock_rows_( const ObStoreCtx& ctx, const ObTableScanParam& scan_param, const common::ObNewRow& row, RowReshape*& row_reshape); + int check_useless_index_mini_merge(const storage::ObSSTableMergeCtx &ctx); int dump_error_info(ObSSTable& main_sstable, ObSSTable& index_sstable); // disallow copy; DISALLOW_COPY_AND_ASSIGN(ObPartitionStorage); diff --git a/src/storage/ob_partition_store.cpp b/src/storage/ob_partition_store.cpp index 1d038ceba..a5a475029 100644 --- a/src/storage/ob_partition_store.cpp +++ b/src/storage/ob_partition_store.cpp @@ -2687,7 +2687,7 @@ int ObPartitionStore::write_drop_index_trans(const common::ObPartitionKey& pkey, ret = OB_PARTITION_IS_REMOVED; LOG_WARN("partition is removed", K(ret)); } else if (OB_FAIL(SLOGGER.begin(OB_LOG_PARTITION_DROP_INDEX))) { - STORAGE_LOG(WARN, "Fail to begin daily merge log, ", K(ret)); + STORAGE_LOG(WARN, "Fail to begin daily merge log", K(ret)); } else { int64_t subcmd = ObIRedoModule::gen_subcmd(OB_REDO_LOG_PARTITION, REDO_LOG_DROP_INDEX_SSTABLE_OF_STORE); const ObStorageLogAttribute log_attr( @@ -2696,7 +2696,7 @@ int ObPartitionStore::write_drop_index_trans(const common::ObPartitionKey& pkey, if (OB_FAIL(SLOGGER.write_log(subcmd, log_attr, log_entry))) { STORAGE_LOG(WARN, "Failed to write_drop_index_trans", K(ret)); } else if (OB_FAIL(SLOGGER.commit(lsn))) { - STORAGE_LOG(ERROR, "Fail to commit logger, ", K(ret)); + STORAGE_LOG(ERROR, "Fail to commit logger", K(ret)); } else { ObTaskController::get().allow_next_syslog(); LOG_INFO("succeed to wrtite drop index trans log", K(lsn), K(log_entry), K(common::lbt())); @@ -4046,10 +4046,38 @@ int ObPartitionStore::get_physical_flashback_publish_version(const int64_t flash return ret; } -void ObPartitionStore::replace_store_map(TableStoreMap& store_map) +int ObPartitionStore::remove_unneed_store_within_trans(const TableStoreMap &new_store_map) { - bool found = false; - TableStoreMap* cur_store_map = nullptr; + int ret = OB_SUCCESS; + ObMultiVersionTableStore *table_store = nullptr; + TCRLockGuard lock_guard(lock_); + for (TableStoreMap::iterator it = store_map_->begin(); + OB_SUCC(ret) && it != store_map_->end(); + ++it) { + const int64_t index_id = it->second->get_table_id(); + if (OB_SUCC(new_store_map.get(index_id, table_store))) { + // exist in new table store map + } else if (OB_HASH_NOT_EXIST != ret) { + LOG_WARN("Failed to get table store", K(ret), K(index_id)); + } else { + int64_t subcmd = ObIRedoModule::gen_subcmd(OB_REDO_LOG_PARTITION, REDO_LOG_DROP_INDEX_SSTABLE_OF_STORE); + const ObStorageLogAttribute log_attr(pg_memtable_mgr_->get_pkey().get_tenant_id(), + pg_->get_pg_storage().get_storage_file()->get_file_id()); + ObDropIndexSSTableLogEntry log_entry; + log_entry.pkey_ = meta_->pkey_; + log_entry.index_id_ = index_id; + log_entry.pg_key_ = pg_memtable_mgr_->get_pkey(); + if (OB_FAIL(SLOGGER.write_log(subcmd, log_attr, log_entry))) { + STORAGE_LOG(WARN, "Failed to write_drop_index_trans", K(ret)); + } + } + } + return ret; +} + +void ObPartitionStore::replace_store_map(TableStoreMap &store_map) +{ + TableStoreMap *cur_store_map = nullptr; { TCWLockGuard lock_guard(lock_); cur_store_map = store_map_; diff --git a/src/storage/ob_partition_store.h b/src/storage/ob_partition_store.h index 45dc22d03..91454c4a5 100644 --- a/src/storage/ob_partition_store.h +++ b/src/storage/ob_partition_store.h @@ -285,6 +285,7 @@ private: int inner_physical_flashback( const bool is_data_table, const int64_t flashback_scn, ObMultiVersionTableStore* multi_table_store); + int remove_unneed_store_within_trans(const TableStoreMap &new_store_map); void replace_store_map(TableStoreMap& store_map); int prepare_new_store_map(const ObTablesHandle& sstables, const int64_t max_kept_major_version_number, const bool need_reuse_local_minor, TableStoreMap*& new_store_map); diff --git a/src/storage/ob_pg_storage.cpp b/src/storage/ob_pg_storage.cpp index baa339c27..c2c4b617a 100644 --- a/src/storage/ob_pg_storage.cpp +++ b/src/storage/ob_pg_storage.cpp @@ -2397,6 +2397,22 @@ int ObPGStorage::get_saved_data_info(ObDataStorageInfo& data_info) const return ret; } +int ObPGStorage::get_last_replay_log_ts(int64_t &last_replay_log_ts) const +{ + int ret = OB_SUCCESS; + + if (IS_NOT_INIT) { + ret = OB_NOT_INIT; + LOG_WARN("pg is not inited", K(ret)); + } else { + TCRLockGuard lock_guard(lock_); + last_replay_log_ts = meta_->storage_info_.get_data_info().get_last_replay_log_ts(); + } + + return ret; +} + + int ObPGStorage::append_local_sort_data( const ObPartitionKey& pkey, const share::ObBuildIndexAppendLocalDataParam& param, ObNewRowIterator& iter) { @@ -7286,9 +7302,10 @@ int ObPGStorage::batch_replace_store_map(const ObIArray& LOG_WARN("trans table seq has changed", K(ret), K(old_trans_table_seq), K_(trans_table_seq)); } else if (OB_FAIL(SLOGGER.begin(OB_LOG_BATCH_REPLACE_STORE_MAP))) { LOG_WARN("failed to begin slog trans", K(ret)); - } else if (OB_FAIL(create_pg_partition_if_need_(part_ctx_array, schema_version, is_restore))) { - LOG_WARN("failed to create pg partition", K(ret), K(part_ctx_array)); } else { + if (OB_FAIL(create_pg_partition_if_need_(part_ctx_array, schema_version, is_restore))) { + LOG_WARN("failed to create pg partition", K(ret), K(part_ctx_array)); + } for (int i = 0; OB_SUCC(ret) && i < part_ctx_array.count(); ++i) { const ObPartitionMigrateCtx& part_ctx = part_ctx_array.at(i); ObPartitionStore::TableStoreMap* store_map = nullptr; @@ -7300,6 +7317,11 @@ int ObPGStorage::batch_replace_store_map(const ObIArray& } } } + if (OB_SUCC(ret)) { + if (OB_FAIL(remove_unneed_table_store_within_trans(part_ctx_array, store_maps))) { + LOG_ERROR("failed to remove unneed table store within slog trans", K(ret)); + } + } if (OB_SUCC(ret)) { int64_t lsn = 0; if (OB_FAIL(SLOGGER.commit(lsn))) { @@ -7352,6 +7374,35 @@ int ObPGStorage::prepare_partition_store_map_( return ret; } +int ObPGStorage::remove_unneed_table_store_within_trans( + const common::ObIArray &part_ctx_array, + ObPartitionStore::TableStoreMap **store_maps) +{ + int ret = OB_SUCCESS; + ObPGPartition *partition = nullptr; + ObPartitionStorage *storage = nullptr; + ObPartitionStore::TableStoreMap *store_map = nullptr; + for (int64_t i = 0; OB_SUCC(ret) && i < part_ctx_array.count(); ++i) { + const ObPartitionMigrateCtx &ctx = part_ctx_array.at(i); + if (OB_NOT_NULL(store_map = store_maps[i])) { + ObPGPartitionGuard part_guard(ctx.copy_info_.meta_.pkey_, *(pg_->get_pg_partition_map())); + if (OB_ISNULL(partition = part_guard.get_pg_partition())) { + ret = OB_ERR_UNEXPECTED; + LOG_WARN("get pg partition failed", K(ret), K(ctx)); + } else if (OB_ISNULL(storage = static_cast(partition->get_storage()))) { + ret = OB_ERR_UNEXPECTED; + LOG_WARN("get partition storage failed", K(ret), K(ctx)); + } else if (OB_FAIL(storage->get_partition_store().remove_unneed_store_within_trans(*store_map))) { + LOG_WARN("Failed to remove unneed table store within trans", K(ret)); + } else { + LOG_INFO("Succ to replace store map", KP(store_map)); + } + } + } + return ret; +} + + int ObPGStorage::do_replace_store_map_( const common::ObIArray& part_ctx_array, ObPartitionStore::TableStoreMap** store_maps) { diff --git a/src/storage/ob_pg_storage.h b/src/storage/ob_pg_storage.h index baeca3fcc..1d9b516d8 100644 --- a/src/storage/ob_pg_storage.h +++ b/src/storage/ob_pg_storage.h @@ -199,6 +199,7 @@ public: int get_all_saved_info(ObSavedStorageInfoV2& info) const; int get_saved_clog_info(common::ObBaseStorageInfo& clog_info) const; int get_saved_data_info(ObDataStorageInfo& data_info) const; + int get_last_replay_log_ts(int64_t &last_replay_log_ts) const; int set_pg_storage_info(const ObSavedStorageInfoV2& info); int set_pg_clog_info(const ObBaseStorageInfo& clog_info, const bool replica_with_data); // build index @@ -588,6 +589,9 @@ private: int create_trans_sstable( const ObCreatePartitionParam& create_partition_param, const bool in_slog_trans, ObTablesHandle& sstables_handle); int prepare_partition_store_map_(const ObPartitionMigrateCtx& ctx, ObPartitionStore::TableStoreMap*& new_store_map); + int remove_unneed_table_store_within_trans( + const common::ObIArray &part_ctx_array, + ObPartitionStore::TableStoreMap **store_maps); int do_replace_store_map_( const common::ObIArray& part_ctx_array, ObPartitionStore::TableStoreMap** store_maps); int get_freeze_info_(const common::ObVersion& version, ObFreezeInfoSnapshotMgr::FreezeInfo& freeze_info); diff --git a/src/storage/ob_sstable.cpp b/src/storage/ob_sstable.cpp index ef965b9bc..29b868744 100644 --- a/src/storage/ob_sstable.cpp +++ b/src/storage/ob_sstable.cpp @@ -602,6 +602,8 @@ int ObSSTable::close() STORAGE_LOG(WARN, "fail to build block meta map", K(ret)); } else if (OB_FAIL(build_logic_block_id_map())) { STORAGE_LOG(WARN, "failed to build block id set", K(ret)); + } else if (OB_FAIL(check_collation_free_valid())) { + STORAGE_LOG(WARN, "fail to check collation free valid", K(ret)); } else if (OB_FAIL(check_logical_data_version(macro_meta_array_))) { STORAGE_LOG(WARN, "fail to check logical data version for sstable for data block", K(ret), K_(meta)); } else if (OB_FAIL(check_logical_data_version(lob_macro_meta_array_))) { @@ -2796,33 +2798,33 @@ int ObSSTable::get_concurrent_cnt(int64_t tablet_size, int64_t& concurrent_cnt) int ObSSTable::check_collation_free_valid() { int ret = OB_SUCCESS; - ObFullMacroBlockMeta full_meta; + const ObMacroBlockMetaV2 *meta = nullptr; bool is_collation_free_valid = false; exist_invalid_collation_free_meta_ = false; - for (int64_t i = 0; OB_SUCC(ret) && !exist_invalid_collation_free_meta_ && i < meta_.macro_block_array_.count(); - i++) { - if (OB_FAIL(get_meta(meta_.macro_block_array_.at(i), full_meta))) { - STORAGE_LOG(WARN, "fail to get meta", K(ret), K(meta_.macro_block_array_.at(i))); - } else if (!full_meta.is_valid()) { + for (int64_t i = 0; OB_SUCC(ret) && !exist_invalid_collation_free_meta_ && i < macro_meta_array_.count(); i++) { + if (OB_ISNULL(meta = macro_meta_array_.at(i).meta_)) { + ret = OB_ERR_SYS; + STORAGE_LOG(WARN, "error sys, block meta must not be null", K(ret)); + } else if (!meta->is_valid()) { ret = OB_ERR_SYS; STORAGE_LOG(WARN, "Unexpected null macro meta", K(ret), K(i)); - } else if (OB_FAIL(full_meta.meta_->check_collation_free_valid(is_collation_free_valid))) { - STORAGE_LOG(WARN, "fail to check collation free is valid", K(ret), K(full_meta)); + } else if (OB_FAIL(meta->check_collation_free_valid(is_collation_free_valid))) { + STORAGE_LOG(WARN, "fail to check collation free is valid", K(ret), K(meta)); } else if (!is_collation_free_valid) { exist_invalid_collation_free_meta_ = true; } } - for (int64_t i = 0; OB_SUCC(ret) && !exist_invalid_collation_free_meta_ && i < meta_.lob_macro_block_array_.count(); - i++) { - if (OB_FAIL(get_meta(meta_.lob_macro_block_array_.at(i), full_meta))) { - STORAGE_LOG(WARN, "fail to get meta", K(ret), K(meta_.lob_macro_block_array_.at(i))); - } else if (!full_meta.is_valid()) { + for (int64_t i = 0; OB_SUCC(ret) && !exist_invalid_collation_free_meta_ && i < lob_macro_meta_array_.count(); i++) { + if (OB_ISNULL(meta = lob_macro_meta_array_.at(i).meta_)) { + ret = OB_ERR_SYS; + STORAGE_LOG(WARN, "error sys, block meta must not be null", K(ret)); + } else if (!meta->is_valid()) { ret = OB_ERR_SYS; STORAGE_LOG(WARN, "Unexpected null macro meta", K(ret), K(i)); - } else if (OB_FAIL(full_meta.meta_->check_collation_free_valid(is_collation_free_valid))) { - STORAGE_LOG(WARN, "fail to check collation free is valid", K(ret), K(full_meta)); + } else if (OB_FAIL(meta->check_collation_free_valid(is_collation_free_valid))) { + STORAGE_LOG(WARN, "fail to check collation free is valid", K(ret), K(meta)); } else if (!is_collation_free_valid) { exist_invalid_collation_free_meta_ = true; } diff --git a/src/storage/ob_table_store.cpp b/src/storage/ob_table_store.cpp index 14d78b7de..11e5f3bcb 100644 --- a/src/storage/ob_table_store.cpp +++ b/src/storage/ob_table_store.cpp @@ -1224,9 +1224,9 @@ int ObTableStore::refine_mini_minor_merge_result(ObGetMergeTablesResult& result) K(result), K(minor_sstable_count)); } else if (1 == mini_tables.count()) { - // only one mini sstable, and 1 L1 sstable at last, no need mini minor merge - LOG_INFO("minor refine, only one mini sstable, no need to do mini minor merge", K(result)); - result.handle_.reset(); + // only one mini sstable, and 1 L1 sstable at last, we need minor merge + result.suggest_merge_type_ = MINOR_MERGE; + LOG_INFO("minor refine, only one mini sstable, we need do a full minor merge", K(result)); } else if (minor_sstable_count == 0 && mini_sstable_size > min_minor_sstable_row_count) { result.suggest_merge_type_ = MINOR_MERGE; LOG_INFO("minor refine, mini minor merge sstable refine to minor merge", @@ -1667,14 +1667,9 @@ int ObTableStore::find_mini_merge_tables(const ObGetMergeTablesParam& param, K(param), KPC(memtable)); break; - } else if ((OB_FAIL(is_memtable_need_merge(*memtable, need_merge)))) { - LOG_WARN("Failed to check memtable need merge", K(i), K(need_merge), KPC(memtable)); - } else if (!need_merge) { - LOG_DEBUG("memtable wait to release", K(i), K(param), KPC(memtable)); - continue; - } else if (result.handle_.get_count() > 0) { - if (result.log_ts_range_.end_log_ts_ < memtable->get_start_log_ts() || - result.log_ts_range_.max_log_ts_ > memtable->get_end_log_ts()) { + } else if (result.handle_.get_count() > 0 ) { + if (result.log_ts_range_.end_log_ts_ < memtable->get_start_log_ts() + || result.log_ts_range_.max_log_ts_ > memtable->get_end_log_ts()) { FLOG_INFO("log id not continues, reset previous minor merge tables", K(i), "last_end_log_ts", @@ -1694,6 +1689,11 @@ int ObTableStore::find_mini_merge_tables(const ObGetMergeTablesParam& param, KPC(memtable)); break; } + } else if ((OB_FAIL(is_memtable_need_merge(*memtable, need_merge)))) { + LOG_WARN("Failed to check memtable need merge", K(i), K(need_merge), KPC(memtable)); + } else if (!need_merge) { + LOG_DEBUG("memtable wait to release", K(i), K(param), KPC(memtable)); + continue; } if (OB_SUCC(ret)) { if (OB_FAIL(add_minor_merge_result(memtable, result))) { @@ -1746,8 +1746,8 @@ int ObTableStore::find_mini_minor_merge_tables(const ObGetMergeTablesParam& para continue; } else if (table->get_base_version() < min_snapshot_version) { continue; - } else if (is_multi_version_break(table->get_version_range(), result.version_range_.snapshot_version_) && - table->get_multi_version_start() >= expect_multi_version) { + } else if (is_multi_version_break(table->get_version_range(), result.version_range_.snapshot_version_) + && table->get_multi_version_start() > expect_multi_version) { if (result.handle_.get_count() > 1) { // do not involve sstable with bigger uncontinue multi version than max_snapshot_version FLOG_INFO("Multi version start larger than max snapshot, stop find more minor sstables", @@ -1870,7 +1870,7 @@ int ObTableStore::refine_mini_merge_result_in_reboot_phase(ObITable& last_table, K(last_end_log_ts), K(PRETTY_TS(*this))); } - } else if (result.version_range_.snapshot_version_ <= last_snapshot_version) { + } else if (result.version_range_.snapshot_version_ < last_snapshot_version) { ret = OB_ERR_UNEXPECTED; LOG_ERROR( "Unexpected chaos snapshot_version and log_ts", K(ret), K(result), K(last_end_log_ts), K(PRETTY_TS(*this))); diff --git a/unittest/storage/test_micro_block_row_scanner_with_special_uncom_row.cpp b/unittest/storage/test_micro_block_row_scanner_with_special_uncom_row.cpp index b96546b45..2df34e266 100644 --- a/unittest/storage/test_micro_block_row_scanner_with_special_uncom_row.cpp +++ b/unittest/storage/test_micro_block_row_scanner_with_special_uncom_row.cpp @@ -2245,8 +2245,235 @@ TEST_F(TestMicroBlockRowScanner, test_bug) ASSERT_TRUE(res_iter.equals(scanner_iter, false)); } -} // namespace unittest -} // namespace oceanbase +TEST_F(TestMicroBlockRowScanner, test_bug2) +{ + const int64_t rowkey_cnt = 4; + const int64_t micro_cnt = 1; + const char *micro_data[micro_cnt]; + micro_data[0] = + "bigint var bigint bigint bigint bigint flag multi_version_row_flag trans_id\n" + "-10 var1 -1 -1 9 NOP EXIST L trans_id_0\n" + "-2 var1 -4 -1 5 NOP EXIST CL trans_id_0\n" + "-1 var1 MAGIC MAGIC NOP NOP EXIST LM trans_id_0\n" + "0 var1 MAGIC MAGIC NOP NOP EXIST LM trans_id_0\n" + "1 var1 MIN -1 9 NOP EXIST U trans_id_1\n" + "1 var1 MAGIC MAGIC NOP NOP EXIST LM trans_id_0\n" + "2 var1 MAGIC MAGIC NOP NOP EXIST LM trans_id_0\n" + "3 var1 MAGIC MAGIC NOP NOP EXIST LM trans_id_0\n" + "4 var1 MIN -9 1 NOP EXIST U trans_id_2\n" + "4 var1 MAGIC MAGIC NOP NOP EXIST LM trans_id_0\n" + "5 var1 MAGIC MAGIC NOP NOP EXIST LM trans_id_0\n" + "6 var1 MAGIC MAGIC NOP NOP EXIST LM trans_id_0\n" + "7 var1 MAGIC MAGIC NOP NOP EXIST LM trans_id_0\n" + "8 var1 MIN -9 3 NOP EXIST U trans_id_2\n" + "8 var1 MAGIC MAGIC NOP NOP EXIST LM trans_id_0\n" + "10 var1 -1 -1 9 NOP EXIST L trans_id_0\n"; + prepare_data(micro_data, 1, rowkey_cnt, 9); + + ObMultiVersionMicroBlockRowScanner m_scanner; + ObVersionRange trans_version_range; + ObMockIterator micro_iter; + ObMockIterator res_iter; + ObMicroBlockData block_data; + ObMicroBlockData payload_data; + common::ObExtStoreRange range; + common::ObExtStoreRange new_range; + ObMockIterator scanner_iter; + + // minor + trans_version_range.base_version_ = 0; + trans_version_range.snapshot_version_ = 100; + trans_version_range.multi_version_start_ = 1; + prepare_query_param(trans_version_range, true, false); + + const char var1[] = "var1"; + ObObj start_val[2]; + ObObj end_val[2]; + start_val[0].set_int(1); + start_val[1].set_varchar(var1, 4); + start_val[1].set_collation_type(CS_TYPE_UTF8MB4_GENERAL_CI); + end_val[0].set_int(8); + end_val[1].set_varchar(var1, 4); + end_val[1].set_collation_type(CS_TYPE_UTF8MB4_GENERAL_CI); + ObStoreRowkey start_key(start_val, 2); + ObStoreRowkey end_key(end_val, 2); + range.get_range().table_id_ = combine_id(1, 3001); + range.get_range().start_key_ = start_key; + range.get_range().end_key_ = end_key; + range.get_range().set_right_closed(); + range.get_range().set_left_closed(); + + OK(ObVersionStoreRangeConversionHelper::range_to_multi_version_range(range, trans_version_range, allocator_, new_range)); + STORAGE_LOG(INFO, "chaser debug range", K(range), K(new_range)); + + test_trans_part_ctx_.clear_all(); + int ret = OB_SUCCESS; + if (OB_FAIL(test_trans_part_ctx_.add_transaction_status(transaction::ObTransTableStatusType::COMMIT, 10))) { + STORAGE_LOG(ERROR, "add transaction status failed", K(ret)); + } else if (OB_FAIL(test_trans_part_ctx_.add_transaction_status(transaction::ObTransTableStatusType::COMMIT, 10))) { + STORAGE_LOG(ERROR, "add transaction status failed", K(ret)); + } + + OK(m_scanner.init(param_, context_, &sstable_)); + OK(m_scanner.set_range(new_range.get_range())); + + const char *result1 = + "bigint var bigint bigint flag\n" + //"-2 var1 5 NOP EXIST\n" + "1 var1 9 NOP EXIST\n" + "4 var1 1 NOP EXIST\n" + "8 var1 3 NOP EXIST\n"; + + const ObStoreRow *row = NULL; + bool is_left_border = true; + bool is_right_border = true; + for (int64_t i = 0; i < micro_cnt; ++i) { + ret = OB_SUCCESS; + micro_iter.reset(); + OK(micro_iter.from(micro_data[i])); + build_micro_block_data(micro_iter, block_data, payload_data, end_key); + MacroBlockId macro_id(0, 0, 1, ObStoreFileSystem::RESERVED_MACRO_BLOCK_INDEX); + ObFullMacroBlockMeta full_meta; + OK(sstable_.get_meta(macro_id, full_meta)); + const_cast(full_meta.meta_)->contain_uncommitted_row_ = true; + OK(m_scanner.open(macro_id, full_meta, payload_data, is_left_border, is_right_border)) << "i: " << i; + while (OB_SUCCESS == ret) { + ret = m_scanner.get_next_row(row); + if (OB_SUCCESS == ret) { + ASSERT_TRUE(NULL != row) << "i: " << i; + OK(scanner_iter.add_row(const_cast(row))); + STORAGE_LOG(INFO, "test", "this row", to_cstring(*row)); + } else if (OB_ITER_END != ret) { + ASSERT_EQ(OB_SUCCESS, ret); + } + } + } + res_iter.reset(); + OK(res_iter.from(result1)); + ASSERT_TRUE(res_iter.equals(scanner_iter, false)); + scanner_iter.reset(); + + m_scanner.reset(); + context_.query_flag_.scan_order_ = common::ObQueryFlag::Reverse; + OK(m_scanner.init(param_, context_, &sstable_)); + OK(m_scanner.set_range(new_range.get_range())); + + const char *result2 = + "bigint var bigint bigint flag\n" + "8 var1 3 NOP EXIST\n" + "4 var1 1 NOP EXIST\n" + "1 var1 9 NOP EXIST\n"; + //"-2 var1 5 NOP EXIST\n"; + + for (int64_t i = 0; i < micro_cnt; ++i) { + ret = OB_SUCCESS; + micro_iter.reset(); + OK(micro_iter.from(micro_data[i])); + build_micro_block_data(micro_iter, block_data, payload_data, end_key); + MacroBlockId macro_id(0, 0, 1, ObStoreFileSystem::RESERVED_MACRO_BLOCK_INDEX); + ObFullMacroBlockMeta full_meta; + OK(sstable_.get_meta(macro_id, full_meta)); + const_cast(full_meta.meta_)->contain_uncommitted_row_ = true; + OK(m_scanner.open(macro_id, full_meta, payload_data, is_left_border, is_right_border)) << "i: " << i; + while (OB_SUCCESS == ret) { + ret = m_scanner.get_next_row(row); + if (OB_SUCCESS == ret) { + ASSERT_TRUE(NULL != row) << "i: " << i; + OK(scanner_iter.add_row(const_cast(row))); + STORAGE_LOG(INFO, "test", "this row", to_cstring(*row)); + } else if (OB_ITER_END != ret) { + ASSERT_EQ(OB_SUCCESS, ret); + } + } + } + res_iter.reset(); + OK(res_iter.from(result2)); + ASSERT_TRUE(res_iter.equals(scanner_iter, false)); + scanner_iter.reset(); + + + start_val[0].set_int(-2); + end_val[0].set_int(7); + new_range.reset(); + context_.query_flag_.scan_order_ = common::ObQueryFlag::Forward; + OK(ObVersionStoreRangeConversionHelper::range_to_multi_version_range(range, trans_version_range, allocator_, new_range)); + STORAGE_LOG(INFO, "chaser debug range", K(range), K(new_range)); + const char *result3 = + "bigint var bigint bigint flag\n" + "-2 var1 5 NOP EXIST\n" + "1 var1 9 NOP EXIST\n" + "4 var1 1 NOP EXIST\n"; + m_scanner.reset(); + OK(m_scanner.init(param_, context_, &sstable_)); + OK(m_scanner.set_range(new_range.get_range())); + for (int64_t i = 0; i < micro_cnt; ++i) { + ret = OB_SUCCESS; + micro_iter.reset(); + OK(micro_iter.from(micro_data[i])); + build_micro_block_data(micro_iter, block_data, payload_data, end_key); + MacroBlockId macro_id(0, 0, 1, ObStoreFileSystem::RESERVED_MACRO_BLOCK_INDEX); + ObFullMacroBlockMeta full_meta; + OK(sstable_.get_meta(macro_id, full_meta)); + const_cast(full_meta.meta_)->contain_uncommitted_row_ = true; + OK(m_scanner.open(macro_id, full_meta, payload_data, is_left_border, is_right_border)) << "i: " << i; + while (OB_SUCCESS == ret) { + ret = m_scanner.get_next_row(row); + if (OB_SUCCESS == ret) { + ASSERT_TRUE(NULL != row) << "i: " << i; + OK(scanner_iter.add_row(const_cast(row))); + STORAGE_LOG(INFO, "test", "this row", to_cstring(*row)); + } else if (OB_ITER_END != ret) { + ASSERT_EQ(OB_SUCCESS, ret); + } + } + } + res_iter.reset(); + OK(res_iter.from(result3)); + ASSERT_TRUE(res_iter.equals(scanner_iter, false)); + scanner_iter.reset(); + + start_val[0].set_int(1); + end_val[0].set_int(8); + range.get_range().set_left_open(); + range.get_range().set_right_open(); + new_range.reset(); + context_.query_flag_.scan_order_ = common::ObQueryFlag::Forward; + OK(ObVersionStoreRangeConversionHelper::range_to_multi_version_range(range, trans_version_range, allocator_, new_range)); + STORAGE_LOG(INFO, "chaser debug range", K(range), K(new_range)); + const char *result4 = + "bigint var bigint bigint flag\n" + "4 var1 1 NOP EXIST\n"; + m_scanner.reset(); + OK(m_scanner.init(param_, context_, &sstable_)); + OK(m_scanner.set_range(new_range.get_range())); + for (int64_t i = 0; i < micro_cnt; ++i) { + ret = OB_SUCCESS; + micro_iter.reset(); + OK(micro_iter.from(micro_data[i])); + build_micro_block_data(micro_iter, block_data, payload_data, end_key); + MacroBlockId macro_id(0, 0, 1, ObStoreFileSystem::RESERVED_MACRO_BLOCK_INDEX); + ObFullMacroBlockMeta full_meta; + OK(sstable_.get_meta(macro_id, full_meta)); + const_cast(full_meta.meta_)->contain_uncommitted_row_ = true; + OK(m_scanner.open(macro_id, full_meta, payload_data, is_left_border, is_right_border)) << "i: " << i; + while (OB_SUCCESS == ret) { + ret = m_scanner.get_next_row(row); + if (OB_SUCCESS == ret) { + ASSERT_TRUE(NULL != row) << "i: " << i; + OK(scanner_iter.add_row(const_cast(row))); + STORAGE_LOG(INFO, "test", "this row", to_cstring(*row)); + } else if (OB_ITER_END != ret) { + ASSERT_EQ(OB_SUCCESS, ret); + } + } + } + res_iter.reset(); + OK(res_iter.from(result4)); + ASSERT_TRUE(res_iter.equals(scanner_iter, false)); +} + +} +} int main(int argc, char** argv) {