[td-2895] refactor code.

src/client/src/tscLocalMerge.c

@@ -951,14 +951,14 @@ static void doFillResult(SSqlObj *pSql, SLocalMerger *pLocalMerge, bool doneOutp
   // todo extract function
   int64_t actualETime = (pQueryInfo->order.order == TSDB_ORDER_ASC)? pQueryInfo->window.ekey: pQueryInfo->window.skey;
 
-  tFilePage **pResPages = malloc(POINTER_BYTES * pQueryInfo->fieldsInfo.numOfOutput);
+  void** pResPages = malloc(POINTER_BYTES * pQueryInfo->fieldsInfo.numOfOutput);
   for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
     TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
-    pResPages[i] = calloc(1, sizeof(tFilePage) + pField->bytes * pLocalMerge->resColModel->capacity);
+    pResPages[i] = calloc(1, pField->bytes * pLocalMerge->resColModel->capacity);
   }
 
   while (1) {
-    int64_t newRows = taosFillResultDataBlock(pFillInfo, (void**)pResPages, pLocalMerge->resColModel->capacity);
+    int64_t newRows = taosFillResultDataBlock(pFillInfo, pResPages, pLocalMerge->resColModel->capacity);
 
     if (pQueryInfo->limit.offset < newRows) {
       newRows -= pQueryInfo->limit.offset;
@@ -966,7 +966,7 @@ static void doFillResult(SSqlObj *pSql, SLocalMerger *pLocalMerge, bool doneOutp
       if (pQueryInfo->limit.offset > 0) {
         for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
           TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
-          memmove(pResPages[i]->data, pResPages[i]->data + pField->bytes * pQueryInfo->limit.offset,
+          memmove(pResPages[i], pResPages[i] + pField->bytes * pQueryInfo->limit.offset,
                   (size_t)(newRows * pField->bytes));
         }
       }
@@ -1010,7 +1010,7 @@ static void doFillResult(SSqlObj *pSql, SLocalMerger *pLocalMerge, bool doneOutp
     int32_t offset = 0;
     for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
       TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
-      memcpy(pRes->data + offset * pRes->numOfRows, pResPages[i]->data, (size_t)(pField->bytes * pRes->numOfRows));
+      memcpy(pRes->data + offset * pRes->numOfRows, pResPages[i], (size_t)(pField->bytes * pRes->numOfRows));
       offset += pField->bytes;
     }
 

src/query/inc/qExecutor.h

@@ -241,27 +241,12 @@ typedef struct SQuery {
 
 typedef SSDataBlock* (*__operator_fn_t)(void* param);
 
-typedef struct SOperatorInfo {
-  char      *name;
-  bool       blockingOptr;
-  bool       completed;
-  void      *optInfo;
-  SExprInfo *pExpr;
-
-  int32_t*   rowCellInfoOffset;
-  int32_t    numOfOutput;
-
-  __operator_fn_t       exec;
-  __operator_fn_t       cleanup;
-  struct SOperatorInfo *upstream;
-} SOperatorInfo;
+struct SOperatorInfo;
 
 typedef struct SQueryRuntimeEnv {
   jmp_buf              env;
   SQuery*              pQuery;
   void*                qinfo;
-//  int32_t              numOfRowsPerPage;
-//  uint16_t*            offset;
   uint16_t             scanFlag;         // denotes reversed scan of data or not
   SFillInfo*           pFillInfo;
   void*                pQueryHandle;
@@ -282,16 +267,31 @@ typedef struct SQueryRuntimeEnv {
   char*                tagVal;           // tag value of current data block
   SArithmeticSupport  *sasArray;
 
-  SOperatorInfo*   pi;
+  struct SOperatorInfo*   pi;
   SSDataBlock     *outputBuf;
 
   int32_t          groupIndex;
   int32_t          tableIndex;
   STableGroupInfo  tableqinfoGroupInfo;  // this is a group array list, including SArray<STableQueryInfo*> structure
-  SOperatorInfo   *proot;
+  struct SOperatorInfo   *proot;
   SGroupResInfo    groupResInfo;
 } SQueryRuntimeEnv;
 
+typedef struct SOperatorInfo {
+  char      *name;
+  bool       blockingOptr;
+  bool       completed;
+  void      *info;
+  SExprInfo *pExpr;
+  int32_t    numOfOutput;
+
+  SQueryRuntimeEnv *pRuntimeEnv;
+
+  __operator_fn_t       exec;
+  __operator_fn_t       cleanup;
+  struct SOperatorInfo *upstream;
+} SOperatorInfo;
+
 enum {
   QUERY_RESULT_NOT_READY = 1,
   QUERY_RESULT_READY     = 2,
@@ -363,23 +363,18 @@ typedef struct STableScanInfo {
 } STableScanInfo;
 
 typedef struct STagScanInfo {
-  SQueryRuntimeEnv *pRuntimeEnv;
   SColumnInfo* pCols;
   SSDataBlock* pRes;
 } STagScanInfo;
 
 typedef struct SAggOperatorInfo {
   SResultRowInfo    resultRowInfo;
-  STableQueryInfo  *pTableQueryInfo;
-  SQueryRuntimeEnv *pRuntimeEnv;
   SQLFunctionCtx   *pCtx;
   int32_t          *rowCellInfoOffset;
   SSDataBlock      *pRes;
 } SAggOperatorInfo;
 
 typedef struct SArithOperatorInfo {
-  STableQueryInfo  *pTableQueryInfo;
-  SQueryRuntimeEnv *pRuntimeEnv;
   SQLFunctionCtx   *pCtx;
   int32_t          *rowCellInfoOffset;
   SResultRowInfo    resultRowInfo;
@@ -390,18 +385,14 @@ typedef struct SArithOperatorInfo {
 typedef struct SLimitOperatorInfo {
   int64_t limit;
   int64_t total;
-  SQueryRuntimeEnv* pRuntimeEnv;
 } SLimitOperatorInfo;
 
 typedef struct SOffsetOperatorInfo {
   int64_t offset;
   int64_t currentOffset;
-  SQueryRuntimeEnv* pRuntimeEnv;
 } SOffsetOperatorInfo;
 
 typedef struct SHashIntervalOperatorInfo {
-  STableQueryInfo  *pTableQueryInfo;
-  SQueryRuntimeEnv *pRuntimeEnv;
   SQLFunctionCtx   *pCtx;
   int32_t          *rowCellInfoOffset;
   SResultRowInfo    resultRowInfo;
@@ -409,13 +400,10 @@ typedef struct SHashIntervalOperatorInfo {
 } SHashIntervalOperatorInfo;
 
 typedef struct SFillOperatorInfo {
-  SQueryRuntimeEnv *pRuntimeEnv;
   SSDataBlock      *pRes;
 } SFillOperatorInfo;
 
 typedef struct SHashGroupbyOperatorInfo {
-  STableQueryInfo  *pTableQueryInfo;
-  SQueryRuntimeEnv *pRuntimeEnv;
   SQLFunctionCtx   *pCtx;
   int32_t          *rowCellInfoOffset;
   SResultRowInfo    resultRowInfo;

src/query/src/qFill.c

@@ -425,8 +425,6 @@ void taosFillSetInputDataBlock(SFillInfo* pFillInfo, const SSDataBlock* pInput)
   for (int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
     SColumnInfoData* pColData = taosArrayGet(pInput->pDataBlock, i);
     pFillInfo->pData[i] = pColData->pData;
-
-//    memcpy(pFillInfo->pData[i], pInput[i]->data, pFillInfo->numOfRows * pFillInfo->pFillCol[i].col.bytes);
   }
 }