hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[to 56543212] Add xa recover placeholder in master.

Browse Source
This commit is contained in:
swjtu-wenxiang
2024-05-09 03:16:45 +00:00
committed by ob-robot
parent d589926526
commit 4b5f2bbcbe
6 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/objit/include/objit/common/ob_item_type.h
View File

@ -2483,6 +2483,7 @@ typedef enum ObItemType
T_SET_UNION_ALL, T_SET_UNION_ALL,
T_SHOW_CHECK_TABLE, T_SHOW_CHECK_TABLE,
T_SHARED_STORAGE_INFO, T_SHARED_STORAGE_INFO,
T_XA_RECOVER,
T_MAX //Attention: add a new type before T_MAX T_MAX //Attention: add a new type before T_MAX
} ObItemType; } ObItemType;

2
src/share/inner_table/ob_inner_table_schema.h
View File

@ -5450,6 +5450,7 @@ const uint64_t tenant_space_tables [] = {
OB_ALL_VIRTUAL_OPEN_CURSOR_TID, OB_ALL_VIRTUAL_OPEN_CURSOR_TID,
OB_ALL_VIRTUAL_FILES_TID, OB_ALL_VIRTUAL_FILES_TID,
OB_TENANT_VIRTUAL_OBJECT_DEFINITION_TID, OB_TENANT_VIRTUAL_OBJECT_DEFINITION_TID,
OB_ALL_VIRTUAL_GLOBAL_TRANSACTION_TID,
OB_ALL_VIRTUAL_DEADLOCK_EVENT_HISTORY_TID, OB_ALL_VIRTUAL_DEADLOCK_EVENT_HISTORY_TID,
OB_ALL_VIRTUAL_TENANT_MEMORY_INFO_TID, OB_ALL_VIRTUAL_TENANT_MEMORY_INFO_TID,
OB_TENANT_VIRTUAL_SHOW_CREATE_TRIGGER_TID, OB_TENANT_VIRTUAL_SHOW_CREATE_TRIGGER_TID,
@ -8004,6 +8005,7 @@ const char* const tenant_space_table_names [] = {
OB_ALL_VIRTUAL_OPEN_CURSOR_TNAME, OB_ALL_VIRTUAL_OPEN_CURSOR_TNAME,
OB_ALL_VIRTUAL_FILES_TNAME, OB_ALL_VIRTUAL_FILES_TNAME,
OB_TENANT_VIRTUAL_OBJECT_DEFINITION_TNAME, OB_TENANT_VIRTUAL_OBJECT_DEFINITION_TNAME,
OB_ALL_VIRTUAL_GLOBAL_TRANSACTION_TNAME,
OB_ALL_VIRTUAL_DEADLOCK_EVENT_HISTORY_TNAME, OB_ALL_VIRTUAL_DEADLOCK_EVENT_HISTORY_TNAME,
OB_ALL_VIRTUAL_TENANT_MEMORY_INFO_TNAME, OB_ALL_VIRTUAL_TENANT_MEMORY_INFO_TNAME,
OB_TENANT_VIRTUAL_SHOW_CREATE_TRIGGER_TNAME, OB_TENANT_VIRTUAL_SHOW_CREATE_TRIGGER_TNAME,

3
src/share/inner_table/ob_inner_table_schema_def.py
View File

@ -11383,7 +11383,8 @@ def_table_schema(
def_table_schema(**gen_iterate_private_virtual_table_def( def_table_schema(**gen_iterate_private_virtual_table_def(
table_id = '12206', table_id = '12206',
table_name = '__all_virtual_global_transaction', table_name = '__all_virtual_global_transaction',
keywords = all_def_keywords['__all_tenant_global_transaction'])) keywords = all_def_keywords['__all_tenant_global_transaction'],
in_tenant_space = True))
# 12207: __all_virtual_all_clusters # abandoned in 4.0 # 12207: __all_virtual_all_clusters # abandoned in 4.0

2
src/sql/resolver/ob_stmt_type.h
View File

@ -338,6 +338,8 @@ OB_STMT_TYPE_DEF_UNKNOWN_AT(T_KV_MULTI_INCREMENT, err_stmt_type_priv, 337)
OB_STMT_TYPE_DEF_UNKNOWN_AT(T_KV_MULTI_APPEND, err_stmt_type_priv, 338) OB_STMT_TYPE_DEF_UNKNOWN_AT(T_KV_MULTI_APPEND, err_stmt_type_priv, 338)
OB_STMT_TYPE_DEF_UNKNOWN_AT(T_KV_MULTI_PUT, err_stmt_type_priv, 339) OB_STMT_TYPE_DEF_UNKNOWN_AT(T_KV_MULTI_PUT, err_stmt_type_priv, 339)
OB_STMT_TYPE_DEF_UNKNOWN_AT(T_KV_QUERY, err_stmt_type_priv, 340) OB_STMT_TYPE_DEF_UNKNOWN_AT(T_KV_QUERY, err_stmt_type_priv, 340)
OB_STMT_TYPE_DEF_UNKNOWN_AT(T_XA_RECOVER, no_priv_needed, 341)
OB_STMT_TYPE_DEF_UNKNOWN_AT(T_MAX, err_stmt_type_priv, 500) OB_STMT_TYPE_DEF_UNKNOWN_AT(T_MAX, err_stmt_type_priv, 500)
#endif #endif

2
tools/deploy/mysql_test/r/mysql/information_schema.result
View File

@ -732,6 +732,7 @@ select * from information_schema.tables where table_schema in ('oceanbase', 'mys
| def | oceanbase | __all_virtual_files | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | | | def | oceanbase | __all_virtual_files | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | |
| def | oceanbase | __all_virtual_flt_config | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | | | def | oceanbase | __all_virtual_flt_config | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | |
| def | oceanbase | __all_virtual_freeze_info | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | | | def | oceanbase | __all_virtual_freeze_info | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | |
| def | oceanbase | __all_virtual_global_transaction | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | |
| def | oceanbase | __all_virtual_import_table_job | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | | | def | oceanbase | __all_virtual_import_table_job | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | |
| def | oceanbase | __all_virtual_import_table_job_history | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | | | def | oceanbase | __all_virtual_import_table_job_history | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | |
| def | oceanbase | __all_virtual_import_table_task | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | | | def | oceanbase | __all_virtual_import_table_task | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | |
@ -2171,6 +2172,7 @@ select * from information_schema.tables where table_schema in ('oceanbase', 'mys
| def | oceanbase | __all_virtual_files | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | | | def | oceanbase | __all_virtual_files | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | |
| def | oceanbase | __all_virtual_flt_config | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | | | def | oceanbase | __all_virtual_flt_config | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | |
| def | oceanbase | __all_virtual_freeze_info | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | | | def | oceanbase | __all_virtual_freeze_info | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | |
| def | oceanbase | __all_virtual_global_transaction | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | |
| def | oceanbase | __all_virtual_import_table_job | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | | | def | oceanbase | __all_virtual_import_table_job | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | |
| def | oceanbase | __all_virtual_import_table_job_history | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | | | def | oceanbase | __all_virtual_import_table_job_history | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | |
| def | oceanbase | __all_virtual_import_table_task | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | | | def | oceanbase | __all_virtual_import_table_task | SYSTEM TABLE | MEMORY | NULL | DYNAMIC | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | utf8mb4_general_ci | NULL | NULL | |

18
tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_mysql.result
View File

@ -2180,6 +2180,24 @@ collation_connection varchar(128) NO NULL
proc_type bigint(20) NO NULL proc_type bigint(20) NO NULL
collation_database varchar(128) NO NULL collation_database varchar(128) NO NULL
sql_mode varchar(128) NO NULL sql_mode varchar(128) NO NULL
desc oceanbase.__all_virtual_global_transaction;
Field Type Null Key Default Extra
tenant_id bigint(20) NO PRI NULL
gtrid varbinary(128) NO PRI NULL
bqual varbinary(128) NO PRI NULL
format_id bigint(20) NO PRI 1
gmt_create timestamp(6) NO NULL
gmt_modified timestamp(6) NO NULL
trans_id bigint(20) NO NULL
coordinator bigint(20) YES NULL
scheduler_ip varchar(128) NO NULL
scheduler_port bigint(20) NO NULL
is_readonly tinyint(4) NO 0
state bigint(20) NO NULL
flag bigint(20) NO NULL
select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_global_transaction;
IF(count(*) >= 0, 1, 0)
1
desc oceanbase.__all_virtual_deadlock_event_history; desc oceanbase.__all_virtual_deadlock_event_history;
Field Type Null Key Default Extra Field Type Null Key Default Extra
tenant_id bigint(20) NO PRI NULL tenant_id bigint(20) NO PRI NULL