Fix the wrong sequence between query_cache_stage and plan_cache_stage

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
 

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<Stage *>::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);
 }

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;
 };

src/observer/sql/parser/resolve_stage.cpp

@@ -69,7 +69,7 @@ bool ResolveStage::initialize()
   LOG_TRACE("Enter");
 
   std::list<Stage *>::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;

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__

src/observer/sql/plan_cache/plan_cache_stage.cpp

@@ -66,7 +66,7 @@ bool PlanCacheStage::initialize()
 
   std::list<Stage *>::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;

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__

src/observer/sql/query_cache/query_cache_stage.cpp

@@ -65,7 +65,7 @@ bool QueryCacheStage::initialize()
   LOG_TRACE("Enter");
 
   std::list<Stage *>::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;

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__