fix add evolving plan and baseline plan to different plan set

src/sql/spm/ob_spm_define.h

@@ -269,7 +269,8 @@ struct ObSpmCacheCtx : public ObILibCacheCtx
       select_plan_type_(INVALID_TYPE),
       cur_baseline_not_enable_(false),
       need_spm_timeout_(false),
-      baseline_exec_time_(0)
+      baseline_exec_time_(0),
+      evolution_task_in_two_plan_set_(false)
   {}
   enum SpmMode {
     MODE_INVALID,
@@ -333,6 +334,7 @@ struct ObSpmCacheCtx : public ObILibCacheCtx
   bool cur_baseline_not_enable_;
   bool need_spm_timeout_;
   int64_t baseline_exec_time_;
+  bool evolution_task_in_two_plan_set_;
 };
 
 struct EvolutionTaskResult

src/sql/spm/ob_spm_evolution_plan.h

@@ -68,7 +68,6 @@ public:
       evolution_count_ts_(DEFAULT_EVOLUTION_COUNT_THRESHOLD),
       evolution_timeout_ts_(DEFAULT_EVOLUTION_TIMEOUT_THRESHOLD),
       evolving_plan_(NULL),
-      evolving_plan_stat_(NULL),
       history_exec_time_(0),
       is_inited_(false),
       current_stage_cnt_(0),
@@ -166,8 +165,6 @@ protected:
   ObPhysicalPlan *evolving_plan_;
   common::ObSEArray<ObPhysicalPlan *, 4> baseline_plans_; 
   common::ObSEArray<ObPhysicalPlan *, 4> garbage_list_;
-  ObEvolutionStat *evolving_plan_stat_;
-  ObSEArray<ObEvolutionStat*, 4> baseline_plans_stat_;
   int64_t history_exec_time_;
   bool is_inited_;
   bool is_evo_best_plan_;