From 97ee48779cbdf110da9fda897371af52e4ec9a4c Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sun, 25 Apr 2021 22:18:56 +0800 Subject: [PATCH] [td-225]fix compiler error. --- src/client/src/tscServer.c | 2 +- src/query/src/qPlan.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c index d84f93a73b..7aba1d4c0c 100644 --- a/src/client/src/tscServer.c +++ b/src/client/src/tscServer.c @@ -1013,7 +1013,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) { pQueryMsg->tsBuf.tsNumOfBlocks = htonl(pQueryMsg->tsBuf.tsNumOfBlocks); } - int32_t numOfOperator = taosArrayGetSize(queryOperator); + int32_t numOfOperator = (int32_t) taosArrayGetSize(queryOperator); pQueryMsg->numOfOperator = htonl(numOfOperator); for(int32_t i = 0; i < numOfOperator; ++i) { int32_t *operator = taosArrayGet(queryOperator, i); diff --git a/src/query/src/qPlan.c b/src/query/src/qPlan.c index 1efaca7277..82ce32847b 100644 --- a/src/query/src/qPlan.c +++ b/src/query/src/qPlan.c @@ -16,11 +16,18 @@ #define QNODE_TIMEWINDOW 11 typedef struct SQueryNode { - int32_t type; + int32_t type; // the type of logic node + char *name; // the name of logic node + + SSchema *pSchema; // the schema of the input SSDatablock + int32_t numOfCols; // number of input columns + SExprInfo *pExpr; // the query functions or sql aggregations + int32_t numOfOutput; // number of result columns, which is also the number of pExprs + // previous operator to generated result for current node to process // in case of join, multiple prev nodes exist. struct SQueryNode* prevNode; - + struct SQueryNode* nextNode; } SQueryNode; // TODO create the query plan