[TD-225] update sim.

src/client/inc/tscLocalMerge.h

@@ -56,7 +56,6 @@ typedef struct SLocalReducer {
   tFilePage *            pTempBuffer;
   struct SQLFunctionCtx *pCtx;
   int32_t                rowSize;      // size of each intermediate result.
-  int32_t                finalRowSize; // final result row size
   int32_t                status;       // denote it is in reduce process, in reduce process, it
   bool                   hasPrevRow;   // cannot be released
   bool                   hasUnprocessedRow;

src/client/src/tscLocalMerge.c

@@ -330,22 +330,19 @@ void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrd
   pReducer->nResultBufSize = pMemBuffer[0]->pageSize * 16;
   pReducer->pResultBuf = (tFilePage *)calloc(1, pReducer->nResultBufSize + sizeof(tFilePage));
 
-  pReducer->finalRowSize = tscGetResRowLength(pQueryInfo->exprList);
   pReducer->resColModel = finalmodel;
   pReducer->resColModel->capacity = pReducer->nResultBufSize;
-
   pReducer->finalModel = pFFModel;
 
-  assert(pReducer->finalRowSize > 0);
-  if (pReducer->finalRowSize > 0) {
-    pReducer->resColModel->capacity /= pReducer->finalRowSize;
+  if (finalmodel->rowSize > 0) {
+    pReducer->resColModel->capacity /= finalmodel->rowSize;
   }
-  assert(pReducer->finalRowSize <= pReducer->rowSize);
 
+  assert(finalmodel->rowSize > 0 && finalmodel->rowSize <= pReducer->rowSize);
   pReducer->pFinalRes = calloc(1, pReducer->rowSize * pReducer->resColModel->capacity);
 
   if (pReducer->pTempBuffer == NULL || pReducer->discardData == NULL || pReducer->pResultBuf == NULL ||
-      /*pReducer->pBufForInterpo == NULL || */pReducer->pFinalRes == NULL || pReducer->prevRowOfInput == NULL) {
+      pReducer->pFinalRes == NULL || pReducer->prevRowOfInput == NULL) {
     tfree(pReducer->pTempBuffer);
     tfree(pReducer->discardData);
     tfree(pReducer->pResultBuf);
@@ -920,7 +917,7 @@ static void genFinalResWithoutFill(SSqlRes* pRes, SLocalReducer *pLocalReducer,
     savePrevRecordAndSetupFillInfo(pLocalReducer, pQueryInfo, pLocalReducer->pFillInfo);
   }
 
-  memcpy(pRes->data, pBeforeFillData->data, (size_t)(pRes->numOfRows * pLocalReducer->finalRowSize));
+  memcpy(pRes->data, pBeforeFillData->data, (size_t)(pRes->numOfRows * pLocalReducer->finalModel->rowSize));
 
   pRes->numOfClauseTotal += pRes->numOfRows;
   pBeforeFillData->num = 0;
@@ -1256,7 +1253,7 @@ bool genFinalResults(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool noMoreCur
   tColModelCompact(pModel, pResBuf, pModel->capacity);
 
   if (tscIsSecondStageQuery(pQueryInfo)) {
-    pLocalReducer->finalRowSize = doArithmeticCalculate(pQueryInfo, pResBuf, pModel->rowSize, pLocalReducer->finalRowSize);
+    doArithmeticCalculate(pQueryInfo, pResBuf, pModel->rowSize, pLocalReducer->finalModel->rowSize);
   }
 
 #ifdef _DEBUG_VIEW
@@ -1627,7 +1624,8 @@ void tscInitResObjForLocalQuery(SSqlObj *pObj, int32_t numOfRes, int32_t rowLen)
 }
 
 int32_t doArithmeticCalculate(SQueryInfo* pQueryInfo, tFilePage* pOutput, int32_t rowSize, int32_t finalRowSize) {
-  char* pbuf = calloc(1, pOutput->num * rowSize);
+  int32_t maxRowSize = MAX(rowSize, finalRowSize);
+  char* pbuf = calloc(1, pOutput->num * maxRowSize);
 
   size_t size = tscNumOfFields(pQueryInfo);
   SArithmeticSupport arithSup = {0};
@@ -1660,7 +1658,6 @@ int32_t doArithmeticCalculate(SQueryInfo* pQueryInfo, tFilePage* pOutput, int32_
     offset += pSup->field.bytes;
   }
 
-  assert(finalRowSize <= rowSize);
   memcpy(pOutput->data, pbuf, pOutput->num * offset);
 
   tfree(pbuf);

tests/script/general/parser/col_arithmetic_query.sim

@@ -349,11 +349,11 @@ if $data00 != 1.800000000 then
   return -1
 endi
 
-if $data01 != 100000 then
+if $data01 != 100000.000000000 then
   return -1
 endi
 
-if $data02 != 200000 then
+if $data02 != 200000.000000000 then
   return -1
 endi
 
@@ -374,77 +374,183 @@ if $data02 != 9.000000020 then
   return -1
 endi
 
-# all possible function in the arithmetic expressioin
-sql select min(c1) * max(c2) /4, sum(c1) * percentile(c2, 20), apercentile(c4, 33) + 52/9, spread(c5)/min(c2) from $stb where ts <  and ts >
+# all possible function in the arithmetic expression, add more
+sql select min(c1) * max(c2) /4, sum(c1) * apercentile(c2, 20), apercentile(c4, 33) + 52/9, spread(c5)/min(c2), count(1)/sum(c1), avg(c2)*count(c2) from $stb where ts >= '2018-09-17 09:00:00.000' and ts <= '2018-11-25 19:30:00.000';
+if $rows != 1 then
+  return -1
+endi
 
-# no result return [d.3]
+if $data00 != 0.000000000 then
+  return -1
+endi
+
+if $data01 != 225000.000000000 then
+  return -1
+endi
+
+if $data02 != 8.077777778 then
+  return -1
+endi
+
+if $data03 != inf then
+  return -1
+endi
+
+if $data04 != 0.444444444 then
+  return -1
+endi
+
+if $data05 != 450000.000000000 then
+  return -1
+endi
+
+# no result return [d.3]===============================================================
 sql select first(c1) * 91 - 7, last(c3) from $stb where ts < 1537146000000
 if $rows != 0 then
   return -1
 endi
 
 # no result return [d.3]
-sql select sum(c2) - avg(c2) from $tb where ts>xxx
+sql select sum(c2) - avg(c2) from $stb where ts > '2018-11-25 19:30:00.000'
 if $rows != 0 then
   return -1
 endi
 
-# single row result aggregation [d.4]
-sql select
+# single row result aggregation [d.4]===================================================
+# all those cases are aggregation test cases.
 
 # error cases
-sql_error select first(c1, c2) - last(c1, c2) from $tb
+sql_error select first(c1, c2) - last(c1, c2) from $stb
+sql_error select top(c1, 5) - bottom(c1, 5) from $stb
+sql_error select first(*) - 99 from $stb
 
 # multi row result aggregation [d.4]
-sql select top(c1, 1) - bottom(c1, 1) from $tb
-sql select top(c1, 99) - bottom(c1, 99) from $tb
+sql_error select top(c1, 1) - bottom(c1, 1) from $stb
+sql_error select top(c1, 99) - bottom(c1, 99) from $stb
 
-# all data types [d.6]
-sql select c2-c1, c3/c2, c4*c3, c5%c4, c6+99%22 from $tb
+# query on super table [d.5]=============================================================
+# all cases in this part are query on super table
+
+# all data types [d.6]===================================================================
+sql select c2-c1, c3/c2, c4*c3, c5%c4, c6+99%22 from $stb
 
 # error case, ts/bool/binary/nchar not support arithmetic expression
-sql_error select ts+ts from $tb
-sql_error select ts+22 from $tb
-sql_error select c7*12 from $tb
-sql_error select c8/55 from $tb
-sql_error select c9+c8 from $tb
+sql_error select first(c7)*12 from $stb
+sql_error select last(c8)/55 from $stb
+sql_error select last_row(c9) + last_row(c8) from $stb
 
-# arithmetic expression in join [d.7]
+# arithmetic expression in join [d.7]===============================================================
 
 
-# arithmetic expression in union [d.8]
+# arithmetic expression in union [d.8]===============================================================
 
 
-# arithmetic expression in group by [d.9]
+# arithmetic expression in group by [d.9]===============================================================
 # in group by tag
-# not support for normal table
-sql_error select c5*99 from $tb group by t1
+sql select avg(c4)*99 from $stb group by t1
+if $rows != 10 then
+  return -1
+endi
+
+if $data00 != 445.500000000 then
+  return -1
+endi
+
+if $data01 != 0 then
+  return -1
+endi
+
+if $data90 != 445.500000000 then
+  return -1
+endi
+
+if $data91 != 9 then
+  return -1
+endi
 
 # in group by column
-sql_error select c6-c6+c3*12 from $tb group by c3;
+sql select apercentile(c6, 50)-first(c6)+last(c5)*12, last(c5)*12 from ca_stb0 group by c2;
+if $rows != 10 then
+  return -1
+endi
 
-sql select first(c6) - last(c6) *12 / count(*) from $tb group by c3;
+if $data00 != 0.000000000 then
+  return -1
+endi
 
-# limit offset [d.10]
-sql select c6-c6+12 from $tb limit 12 offset 99;
-sql select c4/99.123 from $tb limit 1 offset 9999;
+if $data01 != 0.000000000 then
+  return -1
+endi
 
-# slimit/soffset not suport for normal table query. [d.11]
-sql_error select sum(c1) from $tb slimit 1 soffset 19;
+if $data10 != 12.000000000 then
+  return -1
+endi
 
-# fill [d.12]
-sql_error select c2-c2, c3-c4, c5%c6 from $tb fill(value, 12);
+if $data11 != 12.000000000 then
+  return -1
+endi
+
+if $data20 != 24.000000000 then
+  return -1
+endi
+
+if $data21 != 24.000000000 then
+  return -1
+endi
+
+sql_error select first(c6) - last(c6) *12 / count(*) from $stb group by c3;
+
+sql select first(c6) - last(c6) *12 / count(*) from $stb group by c5;
+if $rows != 10 then
+  return -1
+endi
+
+if $data00 != 0.000000000 then
+  return -1
+endi
+
+if $data10 != 0.997600000 then
+  return -1
+endi
+
+if $data90 != 8.978400000 then
+  return -1
+endi
+
+# limit offset [d.10]===============================================================
+sql select first(c6) - sum(c6) + 12 from $stb limit 12 offset 0;
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != -449988.000000000 then
+  return -1
+endi
+
+sql select apercentile(c4, 21) / 99.123 from $stb limit 1 offset 1;
+if $rows != 0 then
+  return -1
+endi
+
+# slimit/soffset not suport for normal table query. [d.11]===============================================================
+sql_error select sum(c1) from $stb slimit 1 soffset 19;
 
-# constant column. [d.13]
+sql select sum(c1) from $stb interval(1s) group by tbname slimit 1 soffset 1;
 
+# fill [d.12]===============================================================
+sql_error select first(c1)-last(c1), sum(c3)*count(c3), spread(c5 ) % count(*) from $stb interval(1s) fill(prev);
+sql_error select first(c1) from $stb fill(value, 20);
 
-# column value filter [d.14]
+# constant column. [d.13]===============================================================
 
 
-# tag filter(not support for normal table). [d.15]
-sql_error select sum(c2)+99 from $tb where t1=12;
+# column value filter [d.14]===============================================================
 
-# multi-field output [d.16]
+
+# tag filter. [d.15]===============================================================
+sql select sum(c2)+99 from $stb where t1=12;
+
+# multi-field output [d.16]===============================================================
 sql select count(*), sum(c1)*avg(c2), avg(c3)*count(c3), sum(c3), sum(c4), first(c7), last(c8), first(c9), first(c7), last(c8) from $tb
 
 sql select c4*1+1/2 from $tb
@@ -461,18 +567,30 @@ if $data90 != 9.500000000 then
   return -1
 endi
 
-# interval query [d.17]
-sql_error select c2*c2, c3-c3, c4+9 from $tb interval(1s)
-sql_error select c7-c9 from $tb interval(2y)
+# interval query [d.17]===============================================================
+sql select avg(c2)*count(c2), sum(c3)-first(c3), last(c4)+9 from $stb interval(1s)
+if $rows != 10000 then
+  return -1
+endi
 
-# aggregation query [d.18]
-# see test cases below
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
 
-# first/last query  [d.19]
-# see test cases below
+sql select first(c7)- last(c1) from $tb interval(2y)
 
-# multiple retrieve [d.20]
+# aggregation query [d.18]===============================================================
+# all cases in this part are aggregation query test.
+
+# first/last query  [d.19]===============================================================
+
+
+# multiple retrieve [d.20]===============================================================
 sql select c2-c2 from $tb;
 
 
 sql select first(c1)-last(c1), spread(c2), max(c3) - min(c3), avg(c4)*count(c4) from $tb
+
+
+#====================================================super table query==================================================
+