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

fix some inner view meta data bug

Browse Source
This commit is contained in:
raywill 2023-09-20 13:12:05 +00:00 committed by ob-robot
parent 8cf9667683
commit b901fa5a36
8 changed files with 113 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.github/workflows/compile.yml vendored
View File

@ -38,12 +38,32 @@ jobs:
key: ${{ runner.os }}-build-${{ env.cache-name }}-el7.x86_64-${{ hashFiles('deps/init/oceanbase.el7.x86_64.deps') }}
path: deps/3rd
enableCrossOsArchive: true
- name: Cache build
id: cache-build
uses: actions/cache@v3
env:
cache-name: cache-build
with:
key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.image }}-el7.x86_64-${{ github.ref_name }}
path: ~/.ccache
enableCrossOsArchive: false
restore-keys: |
${{ runner.os }}-${{ env.cache-name }}-${{ matrix.image }}-el7.x86_64
- name: Build init
if: steps.cache-deps.outputs.cache-hit != 'true'
run: bash build.sh init
- name: Build project
shell: bash
run: |
bash build.sh debug
cd build_debug && make -j4
rm -rf build_debug
export CCACHE_LOGFILE=$PWD/ccache.log
deps/3rd/usr/local/oceanbase/devtools/bin/ccache -z
bash build.sh debug -DOB_USE_CCACHE=ON
cd build_debug && make -j4 && cd -
deps/3rd/usr/local/oceanbase/devtools/bin/ccache -s
- if: ${{ runner.debug }}
run: cat $PWD/ccache.log

8
src/share/inner_table/ob_inner_table_schema.20001_20050.cpp
View File

File diff suppressed because one or more lines are too long

8
src/share/inner_table/ob_inner_table_schema.21001_21050.cpp
View File

@ -60,7 +60,7 @@ int ObInnerTableSchema::gv_session_event_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 tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, session_id as SID, event as EVENT, total_waits as TOTAL_WAITS, total_timeouts as TOTAL_TIMEOUTS, time_waited as TIME_WAITED, average_wait as AVERAGE_WAIT, max_wait as MAX_WAIT, time_waited_micro as TIME_WAITED_MICRO, null as CPU, event_id as EVENT_ID, wait_class_id as WAIT_CLASS_ID, `wait_class#` as `WAIT_CLASS#`, wait_class as WAIT_CLASS from oceanbase.__all_virtual_session_event )__"))) {
if (OB_FAIL(table_schema.set_view_definition(R"__( select tenant_id as CON_ID, svr_ip as SVR_IP, svr_port as SVR_PORT, session_id as SID, event as EVENT, total_waits as TOTAL_WAITS, total_timeouts as TOTAL_TIMEOUTS, time_waited as TIME_WAITED, average_wait as AVERAGE_WAIT, max_wait as MAX_WAIT, time_waited_micro as TIME_WAITED_MICRO, cast(null as UNSIGNED) as CPU, event_id as EVENT_ID, wait_class_id as WAIT_CLASS_ID, `wait_class#` as `WAIT_CLASS#`, wait_class as WAIT_CLASS from oceanbase.__all_virtual_session_event )__"))) {
LOG_ERROR("fail to set view_definition", K(ret));
}
}
@ -460,7 +460,7 @@ int ObInnerTableSchema::v_session_event_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 * FROM OCEANBASE.GV$SESSION_EVENT WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() )__"))) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM OCEANBASE.GV$SESSION_EVENT WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() )__"))) {
LOG_ERROR("fail to set view_definition", K(ret));
}
}
@ -1660,7 +1660,7 @@ int ObInnerTableSchema::gv_sql_plan_monitor_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 TENANT_ID as CON_ID, REQUEST_ID, NULL `KEY`, NULL STATUS, SVR_IP, SVR_PORT, TRACE_ID, DB_TIME, USER_IO_WAIT_TIME, NULL OTHER_WAIT_TIME, FIRST_REFRESH_TIME, LAST_REFRESH_TIME, FIRST_CHANGE_TIME, LAST_CHANGE_TIME, NULL REFRESH_COUNT, NULL SID, THREAD_ID PROCESS_NAME, NULL SQL_ID, NULL SQL_EXEC_START, NULL SQL_EXEC_ID, NULL SQL_PLAN_HASH_VALUE, NULL SQL_CHILD_ADDRESS, NULL PLAN_PARENT_ID, PLAN_LINE_ID, PLAN_OPERATION, NULL PLAN_OPTIONS, NULL PLAN_OBJECT_OWNER, NULL PLAN_OBJECT_NAME, NULL PLAN_OBJECT_TYPE, PLAN_DEPTH, NULL PLAN_POSITION, NULL PLAN_COST, NULL PLAN_CARDINALITY, NULL PLAN_BYTES, NULL PLAN_TIME, NULL PLAN_PARTITION_START, NULL PLAN_PARTITION_STOP, NULL PLAN_CPU_COST, NULL PLAN_IO_COST, NULL PLAN_TEMP_SPACE, STARTS, OUTPUT_ROWS, NULL IO_INTERCONNECT_BYTES, NULL PHYSICAL_READ_REQUESTS, NULL PHYSICAL_READ_BYTES, NULL PHYSICAL_WRITE_REQUESTS, NULL PHYSICAL_WRITE_BYTES, NULL WORKAREA_MEM, NULL WORKAREA_MAX_MEM, NULL WORKAREA_TEMPSEG, NULL WORKAREA_MAX_TEMPSEG, NULL OTHERSTAT_GROUP_ID, OTHERSTAT_1_ID, NULL OTHERSTAT_1_TYPE, OTHERSTAT_1_VALUE, OTHERSTAT_2_ID, NULL OTHERSTAT_2_TYPE, OTHERSTAT_2_VALUE, OTHERSTAT_3_ID, NULL OTHERSTAT_3_TYPE, OTHERSTAT_3_VALUE, OTHERSTAT_4_ID, NULL OTHERSTAT_4_TYPE, OTHERSTAT_4_VALUE, OTHERSTAT_5_ID, NULL OTHERSTAT_5_TYPE, OTHERSTAT_5_VALUE, OTHERSTAT_6_ID, NULL OTHERSTAT_6_TYPE, OTHERSTAT_6_VALUE, OTHERSTAT_7_ID, NULL OTHERSTAT_7_TYPE, OTHERSTAT_7_VALUE, OTHERSTAT_8_ID, NULL OTHERSTAT_8_TYPE, OTHERSTAT_8_VALUE, OTHERSTAT_9_ID, NULL OTHERSTAT_9_TYPE, OTHERSTAT_9_VALUE, OTHERSTAT_10_ID, NULL OTHERSTAT_10_TYPE, OTHERSTAT_10_VALUE, NULL OTHER_XML, NULL PLAN_OPERATION_INACTIVE, OUTPUT_BATCHES, SKIPPED_ROWS_COUNT FROM oceanbase.__all_virtual_sql_plan_monitor )__"))) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TENANT_ID as CON_ID, REQUEST_ID, CAST(NULL as UNSIGNED) AS `KEY`, CAST(NULL AS CHAR(19)) as STATUS, SVR_IP, SVR_PORT, TRACE_ID, DB_TIME, USER_IO_WAIT_TIME, CAST(NULL AS UNSIGNED) AS OTHER_WAIT_TIME, FIRST_REFRESH_TIME, LAST_REFRESH_TIME, FIRST_CHANGE_TIME, LAST_CHANGE_TIME, CAST(NULL AS UNSIGNED) AS REFRESH_COUNT, CAST(NULL AS UNSIGNED) AS SID, THREAD_ID PROCESS_NAME, CAST(NULL AS CHAR(32)) AS SQL_ID, CAST(NULL AS UNSIGNED) AS SQL_EXEC_START, CAST(NULL AS UNSIGNED) AS SQL_EXEC_ID, CAST(NULL AS UNSIGNED) AS SQL_PLAN_HASH_VALUE, CAST(NULL AS BINARY(8)) AS SQL_CHILD_ADDRESS, CAST(NULL AS UNSIGNED) AS PLAN_PARENT_ID, PLAN_LINE_ID, PLAN_OPERATION, CAST(NULL AS CHAR(30)) PLAN_OPTIONS, CAST(NULL AS CHAR(128)) PLAN_OBJECT_OWNER, CAST(NULL AS CHAR(128)) PLAN_OBJECT_NAME, CAST(NULL AS CHAR(80)) PLAN_OBJECT_TYPE, PLAN_DEPTH, CAST( NULL AS UNSIGNED) AS PLAN_POSITION, CAST( NULL AS UNSIGNED) AS PLAN_COST, CAST( NULL AS UNSIGNED) AS PLAN_CARDINALITY, CAST( NULL AS UNSIGNED) AS PLAN_BYTES, CAST( NULL AS UNSIGNED) AS PLAN_TIME, CAST( NULL AS UNSIGNED) AS PLAN_PARTITION_START, CAST( NULL AS UNSIGNED) AS PLAN_PARTITION_STOP, CAST( NULL AS UNSIGNED) AS PLAN_CPU_COST, CAST( NULL AS UNSIGNED) AS PLAN_IO_COST, CAST( NULL AS UNSIGNED) AS PLAN_TEMP_SPACE, STARTS, OUTPUT_ROWS, CAST( NULL AS UNSIGNED) AS IO_INTERCONNECT_BYTES, CAST( NULL AS UNSIGNED) AS PHYSICAL_READ_REQUESTS, CAST( NULL AS UNSIGNED) AS PHYSICAL_READ_BYTES, CAST( NULL AS UNSIGNED) AS PHYSICAL_WRITE_REQUESTS, CAST( NULL AS UNSIGNED) AS PHYSICAL_WRITE_BYTES, CAST( NULL AS UNSIGNED) AS WORKAREA_MEM, CAST( NULL AS UNSIGNED) AS WORKAREA_MAX_MEM, CAST( NULL AS UNSIGNED) AS WORKAREA_TEMPSEG, CAST( NULL AS UNSIGNED) AS WORKAREA_MAX_TEMPSEG, CAST( NULL AS UNSIGNED) AS OTHERSTAT_GROUP_ID, OTHERSTAT_1_ID, CAST(NULL AS UNSIGNED) AS OTHERSTAT_1_TYPE, OTHERSTAT_1_VALUE, OTHERSTAT_2_ID, CAST(NULL AS UNSIGNED) OTHERSTAT_2_TYPE, OTHERSTAT_2_VALUE, OTHERSTAT_3_ID, CAST(NULL AS UNSIGNED) OTHERSTAT_3_TYPE, OTHERSTAT_3_VALUE, OTHERSTAT_4_ID, CAST(NULL AS UNSIGNED) OTHERSTAT_4_TYPE, OTHERSTAT_4_VALUE, OTHERSTAT_5_ID, CAST(NULL AS UNSIGNED) OTHERSTAT_5_TYPE, OTHERSTAT_5_VALUE, OTHERSTAT_6_ID, CAST(NULL AS UNSIGNED) OTHERSTAT_6_TYPE, OTHERSTAT_6_VALUE, OTHERSTAT_7_ID, CAST(NULL AS UNSIGNED) OTHERSTAT_7_TYPE, OTHERSTAT_7_VALUE, OTHERSTAT_8_ID, CAST(NULL AS UNSIGNED) OTHERSTAT_8_TYPE, OTHERSTAT_8_VALUE, OTHERSTAT_9_ID, CAST(NULL AS UNSIGNED) OTHERSTAT_9_TYPE, OTHERSTAT_9_VALUE, OTHERSTAT_10_ID, CAST(NULL AS UNSIGNED) OTHERSTAT_10_TYPE, OTHERSTAT_10_VALUE, CAST(NULL AS CHAR(255)) AS OTHER_XML, CAST(NULL AS UNSIGNED) AS PLAN_OPERATION_INACTIVE, OUTPUT_BATCHES, SKIPPED_ROWS_COUNT FROM oceanbase.__all_virtual_sql_plan_monitor )__"))) {
LOG_ERROR("fail to set view_definition", K(ret));
}
}
@ -1710,7 +1710,7 @@ int ObInnerTableSchema::v_sql_plan_monitor_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 * FROM OCEANBASE.GV$SQL_PLAN_MONITOR WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() )__"))) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM OCEANBASE.GV$SQL_PLAN_MONITOR WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT() )__"))) {
LOG_ERROR("fail to set view_definition", K(ret));
}
}

2
src/share/inner_table/ob_inner_table_schema.21101_21150.cpp
View File

@ -360,7 +360,7 @@ int ObInnerTableSchema::v_sql_monitor_statname_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 NULL CON_ID, ID, GROUP_ID, NAME, DESCRIPTION, TYPE, 0 FLAGS FROM oceanbase.__all_virtual_sql_monitor_statname )__"))) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(NULL AS UNSIGNED) AS CON_ID, ID, GROUP_ID, NAME, DESCRIPTION, TYPE, 0 FLAGS FROM oceanbase.__all_virtual_sql_monitor_statname )__"))) {
LOG_ERROR("fail to set view_definition", K(ret));
}
}

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

@ -13455,7 +13455,7 @@ def_table_schema(
DATABASE_NAME AS SCHEMA_NAME,
b.charset AS DEFAULT_CHARACTER_SET_NAME,
b.collation AS DEFAULT_COLLATION_NAME,
NULL AS SQL_PATH,
CAST(NULL AS CHAR(512)) as SQL_PATH,
'NO' as DEFAULT_ENCRYPTION
FROM oceanbase.__all_database a inner join oceanbase.__tenant_virtual_collation b ON a.collation_type = b.collation_type
WHERE a.tenant_id = 0
@ -13751,9 +13751,10 @@ def_table_schema(
when a.table_type in (0, 2) then 'SYSTEM TABLE'
when a.table_type = 4 then 'VIEW'
else 'BASE TABLE' end as char(64)) as TABLE_TYPE,
cast(NULL as char(64)) as ENGINE,
cast(case when a.table_type in (0,3,5,6,7,11,12,13) then 'InnoDB'
else 'MEMORY' end as char(64)) as ENGINE,
cast(NULL as unsigned) as VERSION,
cast(NULL as char(10)) as ROW_FORMAT,
cast(a.store_format as char(10)) as ROW_FORMAT,
cast( coalesce(ts.row_cnt,0) as unsigned) as TABLE_ROWS,
cast( coalesce(ts.avg_row_len,0) as unsigned) as AVG_ROW_LENGTH,
cast( coalesce(ts.data_size,0) as unsigned) as DATA_LENGTH,
@ -13779,7 +13780,8 @@ def_table_schema(
c.table_type,
usec_to_time(d.schema_version) as gmt_create,
usec_to_time(c.schema_version) as gmt_modified,
c.comment
c.comment,
c.store_format
from oceanbase.__all_virtual_core_all_table c
join oceanbase.__all_virtual_core_all_table d
on c.tenant_id = d.tenant_id and d.table_name = '__all_core_table'
@ -13793,7 +13795,8 @@ def_table_schema(
table_type,
gmt_create,
gmt_modified,
comment
comment,
store_format
from oceanbase.__all_table) a
join oceanbase.__all_database b
on a.database_id = b.database_id
@ -13893,10 +13896,10 @@ def_table_schema(
a.table_name as TABLE_NAME,
b.column_name as COLUMN_NAME,
b.rowkey_position as ORDINAL_POSITION,
NULL as POSITION_IN_UNIQUE_CONSTRAINT,
NULL as REFERENCED_TABLE_SCHEMA,
NULL as REFERENCED_TABLE_NAME,
NULL as REFERENCED_COLUMN_NAME
CAST(NULL AS UNSIGNED) as POSITION_IN_UNIQUE_CONSTRAINT,
CAST(NULL AS CHAR(64)) as REFERENCED_TABLE_SCHEMA,
CAST(NULL AS CHAR(64)) as REFERENCED_TABLE_NAME,
CAST(NULL AS CHAR(64)) as REFERENCED_COLUMN_NAME
from oceanbase.__all_table a
join oceanbase.__all_column b
on a.tenant_id = b.tenant_id and a.table_id = b.table_id
@ -13919,10 +13922,10 @@ def_table_schema(
c.table_name as TABLE_NAME,
b.column_name as COLUMN_NAME,
b.index_position as ORDINAL_POSITION,
NULL as POSITION_IN_UNIQUE_CONSTRAINT,
NULL as REFERENCED_TABLE_SCHEMA,
NULL as REFERENCED_TABLE_NAME,
NULL as REFERENCED_COLUMN_NAME
CAST(NULL AS UNSIGNED) as POSITION_IN_UNIQUE_CONSTRAINT,
CAST(NULL AS CHAR(64)) as REFERENCED_TABLE_SCHEMA,
CAST(NULL AS CHAR(64)) as REFERENCED_TABLE_NAME,
CAST(NULL AS CHAR(64)) as REFERENCED_COLUMN_NAME
from oceanbase.__all_table a
join oceanbase.__all_column b
on a.tenant_id = b.tenant_id and a.table_id = b.table_id
@ -13946,7 +13949,7 @@ def_table_schema(
t.table_name as TABLE_NAME,
c.column_name as COLUMN_NAME,
fc.position as ORDINAL_POSITION,
NULL as POSITION_IN_UNIQUE_CONSTRAINT, /* POSITION_IN_UNIQUE_CONSTRAINT is not supported now */
CAST(NULL as UNSIGNED) as POSITION_IN_UNIQUE_CONSTRAINT, /* POSITION_IN_UNIQUE_CONSTRAINT is not supported now */
d2.database_name as REFERENCED_TABLE_SCHEMA,
t2.table_name as REFERENCED_TABLE_NAME,
c2.column_name as REFERENCED_COLUMN_NAME
@ -13977,7 +13980,7 @@ def_table_schema(
t.table_name as TABLE_NAME,
c.column_name as COLUMN_NAME,
fc.position as ORDINAL_POSITION,
NULL as POSITION_IN_UNIQUE_CONSTRAINT, /* POSITION_IN_UNIQUE_CONSTRAINT is not supported now */
CAST(NULL as UNSIGNED) as POSITION_IN_UNIQUE_CONSTRAINT, /* POSITION_IN_UNIQUE_CONSTRAINT is not supported now */
d.database_name as REFERENCED_TABLE_SCHEMA,
t2.mock_fk_parent_table_name as REFERENCED_TABLE_NAME,
c2.parent_column_name as REFERENCED_COLUMN_NAME
@ -14017,7 +14020,7 @@ def_table_schema(
gm_columns = [],
in_tenant_space = True,
view_definition = """
SELECT CAST('OceanBase' as CHAR(64)) as ENGINE,
SELECT CAST('InnoDB' as CHAR(64)) as ENGINE,
CAST('YES' AS CHAR(8)) as SUPPORT,
CAST('Supports transactions' as CHAR(80)) as COMMENT,
CAST('YES' as CHAR(3)) as TRANSACTIONS,
@ -14187,7 +14190,7 @@ def_table_schema(
average_wait as AVERAGE_WAIT,
max_wait as MAX_WAIT,
time_waited_micro as TIME_WAITED_MICRO,
null as CPU,
cast(null as UNSIGNED) as CPU,
event_id as EVENT_ID,
wait_class_id as WAIT_CLASS_ID,
`wait_class#` as `WAIT_CLASS#`,
@ -14403,7 +14406,7 @@ def_table_schema(
table_type = 'SYSTEM_VIEW',
in_tenant_space = True,
view_definition = """
SELECT * FROM OCEANBASE.GV$SESSION_EVENT
SELECT * FROM OCEANBASE.GV$SESSION_EVENT
WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT()
""".replace("\n", " "),
@ -15108,88 +15111,88 @@ def_table_schema(
SELECT
TENANT_ID as CON_ID,
REQUEST_ID,
NULL `KEY`,
NULL STATUS,
CAST(NULL as UNSIGNED) AS `KEY`,
CAST(NULL AS CHAR(19)) as STATUS,
SVR_IP,
SVR_PORT,
TRACE_ID,
DB_TIME,
USER_IO_WAIT_TIME,
NULL OTHER_WAIT_TIME,
CAST(NULL AS UNSIGNED) AS OTHER_WAIT_TIME,
FIRST_REFRESH_TIME,
LAST_REFRESH_TIME,
FIRST_CHANGE_TIME,
LAST_CHANGE_TIME,
NULL REFRESH_COUNT,
NULL SID,
CAST(NULL AS UNSIGNED) AS REFRESH_COUNT,
CAST(NULL AS UNSIGNED) AS SID,
THREAD_ID PROCESS_NAME,
NULL SQL_ID,
NULL SQL_EXEC_START,
NULL SQL_EXEC_ID,
NULL SQL_PLAN_HASH_VALUE,
NULL SQL_CHILD_ADDRESS,
NULL PLAN_PARENT_ID,
CAST(NULL AS CHAR(32)) AS SQL_ID,
CAST(NULL AS UNSIGNED) AS SQL_EXEC_START,
CAST(NULL AS UNSIGNED) AS SQL_EXEC_ID,
CAST(NULL AS UNSIGNED) AS SQL_PLAN_HASH_VALUE,
CAST(NULL AS BINARY(8)) AS SQL_CHILD_ADDRESS,
CAST(NULL AS UNSIGNED) AS PLAN_PARENT_ID,
PLAN_LINE_ID,
PLAN_OPERATION,
NULL PLAN_OPTIONS,
NULL PLAN_OBJECT_OWNER,
NULL PLAN_OBJECT_NAME,
NULL PLAN_OBJECT_TYPE,
CAST(NULL AS CHAR(30)) PLAN_OPTIONS,
CAST(NULL AS CHAR(128)) PLAN_OBJECT_OWNER,
CAST(NULL AS CHAR(128)) PLAN_OBJECT_NAME,
CAST(NULL AS CHAR(80)) PLAN_OBJECT_TYPE,
PLAN_DEPTH,
NULL PLAN_POSITION,
NULL PLAN_COST,
NULL PLAN_CARDINALITY,
NULL PLAN_BYTES,
NULL PLAN_TIME,
NULL PLAN_PARTITION_START,
NULL PLAN_PARTITION_STOP,
NULL PLAN_CPU_COST,
NULL PLAN_IO_COST,
NULL PLAN_TEMP_SPACE,
CAST( NULL AS UNSIGNED) AS PLAN_POSITION,
CAST( NULL AS UNSIGNED) AS PLAN_COST,
CAST( NULL AS UNSIGNED) AS PLAN_CARDINALITY,
CAST( NULL AS UNSIGNED) AS PLAN_BYTES,
CAST( NULL AS UNSIGNED) AS PLAN_TIME,
CAST( NULL AS UNSIGNED) AS PLAN_PARTITION_START,
CAST( NULL AS UNSIGNED) AS PLAN_PARTITION_STOP,
CAST( NULL AS UNSIGNED) AS PLAN_CPU_COST,
CAST( NULL AS UNSIGNED) AS PLAN_IO_COST,
CAST( NULL AS UNSIGNED) AS PLAN_TEMP_SPACE,
STARTS,
OUTPUT_ROWS,
NULL IO_INTERCONNECT_BYTES,
NULL PHYSICAL_READ_REQUESTS,
NULL PHYSICAL_READ_BYTES,
NULL PHYSICAL_WRITE_REQUESTS,
NULL PHYSICAL_WRITE_BYTES,
NULL WORKAREA_MEM,
NULL WORKAREA_MAX_MEM,
NULL WORKAREA_TEMPSEG,
NULL WORKAREA_MAX_TEMPSEG,
NULL OTHERSTAT_GROUP_ID,
CAST( NULL AS UNSIGNED) AS IO_INTERCONNECT_BYTES,
CAST( NULL AS UNSIGNED) AS PHYSICAL_READ_REQUESTS,
CAST( NULL AS UNSIGNED) AS PHYSICAL_READ_BYTES,
CAST( NULL AS UNSIGNED) AS PHYSICAL_WRITE_REQUESTS,
CAST( NULL AS UNSIGNED) AS PHYSICAL_WRITE_BYTES,
CAST( NULL AS UNSIGNED) AS WORKAREA_MEM,
CAST( NULL AS UNSIGNED) AS WORKAREA_MAX_MEM,
CAST( NULL AS UNSIGNED) AS WORKAREA_TEMPSEG,
CAST( NULL AS UNSIGNED) AS WORKAREA_MAX_TEMPSEG,
CAST( NULL AS UNSIGNED) AS OTHERSTAT_GROUP_ID,
OTHERSTAT_1_ID,
NULL OTHERSTAT_1_TYPE,
CAST(NULL AS UNSIGNED) AS OTHERSTAT_1_TYPE,
OTHERSTAT_1_VALUE,
OTHERSTAT_2_ID,
NULL OTHERSTAT_2_TYPE,
CAST(NULL AS UNSIGNED) OTHERSTAT_2_TYPE,
OTHERSTAT_2_VALUE,
OTHERSTAT_3_ID,
NULL OTHERSTAT_3_TYPE,
CAST(NULL AS UNSIGNED) OTHERSTAT_3_TYPE,
OTHERSTAT_3_VALUE,
OTHERSTAT_4_ID,
NULL OTHERSTAT_4_TYPE,
CAST(NULL AS UNSIGNED) OTHERSTAT_4_TYPE,
OTHERSTAT_4_VALUE,
OTHERSTAT_5_ID,
NULL OTHERSTAT_5_TYPE,
CAST(NULL AS UNSIGNED) OTHERSTAT_5_TYPE,
OTHERSTAT_5_VALUE,
OTHERSTAT_6_ID,
NULL OTHERSTAT_6_TYPE,
CAST(NULL AS UNSIGNED) OTHERSTAT_6_TYPE,
OTHERSTAT_6_VALUE,
OTHERSTAT_7_ID,
NULL OTHERSTAT_7_TYPE,
CAST(NULL AS UNSIGNED) OTHERSTAT_7_TYPE,
OTHERSTAT_7_VALUE,
OTHERSTAT_8_ID,
NULL OTHERSTAT_8_TYPE,
CAST(NULL AS UNSIGNED) OTHERSTAT_8_TYPE,
OTHERSTAT_8_VALUE,
OTHERSTAT_9_ID,
NULL OTHERSTAT_9_TYPE,
CAST(NULL AS UNSIGNED) OTHERSTAT_9_TYPE,
OTHERSTAT_9_VALUE,
OTHERSTAT_10_ID,
NULL OTHERSTAT_10_TYPE,
CAST(NULL AS UNSIGNED) OTHERSTAT_10_TYPE,
OTHERSTAT_10_VALUE,
NULL OTHER_XML,
NULL PLAN_OPERATION_INACTIVE,
CAST(NULL AS CHAR(255)) AS OTHER_XML,
CAST(NULL AS UNSIGNED) AS PLAN_OPERATION_INACTIVE,
OUTPUT_BATCHES,
SKIPPED_ROWS_COUNT
FROM oceanbase.__all_virtual_sql_plan_monitor
@ -15208,7 +15211,7 @@ def_table_schema(
in_tenant_space = True,
rowkey_columns = [],
view_definition = """
SELECT * FROM OCEANBASE.GV$SQL_PLAN_MONITOR
SELECT * FROM OCEANBASE.GV$SQL_PLAN_MONITOR
WHERE SVR_IP=HOST_IP() AND SVR_PORT=RPC_PORT()
""".replace("\n", " "),
@ -16390,7 +16393,7 @@ def_table_schema(
normal_columns = [],
view_definition = """
SELECT
NULL CON_ID,
CAST(NULL AS UNSIGNED) AS CON_ID,
ID,
GROUP_ID,
NAME,

4
src/sql/resolver/cmd/ob_show_resolver.cpp
View File

@ -1283,7 +1283,7 @@ int ObShowResolver::resolve(const ParseNode &parse_tree)
} else {
show_resv_ctx.stmt_type_ = stmt::T_SHOW_ENGINES;
GEN_SQL_STEP_1(ObShowSqlSet::SHOW_ENGINES);
GEN_SQL_STEP_2(ObShowSqlSet::SHOW_ENGINES, OB_SYS_DATABASE_NAME, OB_ALL_VIRTUAL_ENGINE_TNAME);
GEN_SQL_STEP_2(ObShowSqlSet::SHOW_ENGINES, OB_INFORMATION_SCHEMA_NAME, OB_ENGINES_TNAME);
}
}();
break;
@ -1304,7 +1304,7 @@ int ObShowResolver::resolve(const ParseNode &parse_tree)
case T_SHOW_QUERY_RESPONSE_TIME: {
if (is_oracle_mode) {
ret = OB_NOT_SUPPORTED;
LOG_USER_ERROR(OB_NOT_SUPPORTED, "show engines in oracle mode is");
LOG_USER_ERROR(OB_NOT_SUPPORTED, "show query response time in oracle mode is");
} else if (OB_UNLIKELY(parse_tree.num_child_ != 0)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("parse tree is wrong", K(ret), K(parse_tree.num_child_));

16
tools/deploy/mysql_test/test_suite/information_schema/r/mysql/information_schema_desc.result
View File

File diff suppressed because one or more lines are too long

4
tools/deploy/mysql_test/test_suite/inner_table/r/mysql/schemata.result
View File

@ -4,12 +4,12 @@ CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_P
select schema_name from schemata;
show create view schemata;
View Create View character_set_client collation_connection
SCHEMATA CREATE VIEW `SCHEMATA` AS SELECT 'def' AS CATALOG_NAME, DATABASE_NAME AS SCHEMA_NAME, b.charset AS DEFAULT_CHARACTER_SET_NAME, b.collation AS DEFAULT_COLLATION_NAME, NULL AS SQL_PATH, 'NO' as DEFAULT_ENCRYPTION FROM oceanbase.__all_database a inner join oceanbase.__tenant_virtual_collation b ON a.collation_type = b.collation_type WHERE a.tenant_id = 0 and in_recyclebin = 0 and database_name != '__recyclebin' ORDER BY a.database_id utf8mb4 utf8mb4_general_ci
SCHEMATA CREATE VIEW `SCHEMATA` AS SELECT 'def' AS CATALOG_NAME, DATABASE_NAME AS SCHEMA_NAME, b.charset AS DEFAULT_CHARACTER_SET_NAME, b.collation AS DEFAULT_COLLATION_NAME, CAST(NULL AS CHAR(512)) as SQL_PATH, 'NO' as DEFAULT_ENCRYPTION FROM oceanbase.__all_database a inner join oceanbase.__tenant_virtual_collation b ON a.collation_type = b.collation_type WHERE a.tenant_id = 0 and in_recyclebin = 0 and database_name != '__recyclebin' ORDER BY a.database_id utf8mb4 utf8mb4_general_ci
desc schemata;
Field Type Null Key Default Extra
CATALOG_NAME varchar(3) NO
SCHEMA_NAME varchar(128) NO
DEFAULT_CHARACTER_SET_NAME varchar(128) NO
DEFAULT_COLLATION_NAME varchar(128) NO
SQL_PATH null NO
SQL_PATH varchar(512) NO
DEFAULT_ENCRYPTION varchar(2) NO