From 1b9cc5948a1a630b1f7e80be49f3a4132712f522 Mon Sep 17 00:00:00 2001 From: seuwebber Date: Fri, 24 Feb 2023 12:31:01 +0000 Subject: [PATCH] [to #35175194]fix bug package dbms_xplan --- src/pl/ob_pl_interface_pragma.h | 11 ++++- src/pl/ob_pl_package_manager.cpp | 1 - .../inner_table/sys_package/dbms_xplan.sql | 48 ------------------- .../sys_package/dbms_xplan_body.sql | 46 ------------------ 4 files changed, 10 insertions(+), 96 deletions(-) delete mode 100644 src/share/inner_table/sys_package/dbms_xplan.sql delete mode 100644 src/share/inner_table/sys_package/dbms_xplan_body.sql diff --git a/src/pl/ob_pl_interface_pragma.h b/src/pl/ob_pl_interface_pragma.h index 6bfeaecfb9..8cac957d69 100644 --- a/src/pl/ob_pl_interface_pragma.h +++ b/src/pl/ob_pl_interface_pragma.h @@ -21,7 +21,7 @@ #include "pl/sys_package/ob_dbms_monitor.h" #include "pl/sys_package/ob_dbms_sql.h" #include "pl/sys_package/ob_dbms_user_define_rule.h" - +#include "pl/sys_package/ob_dbms_session.h" #ifdef INTERFACE_DEF INTERFACE_DEF(INTERFACE_START, "TEST", (void*)(ObPLInterfaceImpl::call)) @@ -109,6 +109,15 @@ #undef DEFINE_DBMS_SCHEDULER_MYSQL_INTERFACE //end of dbms_scheduler_mysql + + // start of dbms_session + INTERFACE_DEF(INTERFACE_DBMS_SESSION_CLEAR_ALL_CONTEXT, "CLEAR_ALL_CONTEXT", (void*)(ObDBMSSession::clear_all_context)) + INTERFACE_DEF(INTERFACE_DBMS_SESSION_CLEAR_CONTEXT, "CLEAR_CONTEXT", (void*)(ObDBMSSession::clear_context)) + INTERFACE_DEF(INTERFACE_DBMS_SESSION_CLEAR_IDENTIFIER, "CLEAR_IDENTIFIER", (void*)(ObDBMSSession::clear_identifier)) + INTERFACE_DEF(INTERFACE_DBMS_SESSION_SET_CONTEXT, "SET_CONTEXT", (void*)(ObDBMSSession::set_context)) + INTERFACE_DEF(INTERFACE_DBMS_SESSION_SET_IDENTIFIER, "SET_IDENTIFIER", (void*)(ObDBMSSession::set_identifier)) + // end of dbms_session + // start of dbms_udr INTERFACE_DEF(INTERFACE_DBMS_UDR_CREATE_RULE, "CREATE_RULE", (void *)(ObDBMSUserDefineRule::create_rule)) INTERFACE_DEF(INTERFACE_DBMS_UDR_REMOVE_RULE, "REMOVE_RULE", (void *)(ObDBMSUserDefineRule::remove_rule)) diff --git a/src/pl/ob_pl_package_manager.cpp b/src/pl/ob_pl_package_manager.cpp index b55b19c898..22041042c8 100644 --- a/src/pl/ob_pl_package_manager.cpp +++ b/src/pl/ob_pl_package_manager.cpp @@ -214,7 +214,6 @@ static ObSysPackageFile mysql_sys_package_file_table[] = { {"dbms_application", "dbms_application_mysql.sql", "dbms_application_body_mysql.sql"}, {"dbms_session", "dbms_session_mysql.sql", "dbms_session_body_mysql.sql"}, {"dbms_monitor", "dbms_monitor_mysql.sql", "dbms_monitor_body_mysql.sql"}, - {"dbms_xplan", "dbms_xplan_mysql.sql", "dbms_xplan_mysql_body.sql"}, {"dbms_resource_manager", "dbms_resource_manager_mysql.sql", "dbms_resource_manager_body_mysql.sql"}, {"dbms_udr", "dbms_udr_mysql.sql", "dbms_udr_body_mysql.sql"} }; diff --git a/src/share/inner_table/sys_package/dbms_xplan.sql b/src/share/inner_table/sys_package/dbms_xplan.sql deleted file mode 100644 index 62d1cf6b1f..0000000000 --- a/src/share/inner_table/sys_package/dbms_xplan.sql +++ /dev/null @@ -1,48 +0,0 @@ -#package_name:dbms_xplan -#author:zhenling.zzg - -CREATE OR REPLACE PACKAGE dbms_xplan AUTHID CURRENT_USER AS - - -- CONSTANTS - DEFAULT_INENTIFIER constant VARCHAR2(20) := ''; - DEFAULT_LEVEL constant INT := 1; - - -- TYPES - type dbms_xplan_type_table is table of varchar2(4000); - - -- FUNCTIONS and PROCEDURES - PROCEDURE enable_opt_trace( - sql_id IN VARCHAR2 DEFAULT '', - identifier IN VARCHAR2 DEFAULT DEFAULT_INENTIFIER, - level IN INT DEFAULT DEFAULT_LEVEL - ); - - PROCEDURE disable_opt_trace; - - PROCEDURE set_opt_trace_parameter( - sql_id IN VARCHAR2 DEFAULT '', - identifier IN VARCHAR2 DEFAULT DEFAULT_INENTIFIER, - level IN INT DEFAULT DEFAULT_LEVEL - ); - - -- display plan table`s plan - function display(table_name varchar2 default 'PLAN_TABLE', - statement_id varchar2 default null, - format varchar2 default 'TYPICAL',-- 'BASIC', 'TYPICAL', 'ALL', 'ADVANCED' - filter_preds varchar2 default null) - return dbms_xplan_type_table; - - -- display sql plan table`s plan - function display_cursor(sql_id varchar2 default null, - plan_id integer default 0, - format varchar2 default 'TYPICAL') - return dbms_xplan_type_table; - - -- display base line plan - function display_sql_plan_baseline( - sql_handle varchar2 default NULL, - plan_name varchar2 default NULL, - format varchar2 default 'TYPICAL') - return dbms_xplan_type_table; - -END dbms_xplan; \ No newline at end of file diff --git a/src/share/inner_table/sys_package/dbms_xplan_body.sql b/src/share/inner_table/sys_package/dbms_xplan_body.sql deleted file mode 100644 index 00a3e50288..0000000000 --- a/src/share/inner_table/sys_package/dbms_xplan_body.sql +++ /dev/null @@ -1,46 +0,0 @@ -# package_name : dbms_xplan -# author : zhenling.zzg - -CREATE OR REPLACE PACKAGE BODY dbms_xplan AS - - PROCEDURE enable_opt_trace( - sql_id IN VARCHAR2 DEFAULT '', - identifier IN VARCHAR2 DEFAULT DEFAULT_INENTIFIER, - level IN INT DEFAULT DEFAULT_LEVEL - ); - PRAGMA INTERFACE(C, ENABLE_OPT_TRACE); - - PROCEDURE disable_opt_trace; - PRAGMA INTERFACE(C, DISABLE_OPT_TRACE); - - PROCEDURE set_opt_trace_parameter( - sql_id IN VARCHAR2 DEFAULT '', - identifier IN VARCHAR2 DEFAULT DEFAULT_INENTIFIER, - level IN INT DEFAULT DEFAULT_LEVEL - ); - PRAGMA INTERFACE(C, SET_OPT_TRACE_PARAMETER); - - -- display plan table`s plan - function display(table_name varchar2 default 'PLAN_TABLE', - statement_id varchar2 default null, - format varchar2 default 'TYPICAL',-- 'BASIC', 'TYPICAL', 'ALL' - filter_preds varchar2 default null) - return dbms_xplan_type_table; - PRAGMA INTERFACE(C, DISPLAY); - - -- display sql plan table`s plan - function display_cursor(sql_id varchar2 default null, - plan_id integer default 0, - format varchar2 default 'TYPICAL') - return dbms_xplan_type_table; - PRAGMA INTERFACE(C, DISPLAY_CURSOR); - - -- display base line plan - function display_sql_plan_baseline( - sql_handle varchar2 default NULL, - plan_name varchar2 default NULL, - format varchar2 default 'TYPICAL') - return dbms_xplan_type_table; - PRAGMA INTERFACE(C, DISPLAY_SQL_PLAN_BASELINE); - -END dbms_xplan; \ No newline at end of file