From 3653849b148b860be862d21a13c5a48b2bacc4b7 Mon Sep 17 00:00:00 2001 From: Longda Date: Thu, 26 Jan 2023 22:07:42 +0800 Subject: [PATCH] Fix the wrong sequence between query_cache_stage and plan_cache_stage --- etc/observer.ini | 9 ++++----- src/observer/session/session_stage.cpp | 6 +++--- src/observer/session/session_stage.h | 2 +- src/observer/sql/parser/resolve_stage.cpp | 4 ++-- src/observer/sql/parser/resolve_stage.h | 2 +- src/observer/sql/plan_cache/plan_cache_stage.cpp | 4 ++-- src/observer/sql/plan_cache/plan_cache_stage.h | 2 +- src/observer/sql/query_cache/query_cache_stage.cpp | 4 ++-- src/observer/sql/query_cache/query_cache_stage.h | 2 +- 9 files changed, 17 insertions(+), 18 deletions(-) diff --git a/etc/observer.ini b/etc/observer.ini index 73b9832..f7fb6d3 100644 --- a/etc/observer.ini +++ b/etc/observer.ini @@ -57,11 +57,10 @@ count=3 [SessionStage] ThreadId=SQLThreads -NextStages=PlanCacheStage +NextStages=QueryCacheStage -[PlanCacheStage] +[QueryCacheStage] ThreadId=SQLThreads -#NextStages=OptimizeStage NextStages=ParseStage [ParseStage] @@ -70,9 +69,9 @@ NextStages=ResolveStage [ResolveStage] ThreadId=SQLThreads -NextStages=QueryCacheStage +NextStages=PlanCacheStage -[QueryCacheStage] +[PlanCacheStage] ThreadId=SQLThreads NextStages=OptimizeStage diff --git a/src/observer/session/session_stage.cpp b/src/observer/session/session_stage.cpp index c9e5c7c..e4b284a 100644 --- a/src/observer/session/session_stage.cpp +++ b/src/observer/session/session_stage.cpp @@ -35,7 +35,7 @@ using namespace common; const std::string SessionStage::SQL_METRIC_TAG = "SessionStage.sql"; // Constructor -SessionStage::SessionStage(const char *tag) : Stage(tag), plan_cache_stage_(nullptr), sql_metric_(nullptr) +SessionStage::SessionStage(const char *tag) : Stage(tag), query_cache_stage_(nullptr), sql_metric_(nullptr) {} // Destructor @@ -74,7 +74,7 @@ bool SessionStage::initialize() LOG_TRACE("Enter"); std::list::iterator stgp = next_stage_list_.begin(); - plan_cache_stage_ = *(stgp++); + query_cache_stage_ = *(stgp++); MetricsRegistry &metricsRegistry = get_metrics_registry(); sql_metric_ = new SimpleTimer(); @@ -163,5 +163,5 @@ void SessionStage::handle_request(StageEvent *event) sev->push_callback(cb); SQLStageEvent *sql_event = new SQLStageEvent(sev, sql); - plan_cache_stage_->handle_event(sql_event); + query_cache_stage_->handle_event(sql_event); } diff --git a/src/observer/session/session_stage.h b/src/observer/session/session_stage.h index 206e99e..3310af2 100644 --- a/src/observer/session/session_stage.h +++ b/src/observer/session/session_stage.h @@ -46,7 +46,7 @@ protected: void handle_request(common::StageEvent *event); private: - Stage *plan_cache_stage_ = nullptr; + Stage *query_cache_stage_ = nullptr; common::SimpleTimer *sql_metric_ = nullptr; static const std::string SQL_METRIC_TAG; }; diff --git a/src/observer/sql/parser/resolve_stage.cpp b/src/observer/sql/parser/resolve_stage.cpp index 92d1868..89dc86f 100644 --- a/src/observer/sql/parser/resolve_stage.cpp +++ b/src/observer/sql/parser/resolve_stage.cpp @@ -69,7 +69,7 @@ bool ResolveStage::initialize() LOG_TRACE("Enter"); std::list::iterator stgp = next_stage_list_.begin(); - query_cache_stage_ = *(stgp++); + plan_cache_stage_ = *(stgp++); LOG_TRACE("Exit"); return true; @@ -114,7 +114,7 @@ void ResolveStage::handle_event(StageEvent *event) sql_event->set_stmt(stmt); - query_cache_stage_->handle_event(sql_event); + plan_cache_stage_->handle_event(sql_event); LOG_TRACE("Exit\n"); return; diff --git a/src/observer/sql/parser/resolve_stage.h b/src/observer/sql/parser/resolve_stage.h index 08897aa..c2714c0 100644 --- a/src/observer/sql/parser/resolve_stage.h +++ b/src/observer/sql/parser/resolve_stage.h @@ -34,7 +34,7 @@ protected: protected: private: - Stage *query_cache_stage_ = nullptr; + Stage *plan_cache_stage_ = nullptr; }; #endif //__OBSERVER_SQL_RESOLVE_STAGE_H__ diff --git a/src/observer/sql/plan_cache/plan_cache_stage.cpp b/src/observer/sql/plan_cache/plan_cache_stage.cpp index 7692bc4..bad18bc 100644 --- a/src/observer/sql/plan_cache/plan_cache_stage.cpp +++ b/src/observer/sql/plan_cache/plan_cache_stage.cpp @@ -66,7 +66,7 @@ bool PlanCacheStage::initialize() std::list::iterator stgp = next_stage_list_.begin(); // execute_stage = *(stgp++); - parse_stage_ = *(stgp++); + optimizer_stage_ = *(stgp++); LOG_TRACE("Exit"); return true; @@ -96,7 +96,7 @@ void PlanCacheStage::handle_event(StageEvent *event) event->push_callback(cb); */ // do nothing here, pass the event to the next stage - parse_stage_->handle_event(event); + optimizer_stage_->handle_event(event); LOG_TRACE("Exit\n"); return; diff --git a/src/observer/sql/plan_cache/plan_cache_stage.h b/src/observer/sql/plan_cache/plan_cache_stage.h index 0099f27..bf39c02 100644 --- a/src/observer/sql/plan_cache/plan_cache_stage.h +++ b/src/observer/sql/plan_cache/plan_cache_stage.h @@ -34,7 +34,7 @@ protected: protected: private: - Stage *parse_stage_ = nullptr; + Stage *optimizer_stage_ = nullptr; }; #endif //__OBSERVER_SQL_PLAN_CACHE_STAGE_H__ diff --git a/src/observer/sql/query_cache/query_cache_stage.cpp b/src/observer/sql/query_cache/query_cache_stage.cpp index 80b5a60..35e8122 100644 --- a/src/observer/sql/query_cache/query_cache_stage.cpp +++ b/src/observer/sql/query_cache/query_cache_stage.cpp @@ -65,7 +65,7 @@ bool QueryCacheStage::initialize() LOG_TRACE("Enter"); std::list::iterator stgp = next_stage_list_.begin(); - optimize_stage_ = *(stgp++); + parser_stage_ = *(stgp++); LOG_TRACE("Exit"); return true; @@ -83,7 +83,7 @@ void QueryCacheStage::handle_event(StageEvent *event) { LOG_TRACE("Enter\n"); - optimize_stage_->handle_event(event); + parser_stage_->handle_event(event); LOG_TRACE("Exit\n"); return; diff --git a/src/observer/sql/query_cache/query_cache_stage.h b/src/observer/sql/query_cache/query_cache_stage.h index f889d3c..2bbcbb5 100644 --- a/src/observer/sql/query_cache/query_cache_stage.h +++ b/src/observer/sql/query_cache/query_cache_stage.h @@ -34,7 +34,7 @@ protected: protected: private: - Stage *optimize_stage_ = nullptr; + Stage *parser_stage_ = nullptr; }; #endif //__OBSERVER_SQL_QUERY_CACHE_STAGE_H__ -- GitLab