From 3b059c708340798adb482815c7f848444d8b274c Mon Sep 17 00:00:00 2001 From: obdev Date: Wed, 7 Feb 2024 09:35:12 +0000 Subject: [PATCH] fix: upgrade failed from 421 to master --- .../ob_inner_table_schema.12251_12300.cpp | 6 +++--- .../ob_inner_table_schema.15201_15250.cpp | 6 +++--- .../ob_inner_table_schema.21251_21300.cpp | 2 +- .../ob_inner_table_schema.25201_25250.cpp | 2 +- .../ob_inner_table_schema.28101_28150.cpp | 2 +- .../inner_table/ob_inner_table_schema.351_400.cpp | 6 +++--- src/share/inner_table/ob_inner_table_schema_def.py | 12 ++++++------ .../r/mysql/desc_virtual_table_in_sys.result | 6 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) 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 36db008316..300197c153 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 @@ -3628,7 +3628,7 @@ int ObInnerTableSchema::all_virtual_tenant_scheduler_job_schema(ObTableSchema &t 0, //part_key_pos ObVarcharType, //column_type CS_TYPE_INVALID, //column_collation_type - 200, //column_length + 4000, //column_length -1, //column_precision -1, //column_scale false, //is_nullable @@ -3816,7 +3816,7 @@ int ObInnerTableSchema::all_virtual_tenant_scheduler_job_schema(ObTableSchema &t 0, //part_key_pos ObVarcharType, //column_type CS_TYPE_INVALID, //column_collation_type - 128, //column_length + 4000, //column_length -1, //column_precision -1, //column_scale true, //is_nullable @@ -3862,7 +3862,7 @@ int ObInnerTableSchema::all_virtual_tenant_scheduler_job_schema(ObTableSchema &t 0, //part_key_pos ObVarcharType, //column_type CS_TYPE_INVALID, //column_collation_type - 128, //column_length + 4000, //column_length -1, //column_precision -1, //column_scale true, //is_nullable 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 703e983c08..84dd14e8b8 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 @@ -545,7 +545,7 @@ int ObInnerTableSchema::all_virtual_tenant_scheduler_job_real_agent_ora_schema(O 0, //part_key_pos ObVarcharType, //column_type CS_TYPE_UTF8MB4_BIN, //column_collation_type - 200, //column_length + 4000, //column_length 2, //column_precision -1, //column_scale false, //is_nullable @@ -725,7 +725,7 @@ int ObInnerTableSchema::all_virtual_tenant_scheduler_job_real_agent_ora_schema(O 0, //part_key_pos ObVarcharType, //column_type CS_TYPE_UTF8MB4_BIN, //column_collation_type - 128, //column_length + 4000, //column_length 2, //column_precision -1, //column_scale true, //is_nullable @@ -770,7 +770,7 @@ int ObInnerTableSchema::all_virtual_tenant_scheduler_job_real_agent_ora_schema(O 0, //part_key_pos ObVarcharType, //column_type CS_TYPE_UTF8MB4_BIN, //column_collation_type - 128, //column_length + 4000, //column_length 2, //column_precision -1, //column_scale true, //is_nullable diff --git a/src/share/inner_table/ob_inner_table_schema.21251_21300.cpp b/src/share/inner_table/ob_inner_table_schema.21251_21300.cpp index 28f9eb0e18..3df718c6f1 100644 --- a/src/share/inner_table/ob_inner_table_schema.21251_21300.cpp +++ b/src/share/inner_table/ob_inner_table_schema.21251_21300.cpp @@ -1160,7 +1160,7 @@ int ObInnerTableSchema::dba_scheduler_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 CAST(T.POWNER AS CHAR(128)) AS OWNER, CAST(T.JOB_NAME AS CHAR(128)) AS JOB_NAME, CAST(NULL AS CHAR(128)) AS JOB_SUBNAME, CAST(T.JOB_STYLE AS CHAR(17)) AS JOB_STYLE, CAST(NULL AS CHAR(128)) AS JOB_CREATOR, CAST(NULL AS CHAR(65)) AS CLIENT_ID, CAST(NULL AS CHAR(33)) AS GLOBAL_UID, CAST(T.POWNER AS CHAR(4000)) AS PROGRAM_OWNER, CAST(T.PROGRAM_NAME AS CHAR(4000)) AS PROGRAM_NAME, CAST(T.JOB_TYPE AS CHAR(16)) AS JOB_TYPE, CAST(T.JOB_ACTION AS CHAR(4000)) AS JOB_ACTION, CAST(T.NUMBER_OF_ARGUMENT AS SIGNED) AS NUMBER_OF_ARGUMENTS, CAST(NULL AS CHAR(4000)) AS SCHEDULE_OWNER, CAST(NULL AS CHAR(4000)) AS SCHEDULE_NAME, CAST(NULL AS CHAR(12)) AS SCHEDULE_TYPE, CAST(T.START_DATE AS DATETIME(6)) AS START_DATE, CAST(T.REPEAT_INTERVAL AS CHAR(4000)) AS REPEAT_INTERVAL, CAST(NULL AS CHAR(128)) AS EVENT_QUEUE_OWNER, CAST(NULL AS CHAR(128)) AS EVENT_QUEUE_NAME, CAST(NULL AS CHAR(523)) AS EVENT_QUEUE_AGENT, CAST(NULL AS CHAR(4000)) AS EVENT_CONDITION, CAST(NULL AS CHAR(261)) AS EVENT_RULE, CAST(NULL AS CHAR(261)) AS FILE_WATCHER_OWNER, CAST(NULL AS CHAR(261)) AS FILE_WATCHER_NAME, CAST(T.END_DATE AS DATETIME(6)) AS END_DATE, CAST(T.JOB_CLASS AS CHAR(128)) AS JOB_CLASS, CAST(T.ENABLED AS CHAR(5)) AS ENABLED, CAST(T.AUTO_DROP AS CHAR(5)) AS AUTO_DROP, CAST(NULL AS CHAR(5)) AS RESTART_ON_RECOVERY, CAST(NULL AS CHAR(5)) AS RESTART_ON_FAILURE, CAST(T.STATE AS CHAR(15)) AS STATE, CAST(NULL AS SIGNED) AS JOB_PRIORITY, CAST(T.RUN_COUNT AS SIGNED) AS RUN_COUNT, CAST(NULL AS SIGNED) AS MAX_RUNS, CAST(T.FAILURES AS SIGNED) AS FAILURE_COUNT, CAST(NULL AS SIGNED) AS MAX_FAILURES, CAST(T.RETRY_COUNT AS SIGNED) AS RETRY_COUNT, CAST(T.LAST_DATE AS DATETIME(6)) AS LAST_START_DATE, CAST(T.LAST_RUN_DURATION AS SIGNED) AS LAST_RUN_DURATION, CAST(T.NEXT_DATE AS DATETIME(6)) AS NEXT_RUN_DATE, CAST(NULL AS SIGNED) AS SCHEDULE_LIMIT, CAST(T.MAX_RUN_DURATION AS SIGNED) AS MAX_RUN_DURATION, CAST(NULL AS CHAR(11)) AS LOGGING_LEVEL, CAST(NULL AS CHAR(5)) AS STORE_OUTPUT, CAST(NULL AS CHAR(5)) AS STOP_ON_WINDOW_CLOSE, CAST(NULL AS CHAR(5)) AS INSTANCE_STICKINESS, CAST(NULL AS CHAR(4000)) AS RAISE_EVENTS, CAST(NULL AS CHAR(5)) AS SYSTEM, CAST(NULL AS SIGNED) AS JOB_WEIGHT, CAST(T.NLSENV AS CHAR(4000)) AS NLS_ENV, CAST(NULL AS CHAR(128)) AS SOURCE, CAST(NULL AS SIGNED) AS NUMBER_OF_DESTINATIONS, CAST(NULL AS CHAR(261)) AS DESTINATION_OWNER, CAST(NULL AS CHAR(261)) AS DESTINATION, CAST(NULL AS CHAR(128)) AS CREDENTIAL_OWNER, CAST(NULL AS CHAR(128)) AS CREDENTIAL_NAME, CAST(T.FIELD1 AS SIGNED) AS INSTANCE_ID, CAST(NULL AS CHAR(5)) AS DEFERRED_DROP, CAST(NULL AS CHAR(5)) AS ALLOW_RUNS_IN_RESTRICTED_MODE, CAST(T.COMMENTS AS CHAR(4000)) AS COMMENTS, CAST(T.FLAG AS SIGNED) AS FLAGS, CAST(NULL AS CHAR(5)) AS RESTARTABLE, CAST(NULL AS CHAR(128)) AS CONNECT_CREDENTIAL_OWNER, CAST(NULL AS CHAR(128)) AS CONNECT_CREDENTIAL_NAME FROM oceanbase.__all_tenant_scheduler_job T WHERE T.JOB_NAME != '__dummy_guard' )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(T.POWNER AS CHAR(128)) AS OWNER, CAST(T.JOB_NAME AS CHAR(128)) AS JOB_NAME, CAST(NULL AS CHAR(128)) AS JOB_SUBNAME, CAST(T.JOB_STYLE AS CHAR(17)) AS JOB_STYLE, CAST(NULL AS CHAR(128)) AS JOB_CREATOR, CAST(NULL AS CHAR(65)) AS CLIENT_ID, CAST(NULL AS CHAR(33)) AS GLOBAL_UID, CAST(T.POWNER AS CHAR(4000)) AS PROGRAM_OWNER, CAST(T.PROGRAM_NAME AS CHAR(4000)) AS PROGRAM_NAME, CAST(T.JOB_TYPE AS CHAR(16)) AS JOB_TYPE, CAST(T.JOB_ACTION AS CHAR(4000)) AS JOB_ACTION, CAST(T.NUMBER_OF_ARGUMENT AS SIGNED) AS NUMBER_OF_ARGUMENTS, CAST(NULL AS CHAR(4000)) AS SCHEDULE_OWNER, CAST(NULL AS CHAR(4000)) AS SCHEDULE_NAME, CAST(NULL AS CHAR(12)) AS SCHEDULE_TYPE, CAST(T.START_DATE AS DATETIME(6)) AS START_DATE, CAST(T.REPEAT_INTERVAL AS CHAR(4000)) AS REPEAT_INTERVAL, CAST(NULL AS CHAR(128)) AS EVENT_QUEUE_OWNER, CAST(NULL AS CHAR(128)) AS EVENT_QUEUE_NAME, CAST(NULL AS CHAR(523)) AS EVENT_QUEUE_AGENT, CAST(NULL AS CHAR(4000)) AS EVENT_CONDITION, CAST(NULL AS CHAR(261)) AS EVENT_RULE, CAST(NULL AS CHAR(261)) AS FILE_WATCHER_OWNER, CAST(NULL AS CHAR(261)) AS FILE_WATCHER_NAME, CAST(T.END_DATE AS DATETIME(6)) AS END_DATE, CAST(T.JOB_CLASS AS CHAR(128)) AS JOB_CLASS, CAST(T.ENABLED AS CHAR(5)) AS ENABLED, CAST(T.AUTO_DROP AS CHAR(5)) AS AUTO_DROP, CAST(NULL AS CHAR(5)) AS RESTART_ON_RECOVERY, CAST(NULL AS CHAR(5)) AS RESTART_ON_FAILURE, CAST(T.STATE AS CHAR(15)) AS STATE, CAST(NULL AS SIGNED) AS JOB_PRIORITY, CAST(T.RUN_COUNT AS SIGNED) AS RUN_COUNT, CAST(NULL AS SIGNED) AS MAX_RUNS, CAST(T.FAILURES AS SIGNED) AS FAILURE_COUNT, CAST(NULL AS SIGNED) AS MAX_FAILURES, CAST(T.RETRY_COUNT AS SIGNED) AS RETRY_COUNT, CAST(T.LAST_DATE AS DATETIME(6)) AS LAST_START_DATE, CAST(T.LAST_RUN_DURATION AS SIGNED) AS LAST_RUN_DURATION, CAST(T.NEXT_DATE AS DATETIME(6)) AS NEXT_RUN_DATE, CAST(NULL AS SIGNED) AS SCHEDULE_LIMIT, CAST(T.MAX_RUN_DURATION AS SIGNED) AS MAX_RUN_DURATION, CAST(NULL AS CHAR(11)) AS LOGGING_LEVEL, CAST(NULL AS CHAR(5)) AS STORE_OUTPUT, CAST(NULL AS CHAR(5)) AS STOP_ON_WINDOW_CLOSE, CAST(NULL AS CHAR(5)) AS INSTANCE_STICKINESS, CAST(NULL AS CHAR(4000)) AS RAISE_EVENTS, CAST(NULL AS CHAR(5)) AS SYSTEM, CAST(NULL AS SIGNED) AS JOB_WEIGHT, CAST(T.NLSENV AS CHAR(4000)) AS NLS_ENV, CAST(NULL AS CHAR(128)) AS SOURCE, CAST(NULL AS SIGNED) AS NUMBER_OF_DESTINATIONS, CAST(NULL AS CHAR(261)) AS DESTINATION_OWNER, CAST(NULL AS CHAR(261)) AS DESTINATION, CAST(NULL AS CHAR(128)) AS CREDENTIAL_OWNER, CAST(NULL AS CHAR(128)) AS CREDENTIAL_NAME, CAST(T.FIELD1 AS SIGNED) AS INSTANCE_ID, CAST(NULL AS CHAR(5)) AS DEFERRED_DROP, CAST(NULL AS CHAR(5)) AS ALLOW_RUNS_IN_RESTRICTED_MODE, CAST(T.COMMENTS AS CHAR(4000)) AS COMMENTS, CAST(T.FLAG AS SIGNED) AS FLAGS, CAST(NULL AS CHAR(5)) AS RESTARTABLE, CAST(NULL AS CHAR(128)) AS CONNECT_CREDENTIAL_OWNER, CAST(NULL AS CHAR(128)) AS CONNECT_CREDENTIAL_NAME FROM oceanbase.__all_tenant_scheduler_job T WHERE T.JOB_NAME != '__dummy_guard' and T.JOB > 0 )__"))) { 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 a3c360892b..7f0cfd8005 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 @@ -210,7 +210,7 @@ int ObInnerTableSchema::all_scheduler_windows_ora_schema(ObTableSchema &table_sc 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 CAST(T.POWNER AS VARCHAR2(128)) AS OWNER, CAST(T.JOB_NAME AS VARCHAR2(128)) AS WINDOW_NAME, CAST(NULL AS VARCHAR2(128)) AS RESOURCE_PLAN, CAST(NULL AS VARCHAR2(4000)) AS SCHEDULE_OWNER, CAST(NULL AS VARCHAR2(4000)) AS SCHEDULE_NAME, CAST(NULL AS VARCHAR2(8)) AS SCHEDULE_TYPE, CAST(T.START_DATE AS TIMESTAMP(6) WITH TIME ZONE) AS START_DATE, CAST(T.REPEAT_INTERVAL AS VARCHAR2(4000)) AS REPEAT_INTERVAL, CAST(T.END_DATE AS TIMESTAMP(6) WITH TIME ZONE) AS END_DATE, CAST((TIMESTAMP'1970-01-01 08:00:00' + T.MAX_RUN_DURATION / (60 * 60 * 24) - TIMESTAMP'1970-01-01 08:00:00') AS INTERVAL DAY(3) TO SECOND(0)) AS DURATION, CAST(NULL AS VARCHAR2(4)) AS WINDOW_PRIORITY, CAST(T.NEXT_DATE AS TIMESTAMP(6) WITH TIME ZONE) AS NEXT_RUN_DATE, CAST(T.LAST_DATE AS TIMESTAMP(6) WITH TIME ZONE) AS LAST_START_DATE, CAST(T.ENABLED AS VARCHAR2(5)) AS ENABLED, CAST(NULL AS VARCHAR2(5)) AS ACTIVE, CAST(NULL AS TIMESTAMP(6) WITH TIME ZONE) AS MANUAL_OPEN_TIME, CAST(NULL AS INTERVAL DAY(3) TO SECOND(0)) AS MANUAL_DURATION, CAST(T.COMMENTS AS VARCHAR2(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_TENANT_SCHEDULER_JOB_REAL_AGENT T WHERE T.JOB_NAME in ('MONDAY_WINDOW', 'TUESDAY_WINDOW', 'WEDNESDAY_WINDOW', 'THURSDAY_WINDOW', 'FRIDAY_WINDOW', 'SATURDAY_WINDOW', 'SUNDAY_WINDOW') )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(T.POWNER AS VARCHAR2(128)) AS OWNER, CAST(T.JOB_NAME AS VARCHAR2(128)) AS WINDOW_NAME, CAST(NULL AS VARCHAR2(128)) AS RESOURCE_PLAN, CAST(NULL AS VARCHAR2(4000)) AS SCHEDULE_OWNER, CAST(NULL AS VARCHAR2(4000)) AS SCHEDULE_NAME, CAST(NULL AS VARCHAR2(8)) AS SCHEDULE_TYPE, CAST(T.START_DATE AS TIMESTAMP(6) WITH TIME ZONE) AS START_DATE, CAST(T.REPEAT_INTERVAL AS VARCHAR2(4000)) AS REPEAT_INTERVAL, CAST(T.END_DATE AS TIMESTAMP(6) WITH TIME ZONE) AS END_DATE, CAST((TIMESTAMP'1970-01-01 08:00:00' + T.MAX_RUN_DURATION / (60 * 60 * 24) - TIMESTAMP'1970-01-01 08:00:00') AS INTERVAL DAY(3) TO SECOND(0)) AS DURATION, CAST(NULL AS VARCHAR2(4)) AS WINDOW_PRIORITY, CAST(T.NEXT_DATE AS TIMESTAMP(6) WITH TIME ZONE) AS NEXT_RUN_DATE, CAST(T.LAST_DATE AS TIMESTAMP(6) WITH TIME ZONE) AS LAST_START_DATE, CAST(T.ENABLED AS VARCHAR2(5)) AS ENABLED, CAST(NULL AS VARCHAR2(5)) AS ACTIVE, CAST(NULL AS TIMESTAMP(6) WITH TIME ZONE) AS MANUAL_OPEN_TIME, CAST(NULL AS INTERVAL DAY(3) TO SECOND(0)) AS MANUAL_DURATION, CAST(T.COMMENTS AS VARCHAR2(4000)) AS COMMENTS FROM SYS.ALL_VIRTUAL_TENANT_SCHEDULER_JOB_REAL_AGENT T WHERE T.JOB > 0 AND T.JOB_NAME in ('MONDAY_WINDOW', 'TUESDAY_WINDOW', 'WEDNESDAY_WINDOW', 'THURSDAY_WINDOW', 'FRIDAY_WINDOW', 'SATURDAY_WINDOW', 'SUNDAY_WINDOW') )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } diff --git a/src/share/inner_table/ob_inner_table_schema.28101_28150.cpp b/src/share/inner_table/ob_inner_table_schema.28101_28150.cpp index 580cd3a742..de44df7952 100644 --- a/src/share/inner_table/ob_inner_table_schema.28101_28150.cpp +++ b/src/share/inner_table/ob_inner_table_schema.28101_28150.cpp @@ -560,7 +560,7 @@ int ObInnerTableSchema::dba_scheduler_jobs_ora_schema(ObTableSchema &table_schem 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 CAST(T.POWNER AS VARCHAR2(128)) AS OWNER, CAST(T.JOB_NAME AS VARCHAR2(128)) AS JOB_NAME, CAST(NULL AS VARCHAR2(128)) AS JOB_SUBNAME, CAST(T.JOB_STYLE AS VARCHAR2(17)) AS JOB_STYLE, CAST(NULL AS VARCHAR2(128)) AS JOB_CREATOR, CAST(NULL AS VARCHAR2(65)) AS CLIENT_ID, CAST(NULL AS VARCHAR2(33)) AS GLOBAL_UID, CAST(T.POWNER AS VARCHAR2(4000)) AS PROGRAM_OWNER, CAST(T.PROGRAM_NAME AS VARCHAR2(4000)) AS PROGRAM_NAME, CAST(T.JOB_TYPE AS VARCHAR2(16)) AS JOB_TYPE, CAST(T.JOB_ACTION AS VARCHAR2(4000)) AS JOB_ACTION, CAST(T.NUMBER_OF_ARGUMENT AS NUMBER) AS NUMBER_OF_ARGUMENTS, CAST(NULL AS VARCHAR2(4000)) AS SCHEDULE_OWNER, CAST(NULL AS VARCHAR2(4000)) AS SCHEDULE_NAME, CAST(NULL AS VARCHAR2(12)) AS SCHEDULE_TYPE, CAST(T.START_DATE AS TIMESTAMP(6) WITH TIME ZONE) AS START_DATE, CAST(T.REPEAT_INTERVAL AS VARCHAR2(4000)) AS REPEAT_INTERVAL, CAST(NULL AS VARCHAR2(128)) AS EVENT_QUEUE_OWNER, CAST(NULL AS VARCHAR2(128)) AS EVENT_QUEUE_NAME, CAST(NULL AS VARCHAR2(523)) AS EVENT_QUEUE_AGENT, CAST(NULL AS VARCHAR2(4000)) AS EVENT_CONDITION, CAST(NULL AS VARCHAR2(261)) AS EVENT_RULE, CAST(NULL AS VARCHAR2(261)) AS FILE_WATCHER_OWNER, CAST(NULL AS VARCHAR2(261)) AS FILE_WATCHER_NAME, CAST(T.END_DATE AS TIMESTAMP(6) WITH TIME ZONE) AS END_DATE, CAST(T.JOB_CLASS AS VARCHAR2(128)) AS JOB_CLASS, CAST(T.ENABLED AS VARCHAR2(5)) AS ENABLED, CAST(T.AUTO_DROP AS VARCHAR2(5)) AS AUTO_DROP, CAST(NULL AS VARCHAR2(5)) AS RESTART_ON_RECOVERY, CAST(NULL AS VARCHAR2(5)) AS RESTART_ON_FAILURE, CAST(T.STATE AS VARCHAR2(15)) AS STATE, CAST(NULL AS NUMBER) AS JOB_PRIORITY, CAST(T.RUN_COUNT AS NUMBER) AS RUN_COUNT, CAST(NULL AS NUMBER) AS MAX_RUNS, CAST(T.FAILURES AS NUMBER) AS FAILURE_COUNT, CAST(NULL AS NUMBER) AS MAX_FAILURES, CAST(T.RETRY_COUNT AS NUMBER) AS RETRY_COUNT, CAST(T.LAST_DATE AS TIMESTAMP(6) WITH TIME ZONE) AS LAST_START_DATE, CAST((TIMESTAMP'1970-01-01 08:00:00' + T.MAX_RUN_DURATION / (60 * 60 * 24) - TIMESTAMP'1970-01-01 08:00:00') AS INTERVAL DAY(9) TO SECOND(6)) AS LAST_RUN_DURATION, CAST(T.NEXT_DATE AS TIMESTAMP(6) WITH TIME ZONE) AS NEXT_RUN_DATE, CAST(NULL AS INTERVAL DAY(3) TO SECOND(0)) AS SCHEDULE_LIMIT, CAST((TIMESTAMP'1970-01-01 08:00:00' + T.MAX_RUN_DURATION / (60 * 60 * 24) - TIMESTAMP'1970-01-01 08:00:00') AS INTERVAL DAY(3) TO SECOND(0)) AS MAX_RUN_DURATION, CAST(NULL AS VARCHAR2(11)) AS LOGGING_LEVEL, CAST(NULL AS VARCHAR2(5)) AS STORE_OUTPUT, CAST(NULL AS VARCHAR2(5)) AS STOP_ON_WINDOW_CLOSE, CAST(NULL AS VARCHAR2(5)) AS INSTANCE_STICKINESS, CAST(NULL AS VARCHAR2(4000)) AS RAISE_EVENTS, CAST(NULL AS VARCHAR2(5)) AS SYSTEM, CAST(NULL AS NUMBER) AS JOB_WEIGHT, CAST(T.NLSENV AS VARCHAR2(4000)) AS NLS_ENV, CAST(NULL AS VARCHAR2(128)) AS SOURCE, CAST(NULL AS NUMBER) AS NUMBER_OF_DESTINATIONS, CAST(NULL AS VARCHAR2(261)) AS DESTINATION_OWNER, CAST(NULL AS VARCHAR2(261)) AS DESTINATION, CAST(NULL AS VARCHAR2(128)) AS CREDENTIAL_OWNER, CAST(NULL AS VARCHAR2(128)) AS CREDENTIAL_NAME, CAST(T.FIELD1 AS NUMBER) AS INSTANCE_ID, CAST(NULL AS VARCHAR2(5)) AS DEFERRED_DROP, CAST(NULL AS VARCHAR2(5)) AS ALLOW_RUNS_IN_RESTRICTED_MODE, CAST(T.COMMENTS AS VARCHAR2(4000)) AS COMMENTS, CAST(T.FLAG AS NUMBER) AS FLAGS, CAST(NULL AS VARCHAR2(5)) AS RESTARTABLE, CAST(NULL AS VARCHAR2(128)) AS CONNECT_CREDENTIAL_OWNER, CAST(NULL AS VARCHAR2(128)) AS CONNECT_CREDENTIAL_NAME FROM SYS.ALL_VIRTUAL_TENANT_SCHEDULER_JOB_REAL_AGENT T WHERE T.JOB_NAME != '__dummy_guard' )__"))) { + if (OB_FAIL(table_schema.set_view_definition(R"__(SELECT CAST(T.POWNER AS VARCHAR2(128)) AS OWNER, CAST(T.JOB_NAME AS VARCHAR2(128)) AS JOB_NAME, CAST(NULL AS VARCHAR2(128)) AS JOB_SUBNAME, CAST(T.JOB_STYLE AS VARCHAR2(17)) AS JOB_STYLE, CAST(NULL AS VARCHAR2(128)) AS JOB_CREATOR, CAST(NULL AS VARCHAR2(65)) AS CLIENT_ID, CAST(NULL AS VARCHAR2(33)) AS GLOBAL_UID, CAST(T.POWNER AS VARCHAR2(4000)) AS PROGRAM_OWNER, CAST(T.PROGRAM_NAME AS VARCHAR2(4000)) AS PROGRAM_NAME, CAST(T.JOB_TYPE AS VARCHAR2(16)) AS JOB_TYPE, CAST(T.JOB_ACTION AS VARCHAR2(4000)) AS JOB_ACTION, CAST(T.NUMBER_OF_ARGUMENT AS NUMBER) AS NUMBER_OF_ARGUMENTS, CAST(NULL AS VARCHAR2(4000)) AS SCHEDULE_OWNER, CAST(NULL AS VARCHAR2(4000)) AS SCHEDULE_NAME, CAST(NULL AS VARCHAR2(12)) AS SCHEDULE_TYPE, CAST(T.START_DATE AS TIMESTAMP(6) WITH TIME ZONE) AS START_DATE, CAST(T.REPEAT_INTERVAL AS VARCHAR2(4000)) AS REPEAT_INTERVAL, CAST(NULL AS VARCHAR2(128)) AS EVENT_QUEUE_OWNER, CAST(NULL AS VARCHAR2(128)) AS EVENT_QUEUE_NAME, CAST(NULL AS VARCHAR2(523)) AS EVENT_QUEUE_AGENT, CAST(NULL AS VARCHAR2(4000)) AS EVENT_CONDITION, CAST(NULL AS VARCHAR2(261)) AS EVENT_RULE, CAST(NULL AS VARCHAR2(261)) AS FILE_WATCHER_OWNER, CAST(NULL AS VARCHAR2(261)) AS FILE_WATCHER_NAME, CAST(T.END_DATE AS TIMESTAMP(6) WITH TIME ZONE) AS END_DATE, CAST(T.JOB_CLASS AS VARCHAR2(128)) AS JOB_CLASS, CAST(T.ENABLED AS VARCHAR2(5)) AS ENABLED, CAST(T.AUTO_DROP AS VARCHAR2(5)) AS AUTO_DROP, CAST(NULL AS VARCHAR2(5)) AS RESTART_ON_RECOVERY, CAST(NULL AS VARCHAR2(5)) AS RESTART_ON_FAILURE, CAST(T.STATE AS VARCHAR2(15)) AS STATE, CAST(NULL AS NUMBER) AS JOB_PRIORITY, CAST(T.RUN_COUNT AS NUMBER) AS RUN_COUNT, CAST(NULL AS NUMBER) AS MAX_RUNS, CAST(T.FAILURES AS NUMBER) AS FAILURE_COUNT, CAST(NULL AS NUMBER) AS MAX_FAILURES, CAST(T.RETRY_COUNT AS NUMBER) AS RETRY_COUNT, CAST(T.LAST_DATE AS TIMESTAMP(6) WITH TIME ZONE) AS LAST_START_DATE, CAST((TIMESTAMP'1970-01-01 08:00:00' + T.MAX_RUN_DURATION / (60 * 60 * 24) - TIMESTAMP'1970-01-01 08:00:00') AS INTERVAL DAY(9) TO SECOND(6)) AS LAST_RUN_DURATION, CAST(T.NEXT_DATE AS TIMESTAMP(6) WITH TIME ZONE) AS NEXT_RUN_DATE, CAST(NULL AS INTERVAL DAY(3) TO SECOND(0)) AS SCHEDULE_LIMIT, CAST((TIMESTAMP'1970-01-01 08:00:00' + T.MAX_RUN_DURATION / (60 * 60 * 24) - TIMESTAMP'1970-01-01 08:00:00') AS INTERVAL DAY(3) TO SECOND(0)) AS MAX_RUN_DURATION, CAST(NULL AS VARCHAR2(11)) AS LOGGING_LEVEL, CAST(NULL AS VARCHAR2(5)) AS STORE_OUTPUT, CAST(NULL AS VARCHAR2(5)) AS STOP_ON_WINDOW_CLOSE, CAST(NULL AS VARCHAR2(5)) AS INSTANCE_STICKINESS, CAST(NULL AS VARCHAR2(4000)) AS RAISE_EVENTS, CAST(NULL AS VARCHAR2(5)) AS SYSTEM, CAST(NULL AS NUMBER) AS JOB_WEIGHT, CAST(T.NLSENV AS VARCHAR2(4000)) AS NLS_ENV, CAST(NULL AS VARCHAR2(128)) AS SOURCE, CAST(NULL AS NUMBER) AS NUMBER_OF_DESTINATIONS, CAST(NULL AS VARCHAR2(261)) AS DESTINATION_OWNER, CAST(NULL AS VARCHAR2(261)) AS DESTINATION, CAST(NULL AS VARCHAR2(128)) AS CREDENTIAL_OWNER, CAST(NULL AS VARCHAR2(128)) AS CREDENTIAL_NAME, CAST(T.FIELD1 AS NUMBER) AS INSTANCE_ID, CAST(NULL AS VARCHAR2(5)) AS DEFERRED_DROP, CAST(NULL AS VARCHAR2(5)) AS ALLOW_RUNS_IN_RESTRICTED_MODE, CAST(T.COMMENTS AS VARCHAR2(4000)) AS COMMENTS, CAST(T.FLAG AS NUMBER) AS FLAGS, CAST(NULL AS VARCHAR2(5)) AS RESTARTABLE, CAST(NULL AS VARCHAR2(128)) AS CONNECT_CREDENTIAL_OWNER, CAST(NULL AS VARCHAR2(128)) AS CONNECT_CREDENTIAL_NAME FROM SYS.ALL_VIRTUAL_TENANT_SCHEDULER_JOB_REAL_AGENT T WHERE T.JOB_NAME != '__dummy_guard' AND T.JOB > 0 )__"))) { LOG_ERROR("fail to set view_definition", K(ret)); } } 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 44fbc02b10..51d4af030f 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 @@ -8237,7 +8237,7 @@ int ObInnerTableSchema::all_tenant_scheduler_job_schema(ObTableSchema &table_sch 0, //part_key_pos ObVarcharType, //column_type CS_TYPE_INVALID, //column_collation_type - 200, //column_length + 4000, //column_length -1, //column_precision -1, //column_scale false, //is_nullable @@ -8425,7 +8425,7 @@ int ObInnerTableSchema::all_tenant_scheduler_job_schema(ObTableSchema &table_sch 0, //part_key_pos ObVarcharType, //column_type CS_TYPE_INVALID, //column_collation_type - 128, //column_length + 4000, //column_length -1, //column_precision -1, //column_scale true, //is_nullable @@ -8471,7 +8471,7 @@ int ObInnerTableSchema::all_tenant_scheduler_job_schema(ObTableSchema &table_sch 0, //part_key_pos ObVarcharType, //column_type CS_TYPE_INVALID, //column_collation_type - 128, //column_length + 4000, //column_length -1, //column_precision -1, //column_scale true, //is_nullable 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 33fae03a2f..9be0a3a49f 100644 --- a/src/share/inner_table/ob_inner_table_schema_def.py +++ b/src/share/inner_table/ob_inner_table_schema_def.py @@ -4341,7 +4341,7 @@ def_table_schema( ('this_date', 'timestamp', 'true'), ('next_date', 'timestamp', 'false'), ('total', 'int', 'true', '0'), - ('interval#', 'varchar:200', 'false'), + ('interval#', 'varchar:4000', 'false'), ('failures', 'int', 'true', '0'), ('flag', 'int', 'false'), ('what', 'varchar:4000', 'true'), @@ -4353,10 +4353,10 @@ def_table_schema( ('job_style', 'varchar:128', 'true'), ('program_name', 'varchar:128', 'true'), ('job_type', 'varchar:128', 'true'), - ('job_action', 'varchar:128', 'true'), + ('job_action', 'varchar:4000', 'true'), ('number_of_argument', 'int', 'true'), ('start_date', 'timestamp', 'true'), - ('repeat_interval', 'varchar:128', 'true'), + ('repeat_interval', 'varchar:4000', 'true'), ('end_date', 'timestamp', 'true'), ('job_class', 'varchar:128', 'true'), ('enabled', 'bool', 'true'), @@ -23857,7 +23857,7 @@ def_table_schema( CAST(NULL AS CHAR(5)) AS RESTARTABLE, CAST(NULL AS CHAR(128)) AS CONNECT_CREDENTIAL_OWNER, CAST(NULL AS CHAR(128)) AS CONNECT_CREDENTIAL_NAME - FROM oceanbase.__all_tenant_scheduler_job T WHERE T.JOB_NAME != '__dummy_guard' + FROM oceanbase.__all_tenant_scheduler_job T WHERE T.JOB_NAME != '__dummy_guard' and T.JOB > 0 """.replace("\n", " ") ) @@ -46683,7 +46683,7 @@ def_table_schema( CAST(NULL AS TIMESTAMP(6) WITH TIME ZONE) AS MANUAL_OPEN_TIME, CAST(NULL AS INTERVAL DAY(3) TO SECOND(0)) AS MANUAL_DURATION, CAST(T.COMMENTS AS VARCHAR2(4000)) AS COMMENTS - FROM SYS.ALL_VIRTUAL_TENANT_SCHEDULER_JOB_REAL_AGENT T WHERE T.JOB_NAME in ('MONDAY_WINDOW', + FROM SYS.ALL_VIRTUAL_TENANT_SCHEDULER_JOB_REAL_AGENT T WHERE T.JOB > 0 AND T.JOB_NAME in ('MONDAY_WINDOW', 'TUESDAY_WINDOW', 'WEDNESDAY_WINDOW', 'THURSDAY_WINDOW', 'FRIDAY_WINDOW', 'SATURDAY_WINDOW', 'SUNDAY_WINDOW') """.replace("\n", " "), ) @@ -52687,7 +52687,7 @@ def_table_schema( CAST(NULL AS VARCHAR2(5)) AS RESTARTABLE, CAST(NULL AS VARCHAR2(128)) AS CONNECT_CREDENTIAL_OWNER, CAST(NULL AS VARCHAR2(128)) AS CONNECT_CREDENTIAL_NAME - FROM SYS.ALL_VIRTUAL_TENANT_SCHEDULER_JOB_REAL_AGENT T WHERE T.JOB_NAME != '__dummy_guard' + FROM SYS.ALL_VIRTUAL_TENANT_SCHEDULER_JOB_REAL_AGENT T WHERE T.JOB_NAME != '__dummy_guard' AND T.JOB > 0 """.replace("\n", " ") ) 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 e0953650ee..0427d53bb7 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 @@ -5955,7 +5955,7 @@ last_date timestamp(6) YES NULL this_date timestamp(6) YES NULL next_date timestamp(6) NO NULL total bigint(20) YES 0 -interval# varchar(200) NO NULL +interval# varchar(4000) NO NULL failures bigint(20) YES 0 flag bigint(20) NO NULL what varchar(4000) YES NULL @@ -5967,10 +5967,10 @@ exec_env varchar(2048) YES NULL job_style varchar(128) YES NULL program_name varchar(128) YES NULL job_type varchar(128) YES NULL -job_action varchar(128) YES NULL +job_action varchar(4000) YES NULL number_of_argument bigint(20) YES NULL start_date timestamp(6) YES NULL -repeat_interval varchar(128) YES NULL +repeat_interval varchar(4000) YES NULL end_date timestamp(6) YES NULL job_class varchar(128) YES NULL enabled tinyint(4) YES NULL