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 ce65258ebd..564d3ca9a5 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' and T.JOB > 0 )__"))) { + 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 CHAR(128)) 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.28101_28150.cpp b/src/share/inner_table/ob_inner_table_schema.28101_28150.cpp index ffb33b17f1..0104bbf546 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' AND T.JOB > 0 )__"))) { + 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 VARCHAR2(128)) 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_def.py b/src/share/inner_table/ob_inner_table_schema_def.py index b319ef3875..f2563180f6 100644 --- a/src/share/inner_table/ob_inner_table_schema_def.py +++ b/src/share/inner_table/ob_inner_table_schema_def.py @@ -26029,7 +26029,7 @@ def_table_schema( 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(T.FIELD1 AS CHAR(128)) 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, @@ -59850,7 +59850,7 @@ def_table_schema( 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(T.FIELD1 AS VARCHAR2(128)) 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, 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 1425dee736..36771012e7 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 @@ -3632,7 +3632,7 @@ DESTINATION_OWNER varchar(261) NO DESTINATION varchar(261) NO CREDENTIAL_OWNER varchar(128) NO CREDENTIAL_NAME varchar(128) NO -INSTANCE_ID bigint(21) YES NULL +INSTANCE_ID varchar(128) YES NULL DEFERRED_DROP varchar(5) NO ALLOW_RUNS_IN_RESTRICTED_MODE varchar(5) NO COMMENTS text YES NULL 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 40f62a124c..5fea14d952 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 @@ -5058,7 +5058,7 @@ DESTINATION_OWNER varchar(261) NO DESTINATION varchar(261) NO CREDENTIAL_OWNER varchar(128) NO CREDENTIAL_NAME varchar(128) NO -INSTANCE_ID bigint(21) YES NULL +INSTANCE_ID varchar(128) YES NULL DEFERRED_DROP varchar(5) NO ALLOW_RUNS_IN_RESTRICTED_MODE varchar(5) NO COMMENTS text YES NULL