[TS-802]<fix>(query): reset to master code and modify param3

src/client/src/tscUtil.c

@@ -1347,9 +1347,9 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue
         // set input order
         SQueryInfo* pInputQI = pSqlObjList[0]->cmd.pQueryInfo;
         if(pInputQI) {
-          pex->base.numOfParams = 2;
-          pex->base.param[1].nType = TSDB_DATA_TYPE_INT;
-          pex->base.param[1].i64 = pInputQI->order.order;
+          pex->base.numOfParams = 3;
+          pex->base.param[2].nType = TSDB_DATA_TYPE_INT;
+          pex->base.param[2].i64 = pInputQI->order.order;
         }
       }
     }

src/query/src/qAggMain.c

@@ -698,6 +698,10 @@ static int32_t dataBlockRequired(SQLFunctionCtx *pCtx, STimeWindow* w, int32_t c
 
 // todo: if column in current data block are null, opt for this case
 static int32_t firstFuncRequired(SQLFunctionCtx *pCtx, STimeWindow* w, int32_t colId) {
+  if (pCtx->order == TSDB_ORDER_DESC) {
+    return BLK_DATA_NO_NEEDED;
+  }
+    
   // no result for first query, data block is required
   if (GET_RES_INFO(pCtx) == NULL || GET_RES_INFO(pCtx)->numOfRes <= 0) {
     return BLK_DATA_ALL_NEEDED;
@@ -707,6 +711,10 @@ static int32_t firstFuncRequired(SQLFunctionCtx *pCtx, STimeWindow* w, int32_t c
 }
 
 static int32_t lastFuncRequired(SQLFunctionCtx *pCtx, STimeWindow* w, int32_t colId) {  
+  if (pCtx->order != pCtx->param[0].i64) {
+    return BLK_DATA_NO_NEEDED;
+  }
+  
   if (GET_RES_INFO(pCtx) == NULL || GET_RES_INFO(pCtx)->numOfRes <= 0) {
     return BLK_DATA_ALL_NEEDED;
   } else {
@@ -1516,38 +1524,66 @@ static bool first_last_function_setup(SQLFunctionCtx *pCtx, SResultRowCellInfo*
 
 // todo opt for null block
 static void first_function(SQLFunctionCtx *pCtx) {  
+  SResultRowCellInfo* pResInfo = GET_RES_INFO(pCtx);
   int32_t notNullElems = 0;
   int32_t step = 1;
   int32_t i = 0;
+  bool inputAsc = true;
 
-  if(pCtx->numOfParams == 2)   {
-    if(pCtx->param[1].nType == TSDB_DATA_TYPE_INT && pCtx->param[1].i64 == TSDB_ORDER_DESC) {
+  // input data come from sub query, input data order equal to sub query order
+  if(pCtx->numOfParams == 3) {
+    if(pCtx->param[2].nType == TSDB_DATA_TYPE_INT && pCtx->param[2].i64 == TSDB_ORDER_DESC) {
       step = -1;
       i = pCtx->size - 1;
+      inputAsc = false;
     }
+  } else if (pCtx->order == TSDB_ORDER_DESC) {
+    return ;
   }
-  
-  // handle the null value
-  for (int32_t m = 0; m < pCtx->size; ++m, i+=step) {
-    char *data = GET_INPUT_DATA(pCtx, i);
-    if (pCtx->hasNull && isNull(data, pCtx->inputType)) {
-      continue;
-    }
-    
-    memcpy(pCtx->pOutput, data, pCtx->inputBytes);
-    if (pCtx->ptsList != NULL) {
-      TSKEY k = GET_TS_DATA(pCtx, i);
-      DO_UPDATE_TAG_COLUMNS(pCtx, k);
+
+  if(pCtx->order == TSDB_ORDER_ASC && inputAsc) {
+    for (int32_t m = 0; m < pCtx->size; ++m, i+=step) {
+      char *data = GET_INPUT_DATA(pCtx, i);
+      if (pCtx->hasNull && isNull(data, pCtx->inputType)) {
+        continue;
+      }
+      
+      memcpy(pCtx->pOutput, data, pCtx->inputBytes);
+      if (pCtx->ptsList != NULL) {
+        TSKEY k = GET_TS_DATA(pCtx, i);
+        DO_UPDATE_TAG_COLUMNS(pCtx, k);
+      }
+
+      SResultRowCellInfo *pInfo = GET_RES_INFO(pCtx);
+      pInfo->hasResult = DATA_SET_FLAG;
+      pInfo->complete = true;
+      
+      notNullElems++;
+      break;
     }
+  } else {  // desc order
+    for (int32_t m = 0; m < pCtx->size; ++m, i+=step) {
+      char *data = GET_INPUT_DATA(pCtx, i);
+      if (pCtx->hasNull && isNull(data, pCtx->inputType) && (!pCtx->requireNull)) {
+        continue;
+      }
 
-    SResultRowCellInfo *pInfo = GET_RES_INFO(pCtx);
-    pInfo->hasResult = DATA_SET_FLAG;
-    pInfo->complete = true;
-    
-    notNullElems++;
-    break;
+      TSKEY ts = pCtx->ptsList ? GET_TS_DATA(pCtx, i) : 0;
+
+      char* buf = GET_ROWCELL_INTERBUF(pResInfo);
+      if (pResInfo->hasResult != DATA_SET_FLAG || (*(TSKEY*)buf) > ts) {
+        pResInfo->hasResult = DATA_SET_FLAG;
+        memcpy(pCtx->pOutput, data, pCtx->inputBytes);
+
+        *(TSKEY*)buf = ts;
+        DO_UPDATE_TAG_COLUMNS(pCtx, ts);
+      }
+
+      notNullElems++;
+      break;
+    }
   }
-  
+
   SET_VAL(pCtx, notNullElems, 1);
 }
 
@@ -1636,11 +1672,14 @@ static void last_function(SQLFunctionCtx *pCtx) {
   int32_t step = -1;
   int32_t i = pCtx->size - 1;
 
-  if(pCtx->numOfParams == 2)   {
-    if(pCtx->param[1].nType == TSDB_DATA_TYPE_INT && pCtx->param[1].i64 == TSDB_ORDER_DESC) {
+  // input data come from sub query, input data order equal to sub query order
+  if(pCtx->numOfParams == 3) {
+    if(pCtx->param[2].nType == TSDB_DATA_TYPE_INT && pCtx->param[2].i64 == TSDB_ORDER_DESC) {
       step = 1;
       i = 0;
     }
+  } else if (pCtx->order != pCtx->param[0].i64) {
+    return;
   }
 
   if (pCtx->order == TSDB_ORDER_DESC) {

src/query/src/qExecutor.c

@@ -1910,6 +1910,7 @@ static int32_t getGroupbyColumnIndex(SGroupbyExpr *pGroupbyExpr, SSDataBlock* pD
 
 static bool functionNeedToExecute(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx *pCtx) {
   SResultRowCellInfo *pResInfo = GET_RES_INFO(pCtx);
+  SQueryAttr* pQueryAttr = pRuntimeEnv->pQueryAttr;
 
   // in case of timestamp column, always generated results.
   int32_t functionId = pCtx->functionId;
@@ -1921,6 +1922,15 @@ static bool functionNeedToExecute(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx
     return false;
   }
 
+  if (functionId == TSDB_FUNC_FIRST_DST || functionId == TSDB_FUNC_FIRST) {
+    return QUERY_IS_ASC_QUERY(pQueryAttr);
+  }
+
+  // denote the order type
+  if ((functionId == TSDB_FUNC_LAST_DST || functionId == TSDB_FUNC_LAST)) {
+    return pCtx->param[0].i64 == pQueryAttr->order.order;
+  }
+
   // in the reverse table scan, only the following functions need to be executed
   if (IS_REVERSE_SCAN(pRuntimeEnv) ||
       (pRuntimeEnv->scanFlag == REPEAT_SCAN && functionId != TSDB_FUNC_STDDEV && functionId != TSDB_FUNC_PERCT)) {