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

Fix WR wrong CDB_ and DBA_ view definition

Browse Source
This commit is contained in:
AntiTopQuark
2024-02-09 13:56:13 +00:00
committed by ob-robot
parent d3dff932a4
commit e4860ecd9c
3 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/share/inner_table/ob_inner_table_schema.21351_21400.cpp
View File

@ -1660,7 +1660,7 @@ int ObInnerTableSchema::dba_wr_active_session_history_schema(ObTableSchema &tabl
table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT ASH.CLUSTER_ID AS CLUSTER_ID, ASH.TENANT_ID AS TENANT_ID, ASH.SNAP_ID AS SNAP_ID, ASH.SVR_IP AS SVR_IP, ASH.SVR_PORT AS SVR_PORT, ASH.SAMPLE_ID AS SAMPLE_ID, ASH.SESSION_ID AS SESSION_ID, ASH.SAMPLE_TIME AS SAMPLE_TIME, ASH.USER_ID AS USER_ID, ASH.SESSION_TYPE AS SESSION_TYPE, CAST(IF (ASH.EVENT_NO = 0, 'ON CPU', 'WAITING') AS CHAR(7)) AS SESSION_STATE, ASH.SQL_ID AS SQL_ID, ASH.TRACE_ID AS TRACE_ID, ASH.EVENT_NO AS EVENT_NO, ASH.TIME_WAITED AS TIME_WAITED, ASH.P1 AS P1, ASH.P2 AS P2, ASH.P3 AS P3, ASH.SQL_PLAN_LINE_ID AS SQL_PLAN_LINE_ID, ASH.TIME_MODEL AS TIME_MODEL, CAST(CASE WHEN (ASH.TIME_MODEL & 1) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_PARSE, CAST(CASE WHEN (ASH.TIME_MODEL & 2) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_PL_PARSE, CAST(CASE WHEN (ASH.TIME_MODEL & 4) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_PLAN_CACHE, CAST(CASE WHEN (ASH.TIME_MODEL & 8) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_SQL_OPTIMIZE, CAST(CASE WHEN (ASH.TIME_MODEL & 16) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_SQL_EXECUTION, CAST(CASE WHEN (ASH.TIME_MODEL & 32) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_PX_EXECUTION, CAST(CASE WHEN (ASH.TIME_MODEL & 64) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_SEQUENCE_LOAD, CAST(CASE WHEN (ASH.TIME_MODEL & 128) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_COMMITTING, CAST(CASE WHEN (ASH.TIME_MODEL & 256) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_STORAGE_READ, CAST(CASE WHEN (ASH.TIME_MODEL & 512) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_STORAGE_WRITE, CAST(CASE WHEN (ASH.TIME_MODEL & 1024) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_REMOTE_DAS_EXECUTION, ASH.MODULE AS MODULE, ASH.ACTION AS ACTION, ASH.CLIENT_ID AS CLIENT_ID, ASH.BACKTRACE AS BACKTRACE, ASH.PLAN_ID AS PLAN_ID FROM ( OCEANBASE.__ALL_VIRTUAL_WR_ACTIVE_SESSION_HISTORY ASH JOIN OCEANBASE.__ALL_VIRTUAL_WR_SNAPSHOT SNAP ON ASH.CLUSTER_ID = SNAP.CLUSTER_ID AND ASH.TENANT_ID = SNAP.TENANT_ID AND ASH.SNAP_ID = SNAP.SNAP_ID AND ASH.SVR_IP = SNAP.SVR_IP AND ASH.SVR_PORT = SNAP.SVR_PORT ) WHERE ASH.TENANT_ID = EFFECTIVE_TENANT_ID() AND SNAP.STATUS = 0; )__"))) { if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT ASH.CLUSTER_ID AS CLUSTER_ID, ASH.TENANT_ID AS TENANT_ID, ASH.SNAP_ID AS SNAP_ID, ASH.SVR_IP AS SVR_IP, ASH.SVR_PORT AS SVR_PORT, ASH.SAMPLE_ID AS SAMPLE_ID, ASH.SESSION_ID AS SESSION_ID, ASH.SAMPLE_TIME AS SAMPLE_TIME, ASH.USER_ID AS USER_ID, ASH.SESSION_TYPE AS SESSION_TYPE, CAST(IF (ASH.EVENT_NO = 0, 'ON CPU', 'WAITING') AS CHAR(7)) AS SESSION_STATE, ASH.SQL_ID AS SQL_ID, ASH.TRACE_ID AS TRACE_ID, ASH.EVENT_NO AS EVENT_NO, ASH.TIME_WAITED AS TIME_WAITED, ASH.P1 AS P1, ASH.P2 AS P2, ASH.P3 AS P3, ASH.SQL_PLAN_LINE_ID AS SQL_PLAN_LINE_ID, ASH.TIME_MODEL AS TIME_MODEL, CAST(CASE WHEN (ASH.TIME_MODEL & 1) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_PARSE, CAST(CASE WHEN (ASH.TIME_MODEL & 2) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_PL_PARSE, CAST(CASE WHEN (ASH.TIME_MODEL & 4) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_PLAN_CACHE, CAST(CASE WHEN (ASH.TIME_MODEL & 8) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_SQL_OPTIMIZE, CAST(CASE WHEN (ASH.TIME_MODEL & 16) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_SQL_EXECUTION, CAST(CASE WHEN (ASH.TIME_MODEL & 32) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_PX_EXECUTION, CAST(CASE WHEN (ASH.TIME_MODEL & 64) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_SEQUENCE_LOAD, CAST(CASE WHEN (ASH.TIME_MODEL & 128) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_COMMITTING, CAST(CASE WHEN (ASH.TIME_MODEL & 256) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_STORAGE_READ, CAST(CASE WHEN (ASH.TIME_MODEL & 512) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_STORAGE_WRITE, CAST(CASE WHEN (ASH.TIME_MODEL & 1024) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_REMOTE_DAS_EXECUTION, ASH.MODULE AS MODULE, ASH.ACTION AS ACTION, ASH.CLIENT_ID AS CLIENT_ID, ASH.BACKTRACE AS BACKTRACE, ASH.PLAN_ID AS PLAN_ID FROM ( OCEANBASE.__ALL_VIRTUAL_WR_ACTIVE_SESSION_HISTORY ASH JOIN OCEANBASE.__ALL_VIRTUAL_WR_SNAPSHOT SNAP ON ASH.CLUSTER_ID = SNAP.CLUSTER_ID AND ASH.TENANT_ID = SNAP.TENANT_ID AND ASH.SNAP_ID = SNAP.SNAP_ID ) WHERE ASH.TENANT_ID = EFFECTIVE_TENANT_ID() AND SNAP.STATUS = 0; )__"))) {
LOG_ERROR("fail to set view_definition", K(ret)); LOG_ERROR("fail to set view_definition", K(ret));
} }
} }
@ -1710,7 +1710,7 @@ int ObInnerTableSchema::cdb_wr_active_session_history_schema(ObTableSchema &tabl
table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT ASH.CLUSTER_ID AS CLUSTER_ID, ASH.TENANT_ID AS TENANT_ID, ASH.SNAP_ID AS SNAP_ID, ASH.SVR_IP AS SVR_IP, ASH.SVR_PORT AS SVR_PORT, ASH.SAMPLE_ID AS SAMPLE_ID, ASH.SESSION_ID AS SESSION_ID, ASH.SAMPLE_TIME AS SAMPLE_TIME, ASH.USER_ID AS USER_ID, ASH.SESSION_TYPE AS SESSION_TYPE, CAST(IF (ASH.EVENT_NO = 0, 'ON CPU', 'WAITING') AS CHAR(7)) AS SESSION_STATE, ASH.SQL_ID AS SQL_ID, ASH.TRACE_ID AS TRACE_ID, ASH.EVENT_NO AS EVENT_NO, ASH.TIME_WAITED AS TIME_WAITED, ASH.P1 AS P1, ASH.P2 AS P2, ASH.P3 AS P3, ASH.SQL_PLAN_LINE_ID AS SQL_PLAN_LINE_ID, ASH.TIME_MODEL AS TIME_MODEL, CAST(CASE WHEN (ASH.TIME_MODEL & 1) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_PARSE, CAST(CASE WHEN (ASH.TIME_MODEL & 2) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_PL_PARSE, CAST(CASE WHEN (ASH.TIME_MODEL & 4) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_PLAN_CACHE, CAST(CASE WHEN (ASH.TIME_MODEL & 8) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_SQL_OPTIMIZE, CAST(CASE WHEN (ASH.TIME_MODEL & 16) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_SQL_EXECUTION, CAST(CASE WHEN (ASH.TIME_MODEL & 32) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_PX_EXECUTION, CAST(CASE WHEN (ASH.TIME_MODEL & 64) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_SEQUENCE_LOAD, CAST(CASE WHEN (ASH.TIME_MODEL & 128) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_COMMITTING, CAST(CASE WHEN (ASH.TIME_MODEL & 256) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_STORAGE_READ, CAST(CASE WHEN (ASH.TIME_MODEL & 512) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_STORAGE_WRITE, CAST(CASE WHEN (ASH.TIME_MODEL & 1024) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_REMOTE_DAS_EXECUTION, ASH.MODULE AS MODULE, ASH.ACTION AS ACTION, ASH.CLIENT_ID AS CLIENT_ID, ASH.BACKTRACE AS BACKTRACE, ASH.PLAN_ID AS PLAN_ID FROM ( OCEANBASE.__ALL_VIRTUAL_WR_ACTIVE_SESSION_HISTORY ASH JOIN OCEANBASE.__ALL_VIRTUAL_WR_SNAPSHOT SNAP ON ASH.CLUSTER_ID = SNAP.CLUSTER_ID AND ASH.TENANT_ID = SNAP.TENANT_ID AND ASH.SNAP_ID = SNAP.SNAP_ID AND ASH.SVR_IP = SNAP.SVR_IP AND ASH.SVR_PORT = SNAP.SVR_PORT ) WHERE SNAP.STATUS = 0; )__"))) { if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT ASH.CLUSTER_ID AS CLUSTER_ID, ASH.TENANT_ID AS TENANT_ID, ASH.SNAP_ID AS SNAP_ID, ASH.SVR_IP AS SVR_IP, ASH.SVR_PORT AS SVR_PORT, ASH.SAMPLE_ID AS SAMPLE_ID, ASH.SESSION_ID AS SESSION_ID, ASH.SAMPLE_TIME AS SAMPLE_TIME, ASH.USER_ID AS USER_ID, ASH.SESSION_TYPE AS SESSION_TYPE, CAST(IF (ASH.EVENT_NO = 0, 'ON CPU', 'WAITING') AS CHAR(7)) AS SESSION_STATE, ASH.SQL_ID AS SQL_ID, ASH.TRACE_ID AS TRACE_ID, ASH.EVENT_NO AS EVENT_NO, ASH.TIME_WAITED AS TIME_WAITED, ASH.P1 AS P1, ASH.P2 AS P2, ASH.P3 AS P3, ASH.SQL_PLAN_LINE_ID AS SQL_PLAN_LINE_ID, ASH.TIME_MODEL AS TIME_MODEL, CAST(CASE WHEN (ASH.TIME_MODEL & 1) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_PARSE, CAST(CASE WHEN (ASH.TIME_MODEL & 2) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_PL_PARSE, CAST(CASE WHEN (ASH.TIME_MODEL & 4) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_PLAN_CACHE, CAST(CASE WHEN (ASH.TIME_MODEL & 8) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_SQL_OPTIMIZE, CAST(CASE WHEN (ASH.TIME_MODEL & 16) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_SQL_EXECUTION, CAST(CASE WHEN (ASH.TIME_MODEL & 32) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_PX_EXECUTION, CAST(CASE WHEN (ASH.TIME_MODEL & 64) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_SEQUENCE_LOAD, CAST(CASE WHEN (ASH.TIME_MODEL & 128) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_COMMITTING, CAST(CASE WHEN (ASH.TIME_MODEL & 256) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_STORAGE_READ, CAST(CASE WHEN (ASH.TIME_MODEL & 512) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_STORAGE_WRITE, CAST(CASE WHEN (ASH.TIME_MODEL & 1024) > 0 THEN 'Y' ELSE 'N' END AS CHAR(1)) AS IN_REMOTE_DAS_EXECUTION, ASH.MODULE AS MODULE, ASH.ACTION AS ACTION, ASH.CLIENT_ID AS CLIENT_ID, ASH.BACKTRACE AS BACKTRACE, ASH.PLAN_ID AS PLAN_ID FROM ( OCEANBASE.__ALL_VIRTUAL_WR_ACTIVE_SESSION_HISTORY ASH JOIN OCEANBASE.__ALL_VIRTUAL_WR_SNAPSHOT SNAP ON ASH.CLUSTER_ID = SNAP.CLUSTER_ID AND ASH.TENANT_ID = SNAP.TENANT_ID AND ASH.SNAP_ID = SNAP.SNAP_ID ) WHERE SNAP.STATUS = 0; )__"))) {
LOG_ERROR("fail to set view_definition", K(ret)); LOG_ERROR("fail to set view_definition", K(ret));
} }
} }
@ -1960,7 +1960,7 @@ int ObInnerTableSchema::dba_wr_sysstat_schema(ObTableSchema &table_schema)
table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT STAT.CLUSTER_ID AS CLUSTER_ID, STAT.TENANT_ID AS TENANT_ID, STAT.SNAP_ID AS SNAP_ID, STAT.SVR_IP AS SVR_IP, STAT.SVR_PORT AS SVR_PORT, STAT.STAT_ID AS STAT_ID, STAT.VALUE AS VALUE FROM ( OCEANBASE.__ALL_VIRTUAL_WR_SYSSTAT STAT JOIN OCEANBASE.__ALL_VIRTUAL_WR_SNAPSHOT SNAP ON STAT.CLUSTER_ID = SNAP.CLUSTER_ID AND STAT.TENANT_ID = SNAP.TENANT_ID AND STAT.SNAP_ID = SNAP.SNAP_ID AND STAT.SVR_IP = SNAP.SVR_IP AND STAT.SVR_PORT = SNAP.SVR_PORT ) WHERE STAT.TENANT_ID = EFFECTIVE_TENANT_ID() AND SNAP.STATUS = 0; )__"))) { if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT STAT.CLUSTER_ID AS CLUSTER_ID, STAT.TENANT_ID AS TENANT_ID, STAT.SNAP_ID AS SNAP_ID, STAT.SVR_IP AS SVR_IP, STAT.SVR_PORT AS SVR_PORT, STAT.STAT_ID AS STAT_ID, STAT.VALUE AS VALUE FROM ( OCEANBASE.__ALL_VIRTUAL_WR_SYSSTAT STAT JOIN OCEANBASE.__ALL_VIRTUAL_WR_SNAPSHOT SNAP ON STAT.CLUSTER_ID = SNAP.CLUSTER_ID AND STAT.TENANT_ID = SNAP.TENANT_ID AND STAT.SNAP_ID = SNAP.SNAP_ID ) WHERE STAT.TENANT_ID = EFFECTIVE_TENANT_ID() AND SNAP.STATUS = 0; )__"))) {
LOG_ERROR("fail to set view_definition", K(ret)); LOG_ERROR("fail to set view_definition", K(ret));
} }
} }
@ -2010,7 +2010,7 @@ int ObInnerTableSchema::cdb_wr_sysstat_schema(ObTableSchema &table_schema)
table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT STAT.CLUSTER_ID AS CLUSTER_ID, STAT.TENANT_ID AS TENANT_ID, STAT.SNAP_ID AS SNAP_ID, STAT.SVR_IP AS SVR_IP, STAT.SVR_PORT AS SVR_PORT, STAT.STAT_ID AS STAT_ID, STAT.VALUE AS VALUE FROM ( OCEANBASE.__ALL_VIRTUAL_WR_SYSSTAT STAT JOIN OCEANBASE.__ALL_VIRTUAL_WR_SNAPSHOT SNAP ON STAT.CLUSTER_ID = SNAP.CLUSTER_ID AND STAT.TENANT_ID = SNAP.TENANT_ID AND STAT.SNAP_ID = SNAP.SNAP_ID AND STAT.SVR_IP = SNAP.SVR_IP AND STAT.SVR_PORT = SNAP.SVR_PORT ) WHERE SNAP.STATUS = 0; )__"))) { if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT STAT.CLUSTER_ID AS CLUSTER_ID, STAT.TENANT_ID AS TENANT_ID, STAT.SNAP_ID AS SNAP_ID, STAT.SVR_IP AS SVR_IP, STAT.SVR_PORT AS SVR_PORT, STAT.STAT_ID AS STAT_ID, STAT.VALUE AS VALUE FROM ( OCEANBASE.__ALL_VIRTUAL_WR_SYSSTAT STAT JOIN OCEANBASE.__ALL_VIRTUAL_WR_SNAPSHOT SNAP ON STAT.CLUSTER_ID = SNAP.CLUSTER_ID AND STAT.TENANT_ID = SNAP.TENANT_ID AND STAT.SNAP_ID = SNAP.SNAP_ID ) WHERE SNAP.STATUS = 0; )__"))) {
LOG_ERROR("fail to set view_definition", K(ret)); LOG_ERROR("fail to set view_definition", K(ret));
} }
} }

4
src/share/inner_table/ob_inner_table_schema.25201_25250.cpp
View File

@ -1410,7 +1410,7 @@ int ObInnerTableSchema::dba_wr_active_session_history_ora_schema(ObTableSchema &
table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT ASH.CLUSTER_ID AS CLUSTER_ID, ASH.TENANT_ID AS TENANT_ID, ASH.SNAP_ID AS SNAP_ID, ASH.SVR_IP AS SVR_IP, ASH.SVR_PORT AS SVR_PORT, ASH.SAMPLE_ID AS SAMPLE_ID, ASH.SESSION_ID AS SESSION_ID, ASH.SAMPLE_TIME AS SAMPLE_TIME, ASH.USER_ID AS USER_ID, ASH.SESSION_TYPE AS SESSION_TYPE, CAST(DECODE(ASH.EVENT_NO, 0, 'ON CPU', 'WAITING') AS VARCHAR2(7)) AS SESSION_STATE, ASH.SQL_ID AS SQL_ID, ASH.TRACE_ID AS TRACE_ID, ASH.EVENT_NO AS EVENT_NO, ASH.TIME_WAITED AS TIME_WAITED, ASH.P1 AS P1, ASH.P2 AS P2, ASH.P3 AS P3, ASH.SQL_PLAN_LINE_ID AS SQL_PLAN_LINE_ID, ASH.TIME_MODEL AS TIME_MODEL, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 1) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_PARSE, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 2) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_PL_PARSE, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 4) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_PLAN_CACHE, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 8) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_SQL_OPTIMIZE, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 16) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_SQL_EXECUTION, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 32) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_PX_EXECUTION, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 64) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_SEQUENCE_LOAD, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 128) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_COMMITTING, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 256) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_STORAGE_READ, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 512) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_STORAGE_WRITE, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 1024) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_REMOTE_DAS_EXECUTION, ASH.MODULE AS MODULE, ASH.ACTION AS ACTION, ASH.CLIENT_ID AS CLIENT_ID, ASH.BACKTRACE AS BACKTRACE, ASH.PLAN_ID AS PLAN_ID FROM SYS.ALL_VIRTUAL_WR_ACTIVE_SESSION_HISTORY ASH, SYS.ALL_VIRTUAL_WR_SNAPSHOT SNAP WHERE ASH.TENANT_ID = EFFECTIVE_TENANT_ID() AND ASH.CLUSTER_ID = SNAP.CLUSTER_ID AND ASH.TENANT_ID = SNAP.TENANT_ID AND ASH.SNAP_ID = SNAP.SNAP_ID AND ASH.SVR_IP = SNAP.SVR_IP AND ASH.SVR_PORT = SNAP.SVR_PORT AND SNAP.STATUS = 0; )__"))) { if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT ASH.CLUSTER_ID AS CLUSTER_ID, ASH.TENANT_ID AS TENANT_ID, ASH.SNAP_ID AS SNAP_ID, ASH.SVR_IP AS SVR_IP, ASH.SVR_PORT AS SVR_PORT, ASH.SAMPLE_ID AS SAMPLE_ID, ASH.SESSION_ID AS SESSION_ID, ASH.SAMPLE_TIME AS SAMPLE_TIME, ASH.USER_ID AS USER_ID, ASH.SESSION_TYPE AS SESSION_TYPE, CAST(DECODE(ASH.EVENT_NO, 0, 'ON CPU', 'WAITING') AS VARCHAR2(7)) AS SESSION_STATE, ASH.SQL_ID AS SQL_ID, ASH.TRACE_ID AS TRACE_ID, ASH.EVENT_NO AS EVENT_NO, ASH.TIME_WAITED AS TIME_WAITED, ASH.P1 AS P1, ASH.P2 AS P2, ASH.P3 AS P3, ASH.SQL_PLAN_LINE_ID AS SQL_PLAN_LINE_ID, ASH.TIME_MODEL AS TIME_MODEL, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 1) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_PARSE, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 2) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_PL_PARSE, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 4) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_PLAN_CACHE, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 8) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_SQL_OPTIMIZE, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 16) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_SQL_EXECUTION, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 32) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_PX_EXECUTION, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 64) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_SEQUENCE_LOAD, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 128) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_COMMITTING, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 256) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_STORAGE_READ, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 512) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_STORAGE_WRITE, CAST(CASE WHEN BITAND(ASH.TIME_MODEL , 1024) > 0 THEN 'Y' ELSE 'N' END AS VARCHAR2(1)) AS IN_REMOTE_DAS_EXECUTION, ASH.MODULE AS MODULE, ASH.ACTION AS ACTION, ASH.CLIENT_ID AS CLIENT_ID, ASH.BACKTRACE AS BACKTRACE, ASH.PLAN_ID AS PLAN_ID FROM SYS.ALL_VIRTUAL_WR_ACTIVE_SESSION_HISTORY ASH, SYS.ALL_VIRTUAL_WR_SNAPSHOT SNAP WHERE ASH.TENANT_ID = EFFECTIVE_TENANT_ID() AND ASH.CLUSTER_ID = SNAP.CLUSTER_ID AND ASH.TENANT_ID = SNAP.TENANT_ID AND ASH.SNAP_ID = SNAP.SNAP_ID AND SNAP.STATUS = 0; )__"))) {
LOG_ERROR("fail to set view_definition", K(ret)); LOG_ERROR("fail to set view_definition", K(ret));
} }
} }
@ -1560,7 +1560,7 @@ int ObInnerTableSchema::dba_wr_sysstat_ora_schema(ObTableSchema &table_schema)
table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset())); table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT STAT.CLUSTER_ID AS CLUSTER_ID, STAT.TENANT_ID AS TENANT_ID, STAT.SNAP_ID AS SNAP_ID, STAT.SVR_IP AS SVR_IP, STAT.SVR_PORT AS SVR_PORT, STAT.STAT_ID AS STAT_ID, STAT.VALUE AS VALUE FROM SYS.ALL_VIRTUAL_WR_SYSSTAT STAT, SYS.ALL_VIRTUAL_WR_SNAPSHOT SNAP WHERE STAT.TENANT_ID = EFFECTIVE_TENANT_ID() AND STAT.CLUSTER_ID = SNAP.CLUSTER_ID AND STAT.TENANT_ID = SNAP.TENANT_ID AND STAT.SNAP_ID = SNAP.SNAP_ID AND STAT.SVR_IP = SNAP.SVR_IP AND STAT.SVR_PORT = SNAP.SVR_PORT AND SNAP.STATUS = 0; )__"))) { if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT STAT.CLUSTER_ID AS CLUSTER_ID, STAT.TENANT_ID AS TENANT_ID, STAT.SNAP_ID AS SNAP_ID, STAT.SVR_IP AS SVR_IP, STAT.SVR_PORT AS SVR_PORT, STAT.STAT_ID AS STAT_ID, STAT.VALUE AS VALUE FROM SYS.ALL_VIRTUAL_WR_SYSSTAT STAT, SYS.ALL_VIRTUAL_WR_SNAPSHOT SNAP WHERE STAT.TENANT_ID = EFFECTIVE_TENANT_ID() AND STAT.CLUSTER_ID = SNAP.CLUSTER_ID AND STAT.TENANT_ID = SNAP.TENANT_ID AND STAT.SNAP_ID = SNAP.SNAP_ID AND SNAP.STATUS = 0; )__"))) {
LOG_ERROR("fail to set view_definition", K(ret)); LOG_ERROR("fail to set view_definition", K(ret));
} }
} }

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

@ -28453,8 +28453,6 @@ def_table_schema(
ON ASH.CLUSTER_ID = SNAP.CLUSTER_ID ON ASH.CLUSTER_ID = SNAP.CLUSTER_ID
AND ASH.TENANT_ID = SNAP.TENANT_ID AND ASH.TENANT_ID = SNAP.TENANT_ID
AND ASH.SNAP_ID = SNAP.SNAP_ID AND ASH.SNAP_ID = SNAP.SNAP_ID
AND ASH.SVR_IP = SNAP.SVR_IP
AND ASH.SVR_PORT = SNAP.SVR_PORT
) )
WHERE WHERE
ASH.TENANT_ID = EFFECTIVE_TENANT_ID() ASH.TENANT_ID = EFFECTIVE_TENANT_ID()
@ -28516,8 +28514,6 @@ def_table_schema(
ON ASH.CLUSTER_ID = SNAP.CLUSTER_ID ON ASH.CLUSTER_ID = SNAP.CLUSTER_ID
AND ASH.TENANT_ID = SNAP.TENANT_ID AND ASH.TENANT_ID = SNAP.TENANT_ID
AND ASH.SNAP_ID = SNAP.SNAP_ID AND ASH.SNAP_ID = SNAP.SNAP_ID
AND ASH.SVR_IP = SNAP.SVR_IP
AND ASH.SVR_PORT = SNAP.SVR_PORT
) )
WHERE WHERE
SNAP.STATUS = 0; SNAP.STATUS = 0;
@ -28639,8 +28635,6 @@ def_table_schema(
ON STAT.CLUSTER_ID = SNAP.CLUSTER_ID ON STAT.CLUSTER_ID = SNAP.CLUSTER_ID
AND STAT.TENANT_ID = SNAP.TENANT_ID AND STAT.TENANT_ID = SNAP.TENANT_ID
AND STAT.SNAP_ID = SNAP.SNAP_ID AND STAT.SNAP_ID = SNAP.SNAP_ID
AND STAT.SVR_IP = SNAP.SVR_IP
AND STAT.SVR_PORT = SNAP.SVR_PORT
) )
WHERE WHERE
STAT.TENANT_ID = EFFECTIVE_TENANT_ID() STAT.TENANT_ID = EFFECTIVE_TENANT_ID()
@ -28673,8 +28667,6 @@ def_table_schema(
ON STAT.CLUSTER_ID = SNAP.CLUSTER_ID ON STAT.CLUSTER_ID = SNAP.CLUSTER_ID
AND STAT.TENANT_ID = SNAP.TENANT_ID AND STAT.TENANT_ID = SNAP.TENANT_ID
AND STAT.SNAP_ID = SNAP.SNAP_ID AND STAT.SNAP_ID = SNAP.SNAP_ID
AND STAT.SVR_IP = SNAP.SVR_IP
AND STAT.SVR_PORT = SNAP.SVR_PORT
) )
WHERE WHERE
SNAP.STATUS = 0; SNAP.STATUS = 0;
@ -49889,8 +49881,6 @@ def_table_schema(
AND ASH.CLUSTER_ID = SNAP.CLUSTER_ID AND ASH.CLUSTER_ID = SNAP.CLUSTER_ID
AND ASH.TENANT_ID = SNAP.TENANT_ID AND ASH.TENANT_ID = SNAP.TENANT_ID
AND ASH.SNAP_ID = SNAP.SNAP_ID AND ASH.SNAP_ID = SNAP.SNAP_ID
AND ASH.SVR_IP = SNAP.SVR_IP
AND ASH.SVR_PORT = SNAP.SVR_PORT
AND SNAP.STATUS = 0; AND SNAP.STATUS = 0;
""".replace("\n", " ") """.replace("\n", " ")
) )
@ -49974,8 +49964,6 @@ def_table_schema(
AND STAT.CLUSTER_ID = SNAP.CLUSTER_ID AND STAT.CLUSTER_ID = SNAP.CLUSTER_ID
AND STAT.TENANT_ID = SNAP.TENANT_ID AND STAT.TENANT_ID = SNAP.TENANT_ID
AND STAT.SNAP_ID = SNAP.SNAP_ID AND STAT.SNAP_ID = SNAP.SNAP_ID
AND STAT.SVR_IP = SNAP.SVR_IP
AND STAT.SVR_PORT = SNAP.SVR_PORT
AND SNAP.STATUS = 0; AND SNAP.STATUS = 0;
""".replace("\n", " ") """.replace("\n", " ")
) )