From 24f5ebe97067c837c0c409b2b68cf86a804737d0 Mon Sep 17 00:00:00 2001 From: "wanhong.wwh" Date: Fri, 9 Feb 2024 08:48:59 +0000 Subject: [PATCH] Fix inner table id placeholder and errno definition --- deps/oblib/src/lib/ob_errno.h | 2 +- .../inner_table/ob_inner_table_schema_def.py | 477 +++--------------- src/share/ob_errno.cpp | 36 +- src/share/ob_errno.def | 4 +- src/share/ob_errno.h | 10 +- 5 files changed, 92 insertions(+), 437 deletions(-) diff --git a/deps/oblib/src/lib/ob_errno.h b/deps/oblib/src/lib/ob_errno.h index 2ebcc7b863..f8af1f990f 100644 --- a/deps/oblib/src/lib/ob_errno.h +++ b/deps/oblib/src/lib/ob_errno.h @@ -369,11 +369,11 @@ constexpr int OB_ERR_INVALID_NULL_SDO_GEOMETRY = -7294; constexpr int OB_ERR_INVALID_DATA_IN_SDO_ELEM_INFO_ARRAY = -7295; constexpr int OB_ERR_INVALID_DATA_IN_SDO_ORDINATE_ARRAY = -7296; constexpr int OB_ERR_VALUE_NOT_ALLOWED = -7297; -constexpr int OB_ERR_DUP_DEF_NAMESPACE = -7420; constexpr int OB_ERR_PARSE_XQUERY_EXPR = -7422; constexpr int OB_ERR_TOO_MANY_PREFIX_DECLARE = -7424; constexpr int OB_ERR_XPATH_INVALID_NODE = -7426; constexpr int OB_ERR_XPATH_NO_NODE = -7427; +constexpr int OB_ERR_DUP_DEF_NAMESPACE = -7431; constexpr int OB_PACKET_CLUSTER_ID_NOT_MATCH = -8004; constexpr int OB_TENANT_ID_NOT_MATCH = -8005; constexpr int OB_URI_ERROR = -9001; 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 bf5f868b4a..6b69b48495 100644 --- a/src/share/inner_table/ob_inner_table_schema_def.py +++ b/src/share/inner_table/ob_inner_table_schema_def.py @@ -1832,7 +1832,7 @@ def_table_schema( ) # 216: __all_tenant_plan_baseline # abandoned in 4.0 -# 217: __all_tenant_plan_baseline_history abandoned in 4.0 +# 217: __all_tenant_plan_baseline_history # abandoned in 4.0 # 218: __all_ddl_helper # abandoned in 4.0 @@ -3441,8 +3441,6 @@ def_table_schema( ], ) -# the table id from 337 to 341 have been used for new backup validation system table, - # __all_ls_meta_table def_table_schema( owner = 'wangzhennan.wzn', @@ -8170,7 +8168,7 @@ def_table_schema( 'index_using_type' : 'USING_BTREE'}}, ) -## 11033:__all_virtual_partition_sstable_image_info # abandoned in 4.0 +# 11033: __all_virtual_partition_sstable_image_info # abandoned in 4.0 def_table_schema(**gen_iterate_core_inner_table_def(11035, '__all_virtual_core_all_table', 'VIRTUAL_TABLE', all_table_def)) @@ -8436,33 +8434,8 @@ def_table_schema( vtable_route_policy = 'distributed', ) -#table_id = 11051 unused -#def_table_schema( -# owner = 'xiaoyi.xy', -# table_name = '__all_virtual_sql_monitor', -# table_id = '11052', -# table_type = 'VIRTUAL_TABLE', -# gm_columns = [], -# rowkey_columns = [ -# ('tenant_id', 'int'), -# ('svr_ip', 'varchar:MAX_IP_ADDR_LENGTH'), -# ('svr_port', 'int'), -# ('request_id', 'int'), -# ('job_id', 'int'), -# ('task_id', 'int'), -# ], -# -# normal_columns = [ -# ('plan_id', 'int'), -# ('scheduler_ip', 'varchar:MAX_IP_ADDR_LENGTH'), -# ('scheduler_port', 'int'), -# ('monitor_info', 'varchar:OB_MAX_MONITOR_INFO_LENGTH'), -# ('extend_info', 'varchar:OB_MAX_MONITOR_INFO_LENGTH'), -# ('sql_exec_start', 'timestamp'), -# ], -# partition_columns = ['svr_ip', 'svr_port'], -# vtable_route_policy = 'distributed', -#) +# 11051: abandoned +# 11052: __all_virtual_sql_monitor # abandoned in 4.0 def_table_schema( owner = 'xiaoyi.xy', @@ -8512,35 +8485,7 @@ def_table_schema( ], ) -#def_table_schema( -# owner = 'xiaoyi.xy', -# table_name = '__all_virtual_sql_plan_statistics', -# table_id = '11055', -# table_type = 'VIRTUAL_TABLE', -# gm_columns = [], -# rowkey_columns = [ -# ('tenant_id', 'int'), -# ('svr_ip', 'varchar:MAX_IP_ADDR_LENGTH'), -# ('svr_port', 'int'), -# ('plan_id', 'int'), -# ('operation_id', 'int'), -# ], -# -# normal_columns = [ -# ('executions', 'int'), -# ('output_rows', 'int'), -# ('input_rows', 'int'), -# ('rescan_times', 'int'), -# ('buffer_gets', 'int'), -# ('disk_reads', 'int'), -# ('disk_writes', 'int'), -# ('elapsed_time', 'int'), -# ('extend_info1', 'varchar:OB_MAX_MONITOR_INFO_LENGTH'), -# ('extend_info2', 'varchar:OB_MAX_MONITOR_INFO_LENGTH'), -# ], -# partition_columns = ['svr_ip', 'svr_port'], -# vtable_route_policy = 'distributed', -#) +# 11055: __all_virtual_sql_plan_statistics # abandoned in 4.0 def_table_schema( owner = 'jiahua.cjh', @@ -9581,9 +9526,6 @@ def_table_schema( vtable_route_policy = 'distributed', ) -# table_id = 11118: used for __all_virtual_ddl_sim_point on enhance_ddl_quality branch -# table_id = 11119: used for __all_virtual_ddl_sim_point_stat on enhance_ddl_quality branch - def_table_schema( owner = 'jianyun.sjy', table_name = '__all_virtual_ddl_sim_point', @@ -10469,7 +10411,7 @@ def_table_schema( vtable_route_policy = 'distributed', ) -## table_id 12125 was used by a discarded table, do not reuse again +# 12125: abandoned def_table_schema(**gen_iterate_virtual_table_def( table_id = '12126', @@ -11074,7 +11016,7 @@ def_table_schema( ], ) -# 12197 is INFORMATION_SCHEMA.FILES, which is moved to 21157 +# 12197: abandoned # INFORMATION_SCHEMA.FILES, which is moved to 21157 def_table_schema(**gen_iterate_virtual_table_def( table_id = '12198', @@ -11623,8 +11565,8 @@ def_table_schema(**gen_iterate_virtual_table_def( table_name = '__all_virtual_tenant_scheduler_program_argument', keywords = all_def_keywords['__all_tenant_scheduler_program_argument'])) -# 12267 __all_virtual_backup_validation_task_v2 -# 12268 __all_virtual_pg_backup_validation_task_v2 +# 12267: __all_virtual_backup_validation_task_v2 +# 12268: __all_virtual_pg_backup_validation_task_v2 def_table_schema(**gen_iterate_virtual_table_def( table_id = '12269', @@ -11640,8 +11582,8 @@ def_table_schema(**gen_iterate_private_virtual_table_def( table_name = '__all_virtual_global_context_value', keywords = all_def_keywords['__all_global_context_value'])) -# 12272 __all_virtual_external_storage_session -# 12273 __all_virtual_external_storage_info +# 12272: __all_virtual_external_storage_session +# 12273: __all_virtual_external_storage_info def_table_schema( owner = 'fenggu.yh', @@ -11676,7 +11618,7 @@ def_table_schema( vtable_route_policy = 'distributed', ) -# 12275 __all_virtual_tablet_transfer_info +# 12275: __all_virtual_tablet_transfer_info def_table_schema( owner = 'wanhong.wwh', @@ -13729,7 +13671,7 @@ def_table_schema(**gen_iterate_private_virtual_table_def( ################################################################################ def_table_schema(**no_direct_access(gen_oracle_mapping_virtual_table_def('15009', all_def_keywords['__all_virtual_sql_audit']))) def_table_schema(**no_direct_access(gen_oracle_mapping_virtual_table_def('15010', all_def_keywords['__all_virtual_plan_stat']))) -#def_table_schema(**gen_oracle_mapping_virtual_table_def('15011', all_def_keywords['__all_virtual_sql_plan_statistics'])) +# 15011: __all_virtual_sql_plan_statistics def_table_schema(**no_direct_access(gen_oracle_mapping_virtual_table_def('15012', all_def_keywords['__all_virtual_plan_cache_plan_explain']))) def_table_schema(**gen_agent_virtual_table_def('15023', all_def_keywords['__tenant_virtual_outline'])) def_table_schema(**no_direct_access(gen_oracle_mapping_virtual_table_def('15026', all_def_keywords['__all_virtual_privilege']))) @@ -15803,113 +15745,10 @@ WHERE ) -# 4.0 not support @xiaoyi.xy -#def_table_schema( -# owner = 'xiaoyi.xy', -# table_name = 'gv$sql', -# table_id = '21032', -# table_type = 'SYSTEM_VIEW', -# gm_columns = [], -# in_tenant_space = True, -# rowkey_columns = [], -# view_definition = """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) -#""".replace("\n", " "), -# -# -# normal_columns = [ -# ], -#) - -# 4.0 not supported -#def_table_schema( -# owner = 'xiaoyi.xy', -# table_name = 'v$sql', -# table_id = '21033', -# table_type = 'SYSTEM_VIEW', -# gm_columns = [], -# in_tenant_space = True, -# rowkey_columns = [], -# view_definition = """SELECT * FROM oceanbase.gv$sql -# WHERE svr_ip=HOST_IP() AND svr_port=RPC_PORT() -#""".replace("\n", " "), -# -# -# normal_columns = [ -# ], -#) - - -# gv$sql_monitor/v$sql_monitor is not compatible with oracle. -#def_table_schema( -# owner = 'xiaoyi.xy', -# table_name = 'GV$SQL_MONITOR', -# table_id = '21034', -# table_type = 'SYSTEM_VIEW', -# gm_columns = [], -# in_tenant_space = True, -# rowkey_columns = [], -# view_definition = """ -# 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 -#""".replace("\n", " "), -# -# normal_columns = [ -# ], -#) -#def_table_schema( -# owner = 'xiaoyi.xy', -# table_name = 'V$SQL_MONITOR', -# table_id = '21035', -# table_type = 'SYSTEM_VIEW', -# gm_columns = [], -# in_tenant_space = True, -# rowkey_columns = [], -# view_definition = """ -# SELECT * FROM OCEANBASE.GV$SQL_MONITOR -# WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() -#""".replace("\n", " "), -# -# normal_columns = [ -# ], -#) +# 21032: GV$SQL # abandoned in 4.0 +# 21033: V$SQL # abandoned in 4.0 +# 21034: GV$SQL_MONITOR # abandoned in 4.0 +# 21035: V$SQL_MONITOR # abandoned in 4.0 def_table_schema( owner = 'xiaochu.yh', @@ -16384,47 +16223,11 @@ def_table_schema( """.replace("\n", " ") ) -# TODO: wenqu delete it -# def_table_schema( -# owner = 'jianyun.sjy', -# table_name = 'gv$partition_audit', -# table_id = '21073', -# table_type = 'SYSTEM_VIEW', -# rowkey_columns = [], -# normal_columns = [], -# gm_columns = [], -# in_tenant_space = True, -# view_definition = """ -# SELECT * -# FROM oceanbase.__all_virtual_partition_audit -# WHERE effective_tenant_id() = 1 OR tenant_id = effective_tenant_id() -# """.replace("\n", " ") -# ) - -# TODO: wenqu delete it -# def_table_schema( -# owner = 'jianyun.sjy', -# table_name = 'v$partition_audit', -# table_id = '21074', -# table_type = 'SYSTEM_VIEW', -# rowkey_columns = [], -# normal_columns = [], -# gm_columns = [], -# in_tenant_space = True, -# view_definition = """ -# SELECT * -# FROM oceanbase.gv$partition_audit -# WHERE svr_ip = host_ip() AND svr_port = rpc_port() -# """.replace("\n", " ") -# ) - - +# 21073: gv$partition_audit # abandoned in 4.0 +# 21074: v$partition_audit # abandoned in 4.0 # 21075: V$OB_CLUSTER # abandoned in 4.0 - # 21076: v$ob_standby_status # abandoned in 4.0 - # 21077: v$ob_cluster_stats # abandoned in 4.0 - # 21078: V$OB_CLUSTER_EVENT_HISTORY # abandoned in 4.0 def_table_schema( @@ -17043,114 +16846,9 @@ AND """.replace("\n", " ") ) -# 4.0 not support -#def_table_schema( -# owner = 'lixia.yq', -# table_name = 'CDB_CKPT_HISTORY', -# table_id = '21114', -# table_type = 'SYSTEM_VIEW', -# rowkey_columns = [], -# normal_columns = [], -# gm_columns = [], -# in_tenant_space = False, -# view_definition = """ -# 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 -#""".replace("\n", " ") -#) - -# 4.0 not supported -#def_table_schema( -# owner = 'shanyan.g', -# table_name = 'gv$ob_trans_table_status', -# table_id = '21115', -# table_type = 'SYSTEM_VIEW', -# rowkey_columns = [], -# normal_columns = [], -# gm_columns = [], -# in_tenant_space = True, -# view_definition = """ -#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() -#""".replace("\n", " ") -#) -# -# 4.0 not supported -#def_table_schema( -# owner = 'shanyan.g', -# table_name = 'v$ob_trans_table_status', -# table_id = '21116', -# table_type = 'SYSTEM_VIEW', -# rowkey_columns = [], -# normal_columns = [], -# gm_columns = [], -# in_tenant_space = True, -# view_definition = """ -#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() -#""".replace("\n", " ") -#) - +# 21114: CDB_CKPT_HISTORY # abandoned in 4.0 +# 21115: gv$ob_trans_table_status # abandoned in 4.0 +# 21116: v$ob_trans_table_status # abandoned in 4.0 def_table_schema( owner = 'xiaochu.yh', @@ -17221,28 +16919,7 @@ def_table_schema( # 21123: CDB_OB_BACKUP_VALIDATION_JOB_HISTORY # abandoned in 4.0 # 21124: CDB_OB_TENANT_BACKUP_VALIDATION_TASK # abandoned in 4.0 # 21125: CDB_OB_BACKUP_VALIDATION_TASK_HISTORY # abandoned in 4.0 - - -#FIXME: This view will be supported later -#def_table_schema( -# owner = 'jingyan.kfy', -# table_name = 'v$restore_point', -# table_id = '21126', -# table_type = 'SYSTEM_VIEW', -# rowkey_columns = [], -# normal_columns = [], -# gm_columns = [], -# in_tenant_space = True, -# view_definition = """ -# SELECT -# TENANT_ID, -# SNAPSHOT_SCN 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()) -# """.replace("\n", " ") -#) - +# 21126: v$restore_point # abandoned in 4.0 # 21127: CDB_OB_BACKUP_SET_OBSOLETE # abandoned in 4.0 # 21128: CDB_OB_BACKUP_BACKUPSET_JOB # abandoned in 4.0 # 21129: CDB_OB_BACKUP_BACKUPSET_JOB_HISTORY # abandoned in 4.0 @@ -17486,9 +17163,7 @@ def_table_schema( # 21139: CDB_OB_BACKUP_BACKUPPIECE_JOB_HISTORY # abandoned in 4.0 # 21140: CDB_OB_BACKUP_BACKUPPIECE_TASK # abandoned in 4.0 # 21141: CDB_OB_BACKUP_BACKUPPIECE_TASK_HISTORY # abandoned in 4.0 - # 21142: v$ob_all_clusters # abandoned in 4.0 - # 21143: CDB_OB_BACKUP_ARCHIVELOG # abandoned in 4.0 # 21144: CDB_OB_BACKUP_BACKUP_ARCHIVELOG # abandoned in 4.0 @@ -17870,7 +17545,7 @@ def_table_schema( """.replace("\n", " ") ) -# 21156 CDB_OB_LOG_ARCHIVE_LS_SUMMARY +# 21156: CDB_OB_LOG_ARCHIVE_LS_SUMMARY def_table_schema( owner = 'xiaochu.yh', @@ -22307,7 +21982,7 @@ def_table_schema( """.replace("\n", " ") ) -# 21216 UNUSED +# 21216: abandoned def_table_schema( owner = 'fenggu.yh', @@ -22966,8 +22641,8 @@ def_table_schema( """.replace("\n", " "), ) -# reserve 21243 for GV$OB_IO_QUOTA -# reserve 21244 for V$OB_IO_QUOTA +# 21243: GV$OB_IO_QUOTA +# 21244: V$OB_IO_QUOTA # 4.0 backup clean view @@ -24932,7 +24607,7 @@ def_table_schema( """.replace("\n", " ") ) -# 21286 : DBA_OB_ARCHIVE_MODE +# 21286: DBA_OB_ARCHIVE_MODE def_table_schema( owner = 'wangxiaohui.wxh', @@ -25277,7 +24952,7 @@ def_table_schema( """.replace("\n", " ") ) -# 21292 : CDB_OB_ARCHIVE_MODE +# 21292: CDB_OB_ARCHIVE_MODE def_table_schema( owner = 'wangxiaohui.wxh', @@ -30790,7 +30465,6 @@ def_table_schema( ) # 21459：GV$OB_SESSION # 21460：V$OB_SESSION - # 21461: GV$OB_PL_CACHE_OBJECT # 21462: V$OB_PL_CACHE_OBJECT @@ -31423,22 +31097,22 @@ WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() """.replace("\n", " "), ) -#21481 DBA_WR_SYSTEM_EVENT -#21482 CDB_WR_SYSTEM_EVENT -#21483 DBA_WR_EVENT_NAME -#21484 CDB_WR_EVENT_NAME -#21485 DBA_OB_FORMAT_OUTLINES -#21486 mysql.procs_priv -#21487 GV$SQLSTAT -#21488 V$SQLSTAT -#21489 DBA_WR_SQLSTAT -#21490 CDB_WR_SQLSTAT -#21491 GV$SESS_TIME_MODEL -#21492 V$SESS_TIME_MODEL -#21493 GV$SYS_TIME_MODEL -#21494 V$SYS_TIME_MODEL -#21495 DBA_WR_SYS_TIME_MODEL -#21496 CDB_WR_SYS_TIME_MODEL +#21481: DBA_WR_SYSTEM_EVENT +#21482: CDB_WR_SYSTEM_EVENT +#21483: DBA_WR_EVENT_NAME +#21484: CDB_WR_EVENT_NAME +#21485: DBA_OB_FORMAT_OUTLINES +#21486: procs_priv +#21487: GV$SQLSTAT +#21488: V$SQLSTAT +#21489: DBA_WR_SQLSTAT +#21490: CDB_WR_SQLSTAT +#21491: GV$SESS_TIME_MODEL +#21492: V$SESS_TIME_MODEL +#21493: GV$SYS_TIME_MODEL +#21494: V$SYS_TIME_MODEL +#21495: DBA_WR_SYS_TIME_MODEL +#21496: CDB_WR_SYS_TIME_MODEL def_table_schema( owner = 'zhenling.zzg', @@ -31517,15 +31191,15 @@ def_table_schema( """.replace("\n", " "), ) -#21500 DBA_OB_SYS_VARIABLES -#21501 DBA_OB_TRANSFER_PARTITION_TASKS -#21502 CDB_OB_TRANSFER_PARTITION_TASKS -#21503 DBA_OB_TRANSFER_PARTITION_TASK_HISTORY -#21504 CDB_OB_TRANSFER_PARTITION_TASK_HISTORY -#21505 DBA_WR_SQLTEXT -#21506 CDB_WR_SQLTEXT -#21507 GV$OB_ACTIVE_SESSION_HISTORY -#21508 V$OB_ACTIVE_SESSION_HISTORY +#21500: DBA_OB_SYS_VARIABLES +#21501: DBA_OB_TRANSFER_PARTITION_TASKS +#21502: CDB_OB_TRANSFER_PARTITION_TASKS +#21503: DBA_OB_TRANSFER_PARTITION_TASK_HISTORY +#21504: CDB_OB_TRANSFER_PARTITION_TASK_HISTORY +#21505: DBA_WR_SQLTEXT +#21506: CDB_WR_SQLTEXT +#21507: GV$OB_ACTIVE_SESSION_HISTORY +#21508: V$OB_ACTIVE_SESSION_HISTORY def_table_schema( owner = 'tony.wzh', table_name = 'DBA_OB_TRUSTED_ROOT_CERTIFICATE', @@ -31577,8 +31251,8 @@ SELECT job_id AS CLONE_JOB_ID, FROM oceanbase.__all_clone_job ORDER BY CLONE_START_TIME """.replace("\n", " ") ) -#21511 mysql.role_edges -#21512 mysql.default_roles +#21511: role_edges +#21512: default_roles def_table_schema( owner = 'yangjiali.yjl', @@ -31618,9 +31292,9 @@ def_table_schema( """.replace("\n", " "), ) -#21514 mysql.audit_log_filter -#21515 mysql.audit_log_user -#21516 mysql.columns_priv +#21514: audit_log_filter +#21515: audit_log_user +#21516: columns_priv def_table_schema( owner = 'wendongbodongbo.wd', table_name = 'GV$OB_LS_SNAPSHOTS', @@ -31718,11 +31392,11 @@ SELECT job_id AS CLONE_JOB_ID, FROM oceanbase.__all_clone_job_history ORDER BY CLONE_START_TIME """.replace("\n", " ") ) -#21520 GV$OB_SHARE_STORAGE_QUOTA_ASSIGNMENT -#21521 V$OB_SHARE_STORAGE_QUOTA_ASSIGNMENT -#21522 CDB_UNUSED_COL_TABS -#21523 DBA_OB_LS_REPLICA_TASK_HISTORY -#21524 CDB_OB_LS_REPLICA_TASK_HISTORY +#21520: GV$OB_SHARE_STORAGE_QUOTA_ASSIGNMENT +#21521: V$OB_SHARE_STORAGE_QUOTA_ASSIGNMENT +#21522: CDB_UNUSED_COL_TABS +#21523: DBA_OB_LS_REPLICA_TASK_HISTORY +#21524: CDB_OB_LS_REPLICA_TASK_HISTORY def_table_schema( owner = 'suzhi.yt', @@ -54304,26 +53978,7 @@ def_table_schema( """.replace("\n", " ") ) -# def_table_schema( -# owner = 'jingyan.kfy', -# table_name = 'V$RESTORE_POINT', -# name_postfix = '_ORA', -# database_id = 'OB_ORA_SYS_DATABASE_ID', -# table_id = '28069', -# table_type = 'SYSTEM_VIEW', -# gm_columns = [], -# in_tenant_space = True, -# rowkey_columns = [], -# normal_columns = [], -# view_definition = """SELECT -# TENANT_ID, -# SNAPSHOT_SCN 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) -# """.replace("\n", " "), -# ) +# 28069: V$RESTORE_POINT # abandoned in 4.0 def_table_schema( owner = 'xiaochu.yh', @@ -55860,7 +55515,7 @@ def_table_schema( """.replace("\n", " ") ) -## table_id 28095 was used by a discarded table, do not reuse again +# 28095: abandoned def_table_schema( owner = 'linlin.xll', diff --git a/src/share/ob_errno.cpp b/src/share/ob_errno.cpp index afc44343dc..fe90ef0add 100644 --- a/src/share/ob_errno.cpp +++ b/src/share/ob_errno.cpp @@ -21489,17 +21489,17 @@ static const _error _error_OB_LOB_VALUE_NOT_EXIST = { .oracle_str_error = "ORA-22922: LOB value does not exist", .oracle_str_user_error = "ORA-22922: LOB value does not exist" }; -static const _error _error_OB_ERR_DUP_DEF_NAMESPACE = { - .error_name = "OB_ERR_DUP_DEF_NAMESPACE", +static const _error _error_OB_ERR_JSON_FUN_UNSUPPORTED_TYPE = { + .error_name = "OB_ERR_JSON_FUN_UNSUPPORTED_TYPE", .error_cause = "Internal Error", .error_solution = "Contact OceanBase Support", .mysql_errno = -1, - .sqlstate = "42000", - .str_error = "XQST0066 - duplicate default namespace definition - string", - .str_user_error = "XQST0066 - duplicate default namespace definition - %s.", - .oracle_errno = 19118, - .oracle_str_error = "ORA-19118: XQST0066 - duplicate default namespace definition - string.", - .oracle_str_user_error = "ORA-19118: XQST0066 - duplicate default namespace definition - %s." + .sqlstate = "HY000", + .str_error = "Input to JSON generation function has unsupported data type", + .str_user_error = "Input to JSON generation function has unsupported data type", + .oracle_errno = 40654, + .oracle_str_error = "ORA-40654: Input to JSON generation function has unsupported data type", + .oracle_str_user_error = "ORA-40654: Input to JSON generation function has unsupported data type" }; static const _error _error_OB_ERR_XQUERY_MULTI_VALUE = { .error_name = "OB_ERR_XQUERY_MULTI_VALUE", @@ -21621,17 +21621,17 @@ static const _error _error_OB_ERR_XML_NOT_SUPPORT_OPERATION = { .oracle_str_error = "ORA-31195: XML node '' (type=%s) does not support this operation", .oracle_str_user_error = "ORA-31195: XML node '' (type=%s) does not support this operation" }; -static const _error _error_OB_ERR_JSON_FUN_UNSUPPORTED_TYPE = { - .error_name = "OB_ERR_JSON_FUN_UNSUPPORTED_TYPE", +static const _error _error_OB_ERR_DUP_DEF_NAMESPACE = { + .error_name = "OB_ERR_DUP_DEF_NAMESPACE", .error_cause = "Internal Error", .error_solution = "Contact OceanBase Support", .mysql_errno = -1, - .sqlstate = "HY000", - .str_error = "Input to JSON generation function has unsupported data type", - .str_user_error = "Input to JSON generation function has unsupported data type", - .oracle_errno = 40654, - .oracle_str_error = "ORA-40654: Input to JSON generation function has unsupported data type", - .oracle_str_user_error = "ORA-40654: Input to JSON generation function has unsupported data type" + .sqlstate = "42000", + .str_error = "XQST0066 - duplicate default namespace definition - string", + .str_user_error = "XQST0066 - duplicate default namespace definition - %s.", + .oracle_errno = 19118, + .oracle_str_error = "ORA-19118: XQST0066 - duplicate default namespace definition - string.", + .oracle_str_user_error = "ORA-19118: XQST0066 - duplicate default namespace definition - %s." }; static const _error _error_OB_ERR_COMPARE_VARRAY_LOB_ATTR = { .error_name = "OB_ERR_COMPARE_VARRAY_LOB_ATTR", @@ -28433,7 +28433,7 @@ struct ObStrErrorInit _errors[-OB_ERR_XML_INDEX] = &_error_OB_ERR_XML_INDEX; _errors[-OB_ERR_UPDATE_XML_WITH_INVALID_NODE] = &_error_OB_ERR_UPDATE_XML_WITH_INVALID_NODE; _errors[-OB_LOB_VALUE_NOT_EXIST] = &_error_OB_LOB_VALUE_NOT_EXIST; - _errors[-OB_ERR_DUP_DEF_NAMESPACE] = &_error_OB_ERR_DUP_DEF_NAMESPACE; + _errors[-OB_ERR_JSON_FUN_UNSUPPORTED_TYPE] = &_error_OB_ERR_JSON_FUN_UNSUPPORTED_TYPE; _errors[-OB_ERR_XQUERY_MULTI_VALUE] = &_error_OB_ERR_XQUERY_MULTI_VALUE; _errors[-OB_ERR_PARSE_XQUERY_EXPR] = &_error_OB_ERR_PARSE_XQUERY_EXPR; _errors[-OB_ERR_LACK_XQUERY_LITERAL] = &_error_OB_ERR_LACK_XQUERY_LITERAL; @@ -28444,7 +28444,7 @@ struct ObStrErrorInit _errors[-OB_ERR_XQUERY_UNSUPPORTED] = &_error_OB_ERR_XQUERY_UNSUPPORTED; _errors[-OB_ERR_INVALID_XML_CHILD_NAME] = &_error_OB_ERR_INVALID_XML_CHILD_NAME; _errors[-OB_ERR_XML_NOT_SUPPORT_OPERATION] = &_error_OB_ERR_XML_NOT_SUPPORT_OPERATION; - _errors[-OB_ERR_JSON_FUN_UNSUPPORTED_TYPE] = &_error_OB_ERR_JSON_FUN_UNSUPPORTED_TYPE; + _errors[-OB_ERR_DUP_DEF_NAMESPACE] = &_error_OB_ERR_DUP_DEF_NAMESPACE; _errors[-OB_ERR_COMPARE_VARRAY_LOB_ATTR] = &_error_OB_ERR_COMPARE_VARRAY_LOB_ATTR; _errors[-OB_ERR_XML_PARENT_ALREADY_CONTAINS_CHILD] = &_error_OB_ERR_XML_PARENT_ALREADY_CONTAINS_CHILD; _errors[-OB_SERVER_IS_INIT] = &_error_OB_SERVER_IS_INIT; diff --git a/src/share/ob_errno.def b/src/share/ob_errno.def index bbd8da1a50..d64e0f2aea 100755 --- a/src/share/ob_errno.def +++ b/src/share/ob_errno.def @@ -2084,7 +2084,7 @@ DEFINE_ORACLE_ERROR(OB_ERR_NULL_FOR_XML_CONSTRUCTOR, -7416, -1, "42000", "Expect DEFINE_ORACLE_ERROR(OB_ERR_XML_INDEX, -7417, -1, "42000", "cannot create index on expression with datatype ADT '%.*s'", 2327 ,"cannot create index on expression with datatype ADT '%.*s'"); DEFINE_ORACLE_ERROR(OB_ERR_UPDATE_XML_WITH_INVALID_NODE, -7418, -1, "42000", "XML nodes must be updated with valid nodes and of the same type'", 31067 ,"XML nodes must be updated with valid nodes and of the same type"); DEFINE_ORACLE_ERROR(OB_LOB_VALUE_NOT_EXIST, -7419, -1, "42000", "LOB value does not exist", 22922 ,"LOB value does not exist"); -DEFINE_ORACLE_ERROR_EXT_DEP(OB_ERR_DUP_DEF_NAMESPACE, -7420, -1, "42000", "XQST0066 - duplicate default namespace definition - string", "XQST0066 - duplicate default namespace definition - %s.", 19118, "XQST0066 - duplicate default namespace definition - string.", "XQST0066 - duplicate default namespace definition - %s."); +DEFINE_ORACLE_ERROR(OB_ERR_JSON_FUN_UNSUPPORTED_TYPE, -7420, -1, "HY000", "Input to JSON generation function has unsupported data type", 40654, "Input to JSON generation function has unsupported data type"); DEFINE_ORACLE_ERROR(OB_ERR_XQUERY_MULTI_VALUE, -7421, -1, "42000", "XPTY0004 - XQuery dynamic type mismatch: expected singleton sequence - got multi-item sequence", 19279, "XPTY0004 - XQuery dynamic type mismatch: expected singleton sequence - got multi-item sequence"); DEFINE_ORACLE_ERROR_EXT_DEP(OB_ERR_PARSE_XQUERY_EXPR, -7422, -1, "42000", "XPST0003 - error during parsing the XQuery expression", "XPST0003 - error during parsing the XQuery expression : %.*s", 19114, "XPST0003 - error during parsing the XQuery expression", "XPST0003 - error during parsing the XQuery expression : %.*s"); DEFINE_ORACLE_ERROR(OB_ERR_LACK_XQUERY_LITERAL, -7423, -1, "42000", "XQuery string literal expected", 19102, "XQuery string literal expected"); @@ -2095,7 +2095,7 @@ DEFINE_ORACLE_ERROR_EXT_DEP(OB_ERR_XPATH_NO_NODE, -7427, -1, "42000", "XPST0005 DEFINE_ORACLE_ERROR(OB_ERR_XQUERY_UNSUPPORTED, -7428, -1, "42000", "unsupported XQuery expression", 19110, "unsupported XQuery expression"); DEFINE_ORACLE_ERROR(OB_ERR_INVALID_XML_CHILD_NAME, -7429, -1, "42000", "The document being inserted does not conform to specified child name", 31056, "The document being inserted does not conform to specified child name"); DEFINE_ORACLE_ERROR(OB_ERR_XML_NOT_SUPPORT_OPERATION, -7430, -1, "42000", "XML node '' (type=%s) does not support this operation", 31195, "XML node '' (type=%s) does not support this operation"); -DEFINE_ORACLE_ERROR(OB_ERR_JSON_FUN_UNSUPPORTED_TYPE, -7431, -1, "HY000", "Input to JSON generation function has unsupported data type", 40654, "Input to JSON generation function has unsupported data type"); +DEFINE_ORACLE_ERROR_EXT_DEP(OB_ERR_DUP_DEF_NAMESPACE, -7431, -1, "42000", "XQST0066 - duplicate default namespace definition - string", "XQST0066 - duplicate default namespace definition - %s.", 19118, "XQST0066 - duplicate default namespace definition - string.", "XQST0066 - duplicate default namespace definition - %s."); DEFINE_ORACLE_ERROR(OB_ERR_COMPARE_VARRAY_LOB_ATTR, -7432, -1, "42000", "cannot compare VARRAY or LOB attributes of an object type", 22901, "cannot compare VARRAY or LOB attributes of an object type"); DEFINE_ORACLE_ERROR(OB_ERR_XML_PARENT_ALREADY_CONTAINS_CHILD, -7433, -1, "42000", "Parent %.*s already contains child entry %.*s", 31003, "Parent %.*s already contains child entry %.*s"); diff --git a/src/share/ob_errno.h b/src/share/ob_errno.h index 767988035a..c31e232a46 100644 --- a/src/share/ob_errno.h +++ b/src/share/ob_errno.h @@ -1464,13 +1464,13 @@ constexpr int OB_ERR_NULL_FOR_XML_CONSTRUCTOR = -7416; constexpr int OB_ERR_XML_INDEX = -7417; constexpr int OB_ERR_UPDATE_XML_WITH_INVALID_NODE = -7418; constexpr int OB_LOB_VALUE_NOT_EXIST = -7419; +constexpr int OB_ERR_JSON_FUN_UNSUPPORTED_TYPE = -7420; constexpr int OB_ERR_XQUERY_MULTI_VALUE = -7421; constexpr int OB_ERR_LACK_XQUERY_LITERAL = -7423; constexpr int OB_ERR_XQUERY_TYPE_MISMATCH = -7425; constexpr int OB_ERR_XQUERY_UNSUPPORTED = -7428; constexpr int OB_ERR_INVALID_XML_CHILD_NAME = -7429; constexpr int OB_ERR_XML_NOT_SUPPORT_OPERATION = -7430; -constexpr int OB_ERR_JSON_FUN_UNSUPPORTED_TYPE = -7431; constexpr int OB_ERR_COMPARE_VARRAY_LOB_ATTR = -7432; constexpr int OB_ERR_XML_PARENT_ALREADY_CONTAINS_CHILD = -7433; constexpr int OB_SERVER_IS_INIT = -8001; @@ -3647,7 +3647,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219; #define OB_ERR_XML_INDEX__USER_ERROR_MSG "cannot create index on expression with datatype ADT '%.*s'" #define OB_ERR_UPDATE_XML_WITH_INVALID_NODE__USER_ERROR_MSG "XML nodes must be updated with valid nodes and of the same type'" #define OB_LOB_VALUE_NOT_EXIST__USER_ERROR_MSG "LOB value does not exist" -#define OB_ERR_DUP_DEF_NAMESPACE__USER_ERROR_MSG "XQST0066 - duplicate default namespace definition - %s." +#define OB_ERR_JSON_FUN_UNSUPPORTED_TYPE__USER_ERROR_MSG "Input to JSON generation function has unsupported data type" #define OB_ERR_XQUERY_MULTI_VALUE__USER_ERROR_MSG "XPTY0004 - XQuery dynamic type mismatch: expected singleton sequence - got multi-item sequence" #define OB_ERR_PARSE_XQUERY_EXPR__USER_ERROR_MSG "XPST0003 - error during parsing the XQuery expression : %.*s" #define OB_ERR_LACK_XQUERY_LITERAL__USER_ERROR_MSG "XQuery string literal expected" @@ -3658,7 +3658,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219; #define OB_ERR_XQUERY_UNSUPPORTED__USER_ERROR_MSG "unsupported XQuery expression" #define OB_ERR_INVALID_XML_CHILD_NAME__USER_ERROR_MSG "The document being inserted does not conform to specified child name" #define OB_ERR_XML_NOT_SUPPORT_OPERATION__USER_ERROR_MSG "XML node '' (type=%s) does not support this operation" -#define OB_ERR_JSON_FUN_UNSUPPORTED_TYPE__USER_ERROR_MSG "Input to JSON generation function has unsupported data type" +#define OB_ERR_DUP_DEF_NAMESPACE__USER_ERROR_MSG "XQST0066 - duplicate default namespace definition - %s." #define OB_ERR_COMPARE_VARRAY_LOB_ATTR__USER_ERROR_MSG "cannot compare VARRAY or LOB attributes of an object type" #define OB_ERR_XML_PARENT_ALREADY_CONTAINS_CHILD__USER_ERROR_MSG "Parent %.*s already contains child entry %.*s" #define OB_SERVER_IS_INIT__USER_ERROR_MSG "Server is initializing" @@ -5868,7 +5868,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219; #define OB_ERR_XML_INDEX__ORA_USER_ERROR_MSG "ORA-02327: cannot create index on expression with datatype ADT '%.*s'" #define OB_ERR_UPDATE_XML_WITH_INVALID_NODE__ORA_USER_ERROR_MSG "ORA-31067: XML nodes must be updated with valid nodes and of the same type" #define OB_LOB_VALUE_NOT_EXIST__ORA_USER_ERROR_MSG "ORA-22922: LOB value does not exist" -#define OB_ERR_DUP_DEF_NAMESPACE__ORA_USER_ERROR_MSG "ORA-19118: XQST0066 - duplicate default namespace definition - %s." +#define OB_ERR_JSON_FUN_UNSUPPORTED_TYPE__ORA_USER_ERROR_MSG "ORA-40654: Input to JSON generation function has unsupported data type" #define OB_ERR_XQUERY_MULTI_VALUE__ORA_USER_ERROR_MSG "ORA-19279: XPTY0004 - XQuery dynamic type mismatch: expected singleton sequence - got multi-item sequence" #define OB_ERR_PARSE_XQUERY_EXPR__ORA_USER_ERROR_MSG "ORA-19114: XPST0003 - error during parsing the XQuery expression : %.*s" #define OB_ERR_LACK_XQUERY_LITERAL__ORA_USER_ERROR_MSG "ORA-19102: XQuery string literal expected" @@ -5879,7 +5879,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219; #define OB_ERR_XQUERY_UNSUPPORTED__ORA_USER_ERROR_MSG "ORA-19110: unsupported XQuery expression" #define OB_ERR_INVALID_XML_CHILD_NAME__ORA_USER_ERROR_MSG "ORA-31056: The document being inserted does not conform to specified child name" #define OB_ERR_XML_NOT_SUPPORT_OPERATION__ORA_USER_ERROR_MSG "ORA-31195: XML node '' (type=%s) does not support this operation" -#define OB_ERR_JSON_FUN_UNSUPPORTED_TYPE__ORA_USER_ERROR_MSG "ORA-40654: Input to JSON generation function has unsupported data type" +#define OB_ERR_DUP_DEF_NAMESPACE__ORA_USER_ERROR_MSG "ORA-19118: XQST0066 - duplicate default namespace definition - %s." #define OB_ERR_COMPARE_VARRAY_LOB_ATTR__ORA_USER_ERROR_MSG "ORA-22901: cannot compare VARRAY or LOB attributes of an object type" #define OB_ERR_XML_PARENT_ALREADY_CONTAINS_CHILD__ORA_USER_ERROR_MSG "ORA-31003: Parent %.*s already contains child entry %.*s" #define OB_SERVER_IS_INIT__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -8001, Server is initializing"