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

include/libs/planner/planner.h

@@ -20,6 +20,7 @@
 extern "C" {
 #endif
 
+#include "query.h"
 #include "tmsg.h"
 #include "tarray.h"
 
@@ -122,7 +123,7 @@ typedef struct SSubplan {
   SSubplanId id;          // unique id of the subplan
   int32_t    type;         // QUERY_TYPE_MERGE|QUERY_TYPE_PARTIAL|QUERY_TYPE_SCAN|QUERY_TYPE_MODIFY
   int32_t    level;        // the execution level of current subplan, starting from 0.
-  SEpSet     execEpSet;    // for the scan/modify subplan, the optional execution node
+  SQueryNodeAddr     execNode;    // for the scan/modify subplan, the optional execution node
   SArray    *pChildern;    // the datasource subplan,from which to fetch the result
   SArray    *pParents;     // the data destination subplan, get data from current subplan
   SPhyNode  *pNode;        // physical plan of current subplan

include/libs/qcom/query.h

@@ -111,6 +111,13 @@ typedef struct SMsgSendInfo {
   SDataBuf  msgInfo;
 } SMsgSendInfo;
 
+typedef struct SQueryNodeAddr{
+  int32_t    nodeId; //vgId or qnodeId
+  int8_t     inUse;
+  int8_t     numOfEps;
+  SEpAddrMsg epAddr[TSDB_MAX_REPLICA];
+} SQueryNodeAddr;
+
 bool tIsValidSchema(struct SSchema* pSchema, int32_t numOfCols, int32_t numOfTags);
 
 int32_t initTaskQueue();

include/libs/scheduler/scheduler.h

@@ -50,13 +50,6 @@ typedef struct SQueryProfileSummary {
   uint64_t resultSize;   // generated result size in Kb.
 } SQueryProfileSummary;
 
-typedef struct SQueryNodeAddr{
-  int32_t    nodeId; //vgId or qnodeId
-  int8_t     inUse;
-  int8_t     numOfEps;
-  SEpAddrMsg epAddr[TSDB_MAX_REPLICA];
-} SQueryNodeAddr;
-
 typedef struct SQueryResult {
   int32_t  code;
   uint64_t numOfRows;

source/libs/planner/src/physicalPlan.c

@@ -211,22 +211,22 @@ static SSubplan* initSubplan(SPlanContext* pCxt, int32_t type) {
   return subplan;
 }
 
-static void vgroupInfoToEpSet(const SVgroupInfo* vg, SEpSet* epSet) {
-  epSet->inUse = 0; // todo
-  epSet->numOfEps = vg->numOfEps;
+static void vgroupInfoToEpSet(const SVgroupInfo* vg, SQueryNodeAddr* execNode) {
+  execNode->nodeId = vg->vgId;
+  execNode->inUse = 0; // todo
+  execNode->numOfEps = vg->numOfEps;
   for (int8_t i = 0; i < vg->numOfEps; ++i) {
-    epSet->port[i] = vg->epAddr[i].port;
-    strcpy(epSet->fqdn[i], vg->epAddr[i].fqdn);
+    execNode->epAddr[i] = vg->epAddr[i];
   }
   return;
 }
 
-static void vgroupMsgToEpSet(const SVgroupMsg* vg, SEpSet* epSet) {
-  epSet->inUse = 0; // todo
-  epSet->numOfEps = vg->numOfEps;
+static void vgroupMsgToEpSet(const SVgroupMsg* vg, SQueryNodeAddr* execNode) {
+  execNode->nodeId = vg->vgId;
+  execNode->inUse = 0; // todo
+  execNode->numOfEps = vg->numOfEps;
   for (int8_t i = 0; i < vg->numOfEps; ++i) {
-    epSet->port[i] = vg->epAddr[i].port;
-    strcpy(epSet->fqdn[i], vg->epAddr[i].fqdn);
+    execNode->epAddr[i] = vg->epAddr[i];
   }
   return;
 }
@@ -236,7 +236,7 @@ static uint64_t splitSubplanByTable(SPlanContext* pCxt, SQueryPlanNode* pPlanNod
   for (int32_t i = 0; i < pTable->pMeta->vgroupList->numOfVgroups; ++i) {
     STORE_CURRENT_SUBPLAN(pCxt);
     SSubplan* subplan = initSubplan(pCxt, QUERY_TYPE_SCAN);
-    vgroupMsgToEpSet(&(pTable->pMeta->vgroupList->vgroups[i]), &subplan->execEpSet);
+    vgroupMsgToEpSet(&(pTable->pMeta->vgroupList->vgroups[i]), &subplan->execNode);
     subplan->pNode = createMultiTableScanNode(pPlanNode, pTable);
     subplan->pDataSink = createDataDispatcher(pCxt, pPlanNode);
     RECOVERY_CURRENT_SUBPLAN(pCxt);
@@ -297,7 +297,7 @@ static void splitInsertSubplan(SPlanContext* pCxt, SQueryPlanNode* pPlanNode) {
     STORE_CURRENT_SUBPLAN(pCxt);
     SSubplan* subplan = initSubplan(pCxt, QUERY_TYPE_MODIFY);
     SVgDataBlocks* blocks = (SVgDataBlocks*)taosArrayGetP(vgs, i);
-    vgroupInfoToEpSet(&blocks->vg, &subplan->execEpSet);
+    vgroupInfoToEpSet(&blocks->vg, &subplan->execNode);
     subplan->pNode = NULL;
     subplan->pDataSink = createDataInserter(pCxt, blocks);
     subplan->type = QUERY_TYPE_MODIFY;