From e7d1cb813e793e8d4e0bf94fa395b76bf44d4cf0 Mon Sep 17 00:00:00 2001 From: ZhenNan0 Date: Thu, 9 May 2024 10:59:54 +0000 Subject: [PATCH] Add placeholder for balance job and task --- .../ob_inner_table_schema.12301_12350.cpp | 62 ++++++++++ .../ob_inner_table_schema.15351_15400.cpp | 60 ++++++++++ .../ob_inner_table_schema.21401_21450.cpp | 16 +-- .../ob_inner_table_schema.25201_25250.cpp | 8 +- .../ob_inner_table_schema.401_450.cpp | 62 ++++++++++ .../inner_table/ob_inner_table_schema_def.py | 106 +++++++++++++++--- src/share/inner_table/table_id_to_name | 14 +-- .../r/mysql/desc_sys_views_in_mysql.result | 4 + .../r/mysql/desc_sys_views_in_sys.result | 8 ++ .../r/mysql/desc_virtual_table_in_sys.result | 4 + 10 files changed, 304 insertions(+), 40 deletions(-) diff --git a/src/share/inner_table/ob_inner_table_schema.12301_12350.cpp b/src/share/inner_table/ob_inner_table_schema.12301_12350.cpp index 6707a8cef4..fbf390ab5c 100644 --- a/src/share/inner_table/ob_inner_table_schema.12301_12350.cpp +++ b/src/share/inner_table/ob_inner_table_schema.12301_12350.cpp @@ -11640,6 +11640,22 @@ int ObInnerTableSchema::all_virtual_balance_job_schema(ObTableSchema &table_sche true, //is_nullable false); //is_autoincrement } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA_TS("max_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 + true, //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(ENCODING_ROW_STORE); table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL); @@ -11868,6 +11884,22 @@ int ObInnerTableSchema::all_virtual_balance_job_history_schema(ObTableSchema &ta false, //is_autoincrement false); //is_on_update_for_timestamp } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA_TS("max_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 + true, //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(ENCODING_ROW_STORE); table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL); @@ -12184,6 +12216,21 @@ int ObInnerTableSchema::all_virtual_balance_task_schema(ObTableSchema &table_sch true, //is_nullable false); //is_autoincrement } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("balance_strategy", //column_name + ++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 + true, //is_nullable + false); //is_autoincrement + } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(ENCODING_ROW_STORE); table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL); @@ -12532,6 +12579,21 @@ int ObInnerTableSchema::all_virtual_balance_task_history_schema(ObTableSchema &t false, //is_autoincrement false); //is_on_update_for_timestamp } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("balance_strategy", //column_name + ++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 + true, //is_nullable + false); //is_autoincrement + } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(ENCODING_ROW_STORE); table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL); diff --git a/src/share/inner_table/ob_inner_table_schema.15351_15400.cpp b/src/share/inner_table/ob_inner_table_schema.15351_15400.cpp index 162450c194..eba0056f63 100644 --- a/src/share/inner_table/ob_inner_table_schema.15351_15400.cpp +++ b/src/share/inner_table/ob_inner_table_schema.15351_15400.cpp @@ -313,6 +313,21 @@ int ObInnerTableSchema::all_virtual_balance_job_real_agent_ora_schema(ObTableSch false); //is_autoincrement } + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("MAX_END_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("GMT_CREATE", //column_name ++column_id, //column_id @@ -522,6 +537,21 @@ int ObInnerTableSchema::all_virtual_balance_job_history_real_agent_ora_schema(Ob false); //is_autoincrement } + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("MAX_END_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("GMT_CREATE", //column_name ++column_id, //column_id @@ -821,6 +851,21 @@ int ObInnerTableSchema::all_virtual_balance_task_real_agent_ora_schema(ObTableSc false); //is_autoincrement } + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("BALANCE_STRATEGY", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_DEFAULT_STATUS_LENTH, //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 @@ -1150,6 +1195,21 @@ int ObInnerTableSchema::all_virtual_balance_task_history_real_agent_ora_schema(O false); //is_autoincrement } + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("BALANCE_STRATEGY", //column_name + ++column_id, //column_id + 0, //rowkey_id + 0, //index_id + 0, //part_key_pos + ObVarcharType, //column_type + CS_TYPE_UTF8MB4_BIN, //column_collation_type + OB_DEFAULT_STATUS_LENTH, //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 diff --git a/src/share/inner_table/ob_inner_table_schema.21401_21450.cpp b/src/share/inner_table/ob_inner_table_schema.21401_21450.cpp index 489fd5a8e9..446971d8e2 100644 --- a/src/share/inner_table/ob_inner_table_schema.21401_21450.cpp +++ b/src/share/inner_table/ob_inner_table_schema.21401_21450.cpp @@ -260,7 +260,7 @@ int ObInnerTableSchema::dba_ob_balance_jobs_schema(ObTableSchema &table_schema) table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT JOB_ID, GMT_CREATE AS CREATE_TIME, GMT_MODIFIED AS MODIFY_TIME, BALANCE_STRATEGY_NAME AS BALANCE_STRATEGY, JOB_TYPE, TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, COMMENT FROM OCEANBASE.__ALL_BALANCE_JOB )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT JOB_ID, GMT_CREATE AS CREATE_TIME, GMT_MODIFIED AS MODIFY_TIME, BALANCE_STRATEGY_NAME AS BALANCE_STRATEGY, JOB_TYPE, TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, COMMENT, MAX_END_TIME FROM OCEANBASE.__ALL_BALANCE_JOB )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -310,7 +310,7 @@ int ObInnerTableSchema::cdb_ob_balance_jobs_schema(ObTableSchema &table_schema) table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, JOB_ID, GMT_CREATE AS CREATE_TIME, GMT_MODIFIED AS MODIFY_TIME, BALANCE_STRATEGY_NAME AS BALANCE_STRATEGY, JOB_TYPE, TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, COMMENT FROM OCEANBASE.__ALL_VIRTUAL_BALANCE_JOB )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, JOB_ID, GMT_CREATE AS CREATE_TIME, GMT_MODIFIED AS MODIFY_TIME, BALANCE_STRATEGY_NAME AS BALANCE_STRATEGY, JOB_TYPE, TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, COMMENT, MAX_END_TIME FROM OCEANBASE.__ALL_VIRTUAL_BALANCE_JOB )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -360,7 +360,7 @@ int ObInnerTableSchema::dba_ob_balance_job_history_schema(ObTableSchema &table_s table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT JOB_ID, CREATE_TIME, FINISH_TIME, BALANCE_STRATEGY_NAME AS BALANCE_STRATEGY, JOB_TYPE, TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, COMMENT FROM OCEANBASE.__ALL_BALANCE_JOB_HISTORY )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT JOB_ID, CREATE_TIME, FINISH_TIME, BALANCE_STRATEGY_NAME AS BALANCE_STRATEGY, JOB_TYPE, TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, COMMENT, MAX_END_TIME FROM OCEANBASE.__ALL_BALANCE_JOB_HISTORY )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -410,7 +410,7 @@ int ObInnerTableSchema::cdb_ob_balance_job_history_schema(ObTableSchema &table_s table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, JOB_ID, CREATE_TIME, FINISH_TIME, BALANCE_STRATEGY_NAME AS BALANCE_STRATEGY, JOB_TYPE, TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, COMMENT FROM OCEANBASE.__ALL_VIRTUAL_BALANCE_JOB_HISTORY )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, JOB_ID, CREATE_TIME, FINISH_TIME, BALANCE_STRATEGY_NAME AS BALANCE_STRATEGY, JOB_TYPE, TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, COMMENT, MAX_END_TIME FROM OCEANBASE.__ALL_VIRTUAL_BALANCE_JOB_HISTORY )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -460,7 +460,7 @@ int ObInnerTableSchema::dba_ob_balance_tasks_schema(ObTableSchema &table_schema) table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TASK_ID, GMT_CREATE AS CREATE_TIME, GMT_MODIFIED AS MODIFY_TIME, TASK_TYPE, SRC_LS, DEST_LS, PART_LIST, FINISHED_PART_LIST, PART_COUNT, FINISHED_PART_COUNT, LS_GROUP_ID, STATUS, PARENT_LIST, CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, COMMENT FROM OCEANBASE.__ALL_BALANCE_TASK )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TASK_ID, GMT_CREATE AS CREATE_TIME, GMT_MODIFIED AS MODIFY_TIME, TASK_TYPE, SRC_LS, DEST_LS, PART_LIST, FINISHED_PART_LIST, PART_COUNT, FINISHED_PART_COUNT, LS_GROUP_ID, STATUS, PARENT_LIST, CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, COMMENT, BALANCE_STRATEGY FROM OCEANBASE.__ALL_BALANCE_TASK )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -510,7 +510,7 @@ int ObInnerTableSchema::cdb_ob_balance_tasks_schema(ObTableSchema &table_schema) table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, TASK_ID, GMT_CREATE AS CREATE_TIME, GMT_MODIFIED AS MODIFY_TIME, TASK_TYPE, SRC_LS, DEST_LS, PART_LIST, FINISHED_PART_LIST, PART_COUNT, FINISHED_PART_COUNT, LS_GROUP_ID, STATUS, PARENT_LIST, CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, COMMENT FROM OCEANBASE.__ALL_VIRTUAL_BALANCE_TASK )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, TASK_ID, GMT_CREATE AS CREATE_TIME, GMT_MODIFIED AS MODIFY_TIME, TASK_TYPE, SRC_LS, DEST_LS, PART_LIST, FINISHED_PART_LIST, PART_COUNT, FINISHED_PART_COUNT, LS_GROUP_ID, STATUS, PARENT_LIST, CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, COMMENT, BALANCE_STRATEGY FROM OCEANBASE.__ALL_VIRTUAL_BALANCE_TASK )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -560,7 +560,7 @@ int ObInnerTableSchema::dba_ob_balance_task_history_schema(ObTableSchema &table_ table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TASK_ID, CREATE_TIME, FINISH_TIME, TASK_TYPE, SRC_LS, DEST_LS, PART_LIST, FINISHED_PART_LIST, PART_COUNT, FINISHED_PART_COUNT, LS_GROUP_ID, STATUS, PARENT_LIST, CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, COMMENT FROM OCEANBASE.__ALL_BALANCE_TASK_HISTORY )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TASK_ID, CREATE_TIME, FINISH_TIME, TASK_TYPE, SRC_LS, DEST_LS, PART_LIST, FINISHED_PART_LIST, PART_COUNT, FINISHED_PART_COUNT, LS_GROUP_ID, STATUS, PARENT_LIST, CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, COMMENT, BALANCE_STRATEGY FROM OCEANBASE.__ALL_BALANCE_TASK_HISTORY )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -610,7 +610,7 @@ int ObInnerTableSchema::cdb_ob_balance_task_history_schema(ObTableSchema &table_ table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, TASK_ID, CREATE_TIME, FINISH_TIME, TASK_TYPE, SRC_LS, DEST_LS, PART_LIST, FINISHED_PART_LIST, PART_COUNT, FINISHED_PART_COUNT, LS_GROUP_ID, STATUS, PARENT_LIST, CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, COMMENT FROM OCEANBASE.__ALL_VIRTUAL_BALANCE_TASK_HISTORY )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID, TASK_ID, CREATE_TIME, FINISH_TIME, TASK_TYPE, SRC_LS, DEST_LS, PART_LIST, FINISHED_PART_LIST, PART_COUNT, FINISHED_PART_COUNT, LS_GROUP_ID, STATUS, PARENT_LIST, CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, COMMENT, BALANCE_STRATEGY FROM OCEANBASE.__ALL_VIRTUAL_BALANCE_TASK_HISTORY )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } diff --git a/src/share/inner_table/ob_inner_table_schema.25201_25250.cpp b/src/share/inner_table/ob_inner_table_schema.25201_25250.cpp index 18421cbaed..8bef62131b 100644 --- a/src/share/inner_table/ob_inner_table_schema.25201_25250.cpp +++ b/src/share/inner_table/ob_inner_table_schema.25201_25250.cpp @@ -1760,7 +1760,7 @@ int ObInnerTableSchema::dba_ob_balance_jobs_ora_schema(ObTableSchema &table_sche table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT JOB_ID, GMT_CREATE AS CREATE_TIME, GMT_MODIFIED AS MODIFY_TIME, BALANCE_STRATEGY_NAME AS BALANCE_STRATEGY, JOB_TYPE, TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, "COMMENT" FROM SYS.ALL_VIRTUAL_BALANCE_JOB_REAL_AGENT )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT JOB_ID, GMT_CREATE AS CREATE_TIME, GMT_MODIFIED AS MODIFY_TIME, BALANCE_STRATEGY_NAME AS BALANCE_STRATEGY, JOB_TYPE, TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, "COMMENT", MAX_END_TIME FROM SYS.ALL_VIRTUAL_BALANCE_JOB_REAL_AGENT )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1810,7 +1810,7 @@ int ObInnerTableSchema::dba_ob_balance_job_history_ora_schema(ObTableSchema &tab table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT JOB_ID, CREATE_TIME, FINISH_TIME, BALANCE_STRATEGY_NAME AS BALANCE_STRATEGY, JOB_TYPE, TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, "COMMENT" FROM SYS.ALL_VIRTUAL_BALANCE_JOB_HISTORY_REAL_AGENT )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT JOB_ID, CREATE_TIME, FINISH_TIME, BALANCE_STRATEGY_NAME AS BALANCE_STRATEGY, JOB_TYPE, TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, "COMMENT", MAX_END_TIME FROM SYS.ALL_VIRTUAL_BALANCE_JOB_HISTORY_REAL_AGENT )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1860,7 +1860,7 @@ int ObInnerTableSchema::dba_ob_balance_tasks_ora_schema(ObTableSchema &table_sch table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TASK_ID, GMT_CREATE AS CREATE_TIME, GMT_MODIFIED AS MODIFY_TIME, TASK_TYPE, SRC_LS, DEST_LS, PART_LIST, FINISHED_PART_LIST, PART_COUNT, FINISHED_PART_COUNT, LS_GROUP_ID, STATUS, PARENT_LIST, CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, "COMMENT" FROM SYS.ALL_VIRTUAL_BALANCE_TASK_REAL_AGENT )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TASK_ID, GMT_CREATE AS CREATE_TIME, GMT_MODIFIED AS MODIFY_TIME, TASK_TYPE, SRC_LS, DEST_LS, PART_LIST, FINISHED_PART_LIST, PART_COUNT, FINISHED_PART_COUNT, LS_GROUP_ID, STATUS, PARENT_LIST, CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, "COMMENT", BALANCE_STRATEGY FROM SYS.ALL_VIRTUAL_BALANCE_TASK_REAL_AGENT )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } @@ -1910,7 +1910,7 @@ int ObInnerTableSchema::dba_ob_balance_task_history_ora_schema(ObTableSchema &ta table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); if (OB_SUCC(ret)) { - if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TASK_ID, CREATE_TIME, FINISH_TIME, TASK_TYPE, SRC_LS, DEST_LS, PART_LIST, FINISHED_PART_LIST, PART_COUNT, FINISHED_PART_COUNT, LS_GROUP_ID, STATUS, PARENT_LIST, CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, "COMMENT" FROM SYS.ALL_VIRTUAL_BALANCE_TASK_HISTORY_REAL_AGENT )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TASK_ID, CREATE_TIME, FINISH_TIME, TASK_TYPE, SRC_LS, DEST_LS, PART_LIST, FINISHED_PART_LIST, PART_COUNT, FINISHED_PART_COUNT, LS_GROUP_ID, STATUS, PARENT_LIST, CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, "COMMENT", BALANCE_STRATEGY FROM SYS.ALL_VIRTUAL_BALANCE_TASK_HISTORY_REAL_AGENT )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } diff --git a/src/share/inner_table/ob_inner_table_schema.401_450.cpp b/src/share/inner_table/ob_inner_table_schema.401_450.cpp index 376adab825..1acec085c2 100644 --- a/src/share/inner_table/ob_inner_table_schema.401_450.cpp +++ b/src/share/inner_table/ob_inner_table_schema.401_450.cpp @@ -5243,6 +5243,22 @@ int ObInnerTableSchema::all_balance_job_schema(ObTableSchema &table_schema) true, //is_nullable false); //is_autoincrement } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA_TS("max_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 + true, //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(ENCODING_ROW_STORE); table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL); @@ -5472,6 +5488,22 @@ int ObInnerTableSchema::all_balance_job_history_schema(ObTableSchema &table_sche false, //is_autoincrement false); //is_on_update_for_timestamp } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA_TS("max_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 + true, //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(ENCODING_ROW_STORE); table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL); @@ -5789,6 +5821,21 @@ int ObInnerTableSchema::all_balance_task_schema(ObTableSchema &table_schema) true, //is_nullable false); //is_autoincrement } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("balance_strategy", //column_name + ++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 + true, //is_nullable + false); //is_autoincrement + } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(ENCODING_ROW_STORE); table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL); @@ -6138,6 +6185,21 @@ int ObInnerTableSchema::all_balance_task_history_schema(ObTableSchema &table_sch false, //is_autoincrement false); //is_on_update_for_timestamp } + + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("balance_strategy", //column_name + ++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 + true, //is_nullable + false); //is_autoincrement + } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(ENCODING_ROW_STORE); table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL); diff --git a/src/share/inner_table/ob_inner_table_schema_def.py b/src/share/inner_table/ob_inner_table_schema_def.py index 746a36804d..50415f7846 100644 --- a/src/share/inner_table/ob_inner_table_schema_def.py +++ b/src/share/inner_table/ob_inner_table_schema_def.py @@ -5438,7 +5438,7 @@ def_table_schema( ], ) -all_balance_job_def= dict( +def_table_schema( owner = 'msy164651', table_name = '__all_balance_job', table_id = '425', @@ -5459,13 +5459,38 @@ all_balance_job_def= dict( ('target_primary_zone_num', 'int', 'false'), ('status', 'varchar:OB_DEFAULT_STATUS_LENTH', 'false'), ('comment', 'longtext', 'true'), + ('max_end_time', 'timestamp', 'true'), ], ) -def_table_schema(**all_balance_job_def) -def_table_schema(**gen_history_table_def_of_task(426, all_balance_job_def)) +def_table_schema( + owner = 'msy164651', + table_name = '__all_balance_job_history', + table_id = '426', + table_type = 'SYSTEM_TABLE', + gm_columns = ['gmt_create', 'gmt_modified'], + rowkey_columns = [ + ('job_id', 'int'), + ], -all_balance_task_def= dict( + in_tenant_space = True, + is_cluster_private = False, + meta_record_in_sys = False, + + normal_columns = [ + ('balance_strategy_name', 'varchar:OB_DEFAULT_STATUS_LENTH', 'false'), + ('job_type', 'varchar:OB_DEFAULT_STATUS_LENTH', 'false'), + ('target_unit_num', 'int', 'false'), + ('target_primary_zone_num', 'int', 'false'), + ('status', 'varchar:OB_DEFAULT_STATUS_LENTH', 'false'), + ('comment', 'longtext', 'true'), + ('create_time', 'timestamp', 'false'), + ('finish_time', 'timestamp', 'false'), + ('max_end_time', 'timestamp', 'true'), + ], +) + +def_table_schema( owner = 'msy164651', table_name = '__all_balance_task', table_id = '427', @@ -5494,11 +5519,44 @@ all_balance_task_def= dict( ('current_transfer_task_id', 'int', 'false'), ('job_id', 'int', 'false'), ('comment', 'longtext', 'true'), + ('balance_strategy', 'varchar:OB_DEFAULT_STATUS_LENTH', 'true'), ], ) -def_table_schema(**all_balance_task_def) -def_table_schema(**gen_history_table_def_of_task(428, all_balance_task_def)) +def_table_schema( + owner = 'msy164651', + table_name = '__all_balance_task_history', + table_id = '428', + table_type = 'SYSTEM_TABLE', + gm_columns = ['gmt_create', 'gmt_modified'], + rowkey_columns = [ + ('task_id', 'int'), + ], + + in_tenant_space = True, + is_cluster_private = False, + meta_record_in_sys = False, + + normal_columns = [ + ('task_type', 'varchar:OB_DEFAULT_STATUS_LENTH', 'false'), + ('src_ls', 'int', 'false'), + ('dest_ls', 'int', 'false'), + ('part_list', 'longtext', 'true'), + ('finished_part_list', 'longtext', 'true'), + ('part_count', 'int', 'true'), + ('finished_part_count', 'int', 'true'), + ('ls_group_id','int', 'false'), + ('status', 'varchar:OB_DEFAULT_STATUS_LENTH', 'false'), + ('parent_list', 'varchar:OB_MAX_SYS_PARAM_VALUE_LENGTH', 'true'), + ('child_list', 'varchar:OB_MAX_SYS_PARAM_VALUE_LENGTH', 'true'), + ('current_transfer_task_id', 'int', 'false'), + ('job_id', 'int', 'false'), + ('comment', 'longtext', 'true'), + ('create_time', 'timestamp', 'false'), + ('finish_time', 'timestamp', 'false'), + ('balance_strategy', 'varchar:OB_DEFAULT_STATUS_LENTH', 'true'), + ], +) def_table_schema( @@ -30762,7 +30820,8 @@ def_table_schema( TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, - COMMENT + COMMENT, + MAX_END_TIME FROM OCEANBASE.__ALL_BALANCE_JOB """.replace("\n", " "), ) @@ -30787,7 +30846,8 @@ def_table_schema( TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, - COMMENT + COMMENT, + MAX_END_TIME FROM OCEANBASE.__ALL_VIRTUAL_BALANCE_JOB """.replace("\n", " "), ) @@ -30811,7 +30871,8 @@ def_table_schema( TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, - COMMENT + COMMENT, + MAX_END_TIME FROM OCEANBASE.__ALL_BALANCE_JOB_HISTORY """.replace("\n", " "), ) @@ -30835,7 +30896,8 @@ def_table_schema( TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, - COMMENT + COMMENT, + MAX_END_TIME FROM OCEANBASE.__ALL_VIRTUAL_BALANCE_JOB_HISTORY """.replace("\n", " "), ) @@ -30867,7 +30929,8 @@ def_table_schema( CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, - COMMENT + COMMENT, + BALANCE_STRATEGY FROM OCEANBASE.__ALL_BALANCE_TASK """.replace("\n", " "), ) @@ -30899,7 +30962,8 @@ def_table_schema( CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, - COMMENT + COMMENT, + BALANCE_STRATEGY FROM OCEANBASE.__ALL_VIRTUAL_BALANCE_TASK """.replace("\n", " "), ) @@ -30931,7 +30995,8 @@ def_table_schema( CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, - COMMENT + COMMENT, + BALANCE_STRATEGY FROM OCEANBASE.__ALL_BALANCE_TASK_HISTORY """.replace("\n", " "), ) @@ -30963,7 +31028,8 @@ def_table_schema( CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, - COMMENT + COMMENT, + BALANCE_STRATEGY FROM OCEANBASE.__ALL_VIRTUAL_BALANCE_TASK_HISTORY """.replace("\n", " "), ) @@ -52047,7 +52113,8 @@ def_table_schema( TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, - "COMMENT" + "COMMENT", + MAX_END_TIME FROM SYS.ALL_VIRTUAL_BALANCE_JOB_REAL_AGENT """.replace("\n", " "), ) @@ -52073,7 +52140,8 @@ def_table_schema( TARGET_UNIT_NUM, TARGET_PRIMARY_ZONE_NUM, STATUS, - "COMMENT" + "COMMENT", + MAX_END_TIME FROM SYS.ALL_VIRTUAL_BALANCE_JOB_HISTORY_REAL_AGENT """.replace("\n", " "), ) @@ -52107,7 +52175,8 @@ def_table_schema( CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, - "COMMENT" + "COMMENT", + BALANCE_STRATEGY FROM SYS.ALL_VIRTUAL_BALANCE_TASK_REAL_AGENT """.replace("\n", " "), ) @@ -52141,7 +52210,8 @@ def_table_schema( CHILD_LIST, CURRENT_TRANSFER_TASK_ID, JOB_ID, - "COMMENT" + "COMMENT", + BALANCE_STRATEGY FROM SYS.ALL_VIRTUAL_BALANCE_TASK_HISTORY_REAL_AGENT """.replace("\n", " "), ) diff --git a/src/share/inner_table/table_id_to_name b/src/share/inner_table/table_id_to_name index 1cbf8f7a11..4a374d8a4d 100644 --- a/src/share/inner_table/table_id_to_name +++ b/src/share/inner_table/table_id_to_name @@ -273,10 +273,8 @@ # 424: __all_transfer_task_history # 425: __all_balance_job # 426: __all_balance_job_history -# 426: __all_balance_job # BASE_TABLE_NAME # 427: __all_balance_task # 428: __all_balance_task_history -# 428: __all_balance_task # BASE_TABLE_NAME # 429: __all_arbitration_service # 430: __all_ls_arb_replica_task # 431: __all_data_dictionary_in_log @@ -921,13 +919,11 @@ # 12344: __all_virtual_balance_job # 12344: __all_balance_job # BASE_TABLE_NAME # 12345: __all_virtual_balance_job_history -# 12345: __all_balance_job # BASE_TABLE_NAME -# 12345: __all_balance_job_history # BASE_TABLE_NAME1 +# 12345: __all_balance_job_history # BASE_TABLE_NAME # 12346: __all_virtual_balance_task # 12346: __all_balance_task # BASE_TABLE_NAME # 12347: __all_virtual_balance_task_history -# 12347: __all_balance_task # BASE_TABLE_NAME -# 12347: __all_balance_task_history # BASE_TABLE_NAME1 +# 12347: __all_balance_task_history # BASE_TABLE_NAME # 12348: __all_virtual_rls_policy # 12348: __all_rls_policy # BASE_TABLE_NAME # 12349: __all_virtual_rls_policy_history @@ -1601,13 +1597,11 @@ # 15377: ALL_VIRTUAL_BALANCE_JOB_REAL_AGENT # 15377: __all_balance_job # BASE_TABLE_NAME # 15378: ALL_VIRTUAL_BALANCE_JOB_HISTORY_REAL_AGENT -# 15378: __all_balance_job # BASE_TABLE_NAME -# 15378: __all_balance_job_history # BASE_TABLE_NAME1 +# 15378: __all_balance_job_history # BASE_TABLE_NAME # 15379: ALL_VIRTUAL_BALANCE_TASK_REAL_AGENT # 15379: __all_balance_task # BASE_TABLE_NAME # 15380: ALL_VIRTUAL_BALANCE_TASK_HISTORY_REAL_AGENT -# 15380: __all_balance_task # BASE_TABLE_NAME -# 15380: __all_balance_task_history # BASE_TABLE_NAME1 +# 15380: __all_balance_task_history # BASE_TABLE_NAME # 15381: ALL_VIRTUAL_TRANSFER_TASK_REAL_AGENT # 15381: __all_transfer_task # BASE_TABLE_NAME # 15382: ALL_VIRTUAL_TRANSFER_TASK_HISTORY_REAL_AGENT diff --git a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_mysql.result b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_mysql.result index cfccb33de6..1f59af6cd4 100644 --- a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_mysql.result +++ b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_mysql.result @@ -5155,6 +5155,7 @@ TARGET_UNIT_NUM bigint(20) NO NULL TARGET_PRIMARY_ZONE_NUM bigint(20) NO NULL STATUS varchar(64) NO NULL COMMENT longtext YES NULL +MAX_END_TIME timestamp(6) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.DBA_OB_BALANCE_JOBS limit 1); cnt 1 @@ -5169,6 +5170,7 @@ TARGET_UNIT_NUM bigint(20) NO NULL TARGET_PRIMARY_ZONE_NUM bigint(20) NO NULL STATUS varchar(64) NO NULL COMMENT longtext YES NULL +MAX_END_TIME timestamp(6) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.DBA_OB_BALANCE_JOB_HISTORY limit 1); cnt 1 @@ -5191,6 +5193,7 @@ CHILD_LIST varchar(1024) YES NULL CURRENT_TRANSFER_TASK_ID bigint(20) NO NULL JOB_ID bigint(20) NO NULL COMMENT longtext YES NULL +BALANCE_STRATEGY varchar(64) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.DBA_OB_BALANCE_TASKS limit 1); cnt 1 @@ -5213,6 +5216,7 @@ CHILD_LIST varchar(1024) YES NULL CURRENT_TRANSFER_TASK_ID bigint(20) NO NULL JOB_ID bigint(20) NO NULL COMMENT longtext YES NULL +BALANCE_STRATEGY varchar(64) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.DBA_OB_BALANCE_TASK_HISTORY limit 1); cnt 1 diff --git a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_sys.result b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_sys.result index f392681715..895bc42f31 100644 --- a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_sys.result +++ b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_sys.result @@ -7167,6 +7167,7 @@ TARGET_UNIT_NUM bigint(20) NO NULL TARGET_PRIMARY_ZONE_NUM bigint(20) NO NULL STATUS varchar(64) NO NULL COMMENT longtext YES NULL +MAX_END_TIME timestamp(6) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.DBA_OB_BALANCE_JOBS limit 1); cnt 1 @@ -7182,6 +7183,7 @@ TARGET_UNIT_NUM bigint(20) NO NULL TARGET_PRIMARY_ZONE_NUM bigint(20) NO NULL STATUS varchar(64) NO NULL COMMENT longtext YES NULL +MAX_END_TIME timestamp(6) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.CDB_OB_BALANCE_JOBS limit 1); cnt 1 @@ -7196,6 +7198,7 @@ TARGET_UNIT_NUM bigint(20) NO NULL TARGET_PRIMARY_ZONE_NUM bigint(20) NO NULL STATUS varchar(64) NO NULL COMMENT longtext YES NULL +MAX_END_TIME timestamp(6) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.DBA_OB_BALANCE_JOB_HISTORY limit 1); cnt 1 @@ -7211,6 +7214,7 @@ TARGET_UNIT_NUM bigint(20) NO NULL TARGET_PRIMARY_ZONE_NUM bigint(20) NO NULL STATUS varchar(64) NO NULL COMMENT longtext YES NULL +MAX_END_TIME timestamp(6) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.CDB_OB_BALANCE_JOB_HISTORY limit 1); cnt 1 @@ -7233,6 +7237,7 @@ CHILD_LIST varchar(1024) YES NULL CURRENT_TRANSFER_TASK_ID bigint(20) NO NULL JOB_ID bigint(20) NO NULL COMMENT longtext YES NULL +BALANCE_STRATEGY varchar(64) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.DBA_OB_BALANCE_TASKS limit 1); cnt 1 @@ -7256,6 +7261,7 @@ CHILD_LIST varchar(1024) YES NULL CURRENT_TRANSFER_TASK_ID bigint(20) NO NULL JOB_ID bigint(20) NO NULL COMMENT longtext YES NULL +BALANCE_STRATEGY varchar(64) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.CDB_OB_BALANCE_TASKS limit 1); cnt 1 @@ -7278,6 +7284,7 @@ CHILD_LIST varchar(1024) YES NULL CURRENT_TRANSFER_TASK_ID bigint(20) NO NULL JOB_ID bigint(20) NO NULL COMMENT longtext YES NULL +BALANCE_STRATEGY varchar(64) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.DBA_OB_BALANCE_TASK_HISTORY limit 1); cnt 1 @@ -7301,6 +7308,7 @@ CHILD_LIST varchar(1024) YES NULL CURRENT_TRANSFER_TASK_ID bigint(20) NO NULL JOB_ID bigint(20) NO NULL COMMENT longtext YES NULL +BALANCE_STRATEGY varchar(64) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.CDB_OB_BALANCE_TASK_HISTORY limit 1); cnt 1 diff --git a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_sys.result b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_sys.result index 2036ee6c7d..3c7dce84a8 100644 --- a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_sys.result +++ b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_sys.result @@ -7512,6 +7512,7 @@ target_unit_num bigint(20) NO NULL target_primary_zone_num bigint(20) NO NULL status varchar(64) NO NULL comment longtext YES NULL +max_end_time timestamp(6) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_balance_job; IF(count(*) >= 0, 1, 0) 1 @@ -7529,6 +7530,7 @@ status varchar(64) NO NULL comment longtext YES NULL create_time timestamp(6) NO NULL finish_time timestamp(6) NO NULL +max_end_time timestamp(6) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_balance_job_history; IF(count(*) >= 0, 1, 0) 1 @@ -7552,6 +7554,7 @@ child_list varchar(1024) YES NULL current_transfer_task_id bigint(20) NO NULL job_id bigint(20) NO NULL comment longtext YES NULL +balance_strategy varchar(64) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_balance_task; IF(count(*) >= 0, 1, 0) 1 @@ -7577,6 +7580,7 @@ job_id bigint(20) NO NULL comment longtext YES NULL create_time timestamp(6) NO NULL finish_time timestamp(6) NO NULL +balance_strategy varchar(64) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_balance_task_history; IF(count(*) >= 0, 1, 0) 1