[td-2895] refactor.

src/client/src/tscServer.c

@@ -825,13 +825,31 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
     pSqlFuncExpr->colInfo.colIndex = htons(pExpr->colInfo.colIndex);
     pSqlFuncExpr->colInfo.flag     = htons(pExpr->colInfo.flag);
 
+    if (TSDB_COL_IS_UD_COL(pExpr->colInfo.flag)) {
+      pSqlFuncExpr->colType  = htons(pExpr->resType);
+      pSqlFuncExpr->colBytes = htons(pExpr->resBytes);
+    } else if (pExpr->colInfo.colId == TSDB_TBNAME_COLUMN_INDEX) {
+      SSchema *s = tGetTbnameColumnSchema();
+
+      pSqlFuncExpr->colType = htons(s->type);
+      pSqlFuncExpr->colBytes = htons(s->bytes);
+    } else if (pExpr->colInfo.colId == TSDB_BLOCK_DIST_COLUMN_INDEX) {
+      SSchema s = tGetBlockDistColumnSchema();
+
+      pSqlFuncExpr->colType = htons(s.type);
+      pSqlFuncExpr->colBytes = htons(s.bytes);
+    } else {
+      SSchema* s = tscGetColumnSchemaById(pTableMeta, pExpr->colInfo.colId);
+      pSqlFuncExpr->colType  = htons(s->type);
+      pSqlFuncExpr->colBytes = htons(s->bytes);
+    }
+
     pSqlFuncExpr->functionId  = htons(pExpr->functionId);
     pSqlFuncExpr->numOfParams = htons(pExpr->numOfParams);
     pSqlFuncExpr->resColId    = htons(pExpr->resColId);
     pMsg += sizeof(SSqlFuncMsg);
 
-    for (int32_t j = 0; j < pExpr->numOfParams; ++j) {
-      // todo add log
+    for (int32_t j = 0; j < pExpr->numOfParams; ++j) { // todo add log
       pSqlFuncExpr->arg[j].argType = htons((uint16_t)pExpr->param[j].nType);
       pSqlFuncExpr->arg[j].argBytes = htons(pExpr->param[j].nLen);
 
@@ -869,14 +887,19 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
         pSqlFuncExpr1->colInfo.colId = htons(pExpr->resColId);
         pSqlFuncExpr1->colInfo.flag = htons(TSDB_COL_NORMAL);
 
+        bool assign = false;
         for (int32_t f = 0; f < tscSqlExprNumOfExprs(pQueryInfo); ++f) {
           SSqlExpr *pe = tscSqlExprGet(pQueryInfo, f);
           if (pe == pExpr) {
             pSqlFuncExpr1->colInfo.colIndex = htons(f);
+            pSqlFuncExpr1->colType = htons(pe->resType);
+            pSqlFuncExpr1->colBytes = htons(pe->resBytes);
+            assign = true;
             break;
           }
         }
 
+        assert(assign);
         pMsg += sizeof(SSqlFuncMsg);
         pSqlFuncExpr1 = (SSqlFuncMsg *)pMsg;
       } else {

src/inc/taosmsg.h

@@ -387,7 +387,7 @@ typedef struct SColIndex {
   int16_t  colId;      // column id
   int16_t  colIndex;   // column index in colList if it is a normal column or index in tagColList if a tag
   uint16_t flag;       // denote if it is a tag or a normal column
-  char     name[TSDB_COL_NAME_LEN];
+  char     name[TSDB_COL_NAME_LEN];  // TODO remove it
 } SColIndex;
 
 /* sql function msg, to describe the message to vnode about sql function
@@ -395,7 +395,10 @@ typedef struct SColIndex {
 typedef struct SSqlFuncMsg {
   int16_t functionId;
   int16_t numOfParams;
+
   int16_t resColId;      // result column id, id of the current output column
+  int16_t colType;
+  int16_t colBytes;
 
   SColIndex colInfo;
   struct ArgElem {

src/query/inc/qExecutor.h

@@ -240,6 +240,7 @@ typedef struct SQuery {
 } SQuery;
 
 typedef SSDataBlock* (*__operator_fn_t)(void* param);
+typedef void (*__optr_cleanup_fn_t)(void* param, int32_t num);
 
 struct SOperatorInfo;
 
@@ -256,8 +257,6 @@ typedef struct SQueryRuntimeEnv {
   SHashObj*            pResultRowHashTable; // quick locate the window object for each result
   char*                keyBuf;           // window key buffer
   SResultRowPool*      pool;             // window result object pool
-
-//  int32_t*             rowCellInfoOffset;// offset value for each row result cell info
   char**               prevRow;
 
   SArray*              prevResult;       // intermediate result, SArray<SInterResult>
@@ -285,11 +284,11 @@ typedef struct SOperatorInfo {
   SExprInfo *pExpr;
   int32_t    numOfOutput;
 
-  SQueryRuntimeEnv *pRuntimeEnv;
+  SQueryRuntimeEnv     *pRuntimeEnv;
+  struct SOperatorInfo *upstream;
 
   __operator_fn_t       exec;
-  __operator_fn_t       cleanup;
-  struct SOperatorInfo *upstream;
+  __optr_cleanup_fn_t   cleanup;
 } SOperatorInfo;
 
 enum {
@@ -357,6 +356,7 @@ typedef struct STableScanInfo {
 
   SQLFunctionCtx *pCtx;  // next operator query context
   SResultRowInfo *pResultRowInfo;
+
   int32_t         numOfOutput;
   int32_t        *rowCellInfoOffset;
   int64_t         elapsedTime;
@@ -367,19 +367,19 @@ typedef struct STagScanInfo {
   SSDataBlock* pRes;
 } STagScanInfo;
 
-typedef struct SAggOperatorInfo {
+typedef struct SOptrBasicInfo {
   SResultRowInfo    resultRowInfo;
+  int32_t          *rowCellInfoOffset;  // offset value for each row result cell info
   SQLFunctionCtx   *pCtx;
-  int32_t          *rowCellInfoOffset;
   SSDataBlock      *pRes;
-} SAggOperatorInfo;
+} SOptrBasicInfo;
+
+typedef struct SOptrBasicInfo SAggOperatorInfo;
+typedef struct SOptrBasicInfo SHashIntervalOperatorInfo;
 
 typedef struct SArithOperatorInfo {
-  SQLFunctionCtx   *pCtx;
-  int32_t          *rowCellInfoOffset;
-  SResultRowInfo    resultRowInfo;
-  SSDataBlock      *pOutput;
-  int32_t           bufCapacity;
+  SOptrBasicInfo binfo;
+  int32_t        bufCapacity;
 } SArithOperatorInfo;
 
 typedef struct SLimitOperatorInfo {
@@ -392,22 +392,12 @@ typedef struct SOffsetOperatorInfo {
   int64_t currentOffset;
 } SOffsetOperatorInfo;
 
-typedef struct SHashIntervalOperatorInfo {
-  SQLFunctionCtx   *pCtx;
-  int32_t          *rowCellInfoOffset;
-  SResultRowInfo    resultRowInfo;
-  SSDataBlock      *pRes;
-} SHashIntervalOperatorInfo;
-
 typedef struct SFillOperatorInfo {
   SSDataBlock      *pRes;
 } SFillOperatorInfo;
 
 typedef struct SHashGroupbyOperatorInfo {
-  SQLFunctionCtx   *pCtx;
-  int32_t          *rowCellInfoOffset;
-  SResultRowInfo    resultRowInfo;
-  SSDataBlock      *pRes;
+  SOptrBasicInfo    binfo;
   int32_t           colIndex;
 } SHashGroupbyOperatorInfo;
 

src/query/src/qAggMain.c

@@ -3566,7 +3566,6 @@ static void arithmetic_function(SQLFunctionCtx *pCtx) {
   SArithmeticSupport *sas = (SArithmeticSupport *)pCtx->param[1].pz;
   
   arithmeticTreeTraverse(sas->pArithExpr->pExpr, pCtx->size, pCtx->pOutput, sas, pCtx->order, getArithColumnData);
-//  pCtx->pOutput += pCtx->outputBytes * pCtx->size;
 }
 
 static void arithmetic_function_f(SQLFunctionCtx *pCtx, int32_t index) {

src/query/src/qFill.c

@@ -279,7 +279,7 @@ static int32_t setTagColumnInfo(SFillInfo* pFillInfo, int32_t numOfCols, int32_t
   int32_t k = 0;
   for (int32_t i = 0; i < numOfCols; ++i) {
     SFillColInfo* pColInfo = &pFillInfo->pFillCol[i];
-    pFillInfo->pData[i] = calloc(1, pColInfo->col.bytes * capacity);
+    pFillInfo->pData[i] = NULL;
 
     if (TSDB_COL_IS_TAG(pColInfo->flag)) {
       bool exists = false;
@@ -377,10 +377,10 @@ void* taosDestroyFillInfo(SFillInfo* pFillInfo) {
   tfree(pFillInfo->prevValues);
   tfree(pFillInfo->nextValues);
   tfree(pFillInfo->pTags);
-  
-  for(int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
-    tfree(pFillInfo->pData[i]);
-  }
+
+//  for(int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
+//    tfree(pFillInfo->pData[i]);
+//  }
   
   tfree(pFillInfo->pData);
   tfree(pFillInfo->pFillCol);

tests/script/general/parser/fill.sim

@@ -980,10 +980,6 @@ if $data00 != @20-01-01 01:01:00.000@ then
   return -1
 endi
 
-if $data00 != @20-01-01 01:01:00.000@ then
-  return -1
-endi
-if $data1
 if $data01 != 2.000000000 then
   return -1
 endi