From a19186c6bc21bc1761a63a4f39a76933a0741254 Mon Sep 17 00:00:00 2001 From: obdev Date: Wed, 25 Dec 2024 09:15:25 +0000 Subject: [PATCH] occupy for func_type column of __all_tenant_scheduler_job --- .../ob_inner_table_schema.12251_12300.cpp | 19 +++++++++++++++++++ .../ob_inner_table_schema.15201_15250.cpp | 15 +++++++++++++++ .../ob_inner_table_schema.351_400.cpp | 19 +++++++++++++++++++ .../inner_table/ob_inner_table_schema_def.py | 3 ++- .../r/mysql/desc_virtual_table_in_sys.result | 1 + 5 files changed, 56 insertions(+), 1 deletion(-) diff --git a/src/share/inner_table/ob_inner_table_schema.12251_12300.cpp b/src/share/inner_table/ob_inner_table_schema.12251_12300.cpp index 8d52bd06f..f6956d285 100644 --- a/src/share/inner_table/ob_inner_table_schema.12251_12300.cpp +++ b/src/share/inner_table/ob_inner_table_schema.12251_12300.cpp @@ -4240,6 +4240,25 @@ int ObInnerTableSchema::all_virtual_tenant_scheduler_job_schema(ObTableSchema &t max_failures_default, max_failures_default); //default_value } + + if (OB_SUCC(ret)) { + ObObj func_type_default; + func_type_default.set_int(0); + ADD_COLUMN_SCHEMA_T("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 + func_type_default, + func_type_default); //default_value + } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(ENCODING_ROW_STORE); table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL); diff --git a/src/share/inner_table/ob_inner_table_schema.15201_15250.cpp b/src/share/inner_table/ob_inner_table_schema.15201_15250.cpp index 134238fb2..4643c31e9 100644 --- a/src/share/inner_table/ob_inner_table_schema.15201_15250.cpp +++ b/src/share/inner_table/ob_inner_table_schema.15201_15250.cpp @@ -1019,6 +1019,21 @@ int ObInnerTableSchema::all_virtual_tenant_scheduler_job_real_agent_ora_schema(O false); //is_autoincrement } + if (OB_SUCC(ret)) { + ADD_COLUMN_SCHEMA("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 + 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.351_400.cpp b/src/share/inner_table/ob_inner_table_schema.351_400.cpp index d56c538d8..28f619698 100644 --- a/src/share/inner_table/ob_inner_table_schema.351_400.cpp +++ b/src/share/inner_table/ob_inner_table_schema.351_400.cpp @@ -9031,6 +9031,25 @@ int ObInnerTableSchema::all_tenant_scheduler_job_schema(ObTableSchema &table_sch max_failures_default, max_failures_default); //default_value } + + if (OB_SUCC(ret)) { + ObObj func_type_default; + func_type_default.set_int(0); + ADD_COLUMN_SCHEMA_T("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 + func_type_default, + func_type_default); //default_value + } table_schema.set_index_using_type(USING_BTREE); table_schema.set_row_store_type(ENCODING_ROW_STORE); table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL); diff --git a/src/share/inner_table/ob_inner_table_schema_def.py b/src/share/inner_table/ob_inner_table_schema_def.py index 59dfa481e..a7bbd8649 100755 --- a/src/share/inner_table/ob_inner_table_schema_def.py +++ b/src/share/inner_table/ob_inner_table_schema_def.py @@ -4442,7 +4442,8 @@ def_table_schema( ('interval_ts', 'int', 'true'), ('user_id', 'int', 'true', 'OB_INVALID_ID'), ('database_id', 'int', 'true', 'OB_INVALID_ID'), - ('max_failures', 'int', 'true', '0') + ('max_failures', 'int', 'true', '0'), + ('func_type', 'int', 'true', '0') ], ) diff --git a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_sys.result b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_sys.result index ee8b1f3a3..d49d34d44 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 @@ -6374,6 +6374,7 @@ interval_ts bigint(20) YES NULL user_id bigint(20) YES -1 database_id bigint(20) YES -1 max_failures bigint(20) YES 0 +func_type bigint(20) YES 0 select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_tenant_scheduler_job; IF(count(*) >= 0, 1, 0) 1