diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index ff87bc0085..a268215d3d 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -27,6 +27,8 @@
 #include "tfilter.h"
 #include "tlockfree.h"
 #include "tpagedfile.h"
+#include "planner.h"
+
 
 struct SColumnFilterElem;
 
@@ -64,34 +66,6 @@ enum {
       QUERY_OVER = 0x4u,
 };
 
-enum OPERATOR_TYPE_E {
-  OP_TableScan         = 1,
-  OP_DataBlocksOptScan = 2,
-  OP_TableSeqScan      = 3,
-  OP_TagScan           = 4,
-  OP_TableBlockInfoScan= 5,
-  OP_Aggregate         = 6,
-  OP_Project           = 7,
-  OP_Groupby           = 8,
-  OP_Limit             = 9,
-  OP_SLimit            = 10,
-  OP_TimeWindow        = 11,
-  OP_SessionWindow     = 12,
-  OP_Fill              = 13,
-  OP_MultiTableAggregate     = 14,
-  OP_MultiTableTimeInterval  = 15,
-  OP_DummyInput        = 16,   //TODO remove it after fully refactor.
-  OP_MultiwayMergeSort = 17,   // multi-way data merge into one input stream.
-  OP_GlobalAggregate   = 18,   // global merge for the multi-way data sources.
-  OP_Filter            = 19,
-  OP_Distinct          = 20,
-  OP_Join              = 21,
-  OP_StateWindow       = 22,
-  OP_AllTimeWindow     = 23,
-  OP_AllMultiTableTimeInterval = 24,
-  OP_Order             = 25,
-};
-
 typedef struct SResultRowCell {
   uint64_t     groupId;
   SResultRow  *pRow;
diff --git a/source/libs/executor/src/executorMain.c b/source/libs/executor/src/executorMain.c
index cfc958806b..b98b7fef5c 100644
--- a/source/libs/executor/src/executorMain.c
+++ b/source/libs/executor/src/executorMain.c
@@ -285,7 +285,7 @@ bool qExecTask(qTaskInfo_t qinfo, uint64_t *qId) {
   STaskRuntimeEnv* pRuntimeEnv = &pQInfo->runtimeEnv;
   if (pRuntimeEnv->tableqinfoGroupInfo.numOfTables == 0) {
     qDebug("QInfo:0x%"PRIx64" no table exists for query, abort", pQInfo->qId);
-    setTaskStatus(pRuntimeEnv, QUERY_COMPLETED);
+//    setTaskStatus(pRuntimeEnv, QUERY_COMPLETED);
     return doBuildResCheck(pQInfo);
   }