[td-171]fix bug in column values filter query

src/query/inc/queryExecutor.h

@@ -122,13 +122,13 @@ typedef struct SQuery {
   int64_t           slidingTime;      // sliding time for sliding window query
   char              slidingTimeUnit;  // interval data type, used for daytime revise
   int8_t            precision;
-  int16_t           numOfOutputCols;
+  int16_t           numOfOutput;
   int16_t           interpoType;
   int16_t           checkBuffer;  // check if the buffer is full during scan each block
   SLimitVal         limit;
   int32_t           rowSize;
   SSqlGroupbyExpr*  pGroupbyExpr;
-  SSqlFunctionExpr* pSelectExpr;
+  SArithExprInfo* pSelectExpr;
   SColumnInfo*      colList;
   int32_t           numOfFilterCols;
   int64_t*          defaultVal;

src/query/inc/tsqlfunction.h

@@ -114,7 +114,7 @@ enum {
 #define QUERY_IS_FREE_RESOURCE(type) (((type)&TSDB_QUERY_TYPE_FREE_RESOURCE) != 0)
 
 typedef struct SArithmeticSupport {
-  SSqlFunctionExpr *pExpr;
+  SArithExprInfo   *pArithExpr;
   int32_t           elemSize[TSDB_MAX_COLUMNS];
   int32_t           numOfCols;
   int32_t           offset;

src/query/src/queryUtil.c

@@ -217,11 +217,11 @@ void clearTimeWindowResBuf(SQueryRuntimeEnv *pRuntimeEnv, SWindowResult *pWindow
     return;
   }
   
-  for (int32_t i = 0; i < pRuntimeEnv->pQuery->numOfOutputCols; ++i) {
+  for (int32_t i = 0; i < pRuntimeEnv->pQuery->numOfOutput; ++i) {
     SResultInfo *pResultInfo = &pWindowRes->resultInfo[i];
     
     char * s = getPosInResultPage(pRuntimeEnv, i, pWindowRes);
-    size_t size = pRuntimeEnv->pQuery->pSelectExpr[i].resBytes;
+    size_t size = pRuntimeEnv->pQuery->pSelectExpr[i].bytes;
     memset(s, 0, size);
     
     resetResultInfo(pResultInfo);
@@ -245,7 +245,7 @@ void copyTimeWindowResBuf(SQueryRuntimeEnv *pRuntimeEnv, SWindowResult *dst, con
   dst->window = src->window;
   dst->status = src->status;
   
-  int32_t nOutputCols = pRuntimeEnv->pQuery->numOfOutputCols;
+  int32_t nOutputCols = pRuntimeEnv->pQuery->numOfOutput;
   
   for (int32_t i = 0; i < nOutputCols; ++i) {
     SResultInfo *pDst = &dst->resultInfo[i];
@@ -261,7 +261,7 @@ void copyTimeWindowResBuf(SQueryRuntimeEnv *pRuntimeEnv, SWindowResult *dst, con
     // copy the output buffer data from src to dst, the position info keep unchanged
     char * dstBuf = getPosInResultPage(pRuntimeEnv, i, dst);
     char * srcBuf = getPosInResultPage(pRuntimeEnv, i, (SWindowResult *)src);
-    size_t s = pRuntimeEnv->pQuery->pSelectExpr[i].resBytes;
+    size_t s = pRuntimeEnv->pQuery->pSelectExpr[i].bytes;
     
     memcpy(dstBuf, srcBuf, s);
   }