Merge remote-tracking branch 'origin/feature/3.0_wxy' into feature/qnode

include/libs/executor/dataSinkMgt.h

@@ -21,8 +21,7 @@ extern "C" {
 #endif
 
 #include "os.h"
-#include "executor.h"
-#include "executorimpl.h"
+#include "thash.h"
 
 #define DS_BUF_LOW   1
 #define DS_BUF_FULL  2
@@ -39,7 +38,7 @@ typedef struct SDataSinkMgtCfg {
 int32_t dsDataSinkMgtInit(SDataSinkMgtCfg *cfg);
 
 typedef struct SInputData {
-  const SSDataBlock* pData;
+  const struct SSDataBlock* pData;
   SHashObj* pTableRetrieveTsMap;
 } SInputData;
 

source/libs/executor/src/dataDispatcher.c

@@ -19,6 +19,7 @@
 #include "tcompression.h"
 #include "tglobal.h"
 #include "tqueue.h"
+#include "executorimpl.h"
 
 #define DATA_META_LENGTH(tables) (sizeof(int32_t) + sizeof(STableIdInfo) * taosHashGetSize(tables) + sizeof(SRetrieveTableRsp))