Merge branch '3.0' into 3.0test/jcy

source/libs/executor/src/executorimpl.c

@@ -3963,6 +3963,8 @@ static SSDataBlock* doApplyIndefinitFunction(SOperatorInfo* pOperator) {
     size_t rows = pInfo->pRes->info.rows;
     if (rows > 0 || pOperator->status == OP_EXEC_DONE) {
       break;
+    } else {
+      blockDataCleanup(pInfo->pRes);
     }
   }
 

source/libs/parser/src/parInsert.c

@@ -1018,7 +1018,7 @@ static int32_t parseTagsClause(SInsertParseContext* pCxt, SSchema* pSchema, uint
 end:
   for (int i = 0; i < taosArrayGetSize(pTagVals); ++i) {
     STagVal* p = (STagVal*)taosArrayGet(pTagVals, i);
-    if (IS_VAR_DATA_TYPE(p->type)) {
+    if (p->type == TSDB_DATA_TYPE_NCHAR) {
       taosMemoryFree(p->pData);
     }
   }

source/libs/planner/src/planOptimizer.c

@@ -1588,7 +1588,7 @@ static int32_t eliminateProjOptimizeImpl(SOptimizeContext* pCxt, SLogicSubplan*
   FOREACH(pProjection, pProjectNode->pProjections) {
     SNode* pChildTarget = NULL;
     FOREACH(pChildTarget, pChild->pTargets) {
-      if (strcmp(((SColumnNode*)pProjection)->colName, ((SColumnNode*)pChildTarget)->colName) == 0) {
+      if (0 == strcmp(((SColumnNode*)pProjection)->colName, ((SColumnNode*)pChildTarget)->colName)) {
         nodesListAppend(pNewChildTargets, nodesCloneNode(pChildTarget));
         break;
       }
@@ -2167,10 +2167,26 @@ static int32_t tagScanOptimize(SOptimizeContext* pCxt, SLogicSubplan* pLogicSubp
         break;
       }
   }
-  
   NODES_DESTORY_LIST(pScanNode->pScanCols);
 
   SLogicNode* pAgg = pScanNode->node.pParent;
+  if (NULL == pAgg->pParent) {
+    SNodeList* pScanTargets = nodesMakeList();
+
+    SNode* pAggTarget = NULL;
+    FOREACH(pAggTarget, pAgg->pTargets) {
+      SNode* pScanTarget = NULL;
+        FOREACH(pScanTarget, pScanNode->node.pTargets) {
+        if (0 == strcmp( ((SColumnNode*)pAggTarget)->colName, ((SColumnNode*)pAggTarget)->colName )) {
+          nodesListAppend(pScanTargets, nodesCloneNode(pScanTarget));
+          break;
+        }
+      }
+    }
+    nodesDestroyList(pScanNode->node.pTargets);
+    pScanNode->node.pTargets = pScanTargets;
+  }
+
   int32_t code = replaceLogicNode(pLogicSubplan, pAgg, (SLogicNode*)pScanNode);
   if (TSDB_CODE_SUCCESS == code) {
     NODES_CLEAR_LIST(pAgg->pChildren);

tests/script/tsim/parser/udf.sim

-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
-system sh/exec.sh -n dnode1 -s start
-system sh/prepare_udf.sh
-
-sleep 100
-sql connect
-print ======================== dnode1 start
-
-sql create function n01 as '/tmp/normal' outputtype int;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n01 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != INT then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n01;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-sql create function n02 as '/tmp/normal' outputtype bool;
-sql show functions;
-if $rows != 1 then
-  print expect 1, actual $rows
-  return -1
-endi
-
-
-if $data00 != n02 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != BOOL then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n02;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-
-sql create function n03 as '/tmp/normal' outputtype TINYINT;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n03 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != TINYINT then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n03;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-
-
-sql create function n04 as '/tmp/normal' outputtype SMALLINT;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n04 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != SMALLINT then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n04;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-
-
-
-sql create function n05 as '/tmp/normal' outputtype INT;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n05 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != INT then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n05;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-
-
-
-
-
-
-
-sql create function n06 as '/tmp/normal' outputtype BIGINT;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n06 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != BIGINT then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n06;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-
-
-
-
-
-sql create function n07 as '/tmp/normal' outputtype FLOAT;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n07 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != FLOAT then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n07;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-
-
-
-
-sql create function n08 as '/tmp/normal' outputtype DOUBLE;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n08 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != DOUBLE then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n08;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-
-
-
-
-sql create function n09 as '/tmp/normal' outputtype BINARY;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n09 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != BINARY(0) then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n09;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-sql create function n10 as '/tmp/normal' outputtype BINARY(10);
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n10 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != BINARY(10) then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n10;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-sql create function n11 as '/tmp/normal' outputtype TIMESTAMP;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n11 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != TIMESTAMP then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n11;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-sql create function n12 as '/tmp/normal' outputtype NCHAR;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n12 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != NCHAR(0) then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n12;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-sql create function n13 as '/tmp/normal' outputtype NCHAR(10);
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n13 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != NCHAR(10) then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n13;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-
-sql create function n14 as '/tmp/normal' outputtype TINYINT UNSIGNED;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n14 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n14;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-sql create function n15 as '/tmp/normal' outputtype SMALLINT UNSIGNED;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n15 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n15;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-sql create function n16 as '/tmp/normal' outputtype INT UNSIGNED;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n16 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n16;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-sql create function n17 as '/tmp/normal' outputtype BIGINT UNSIGNED;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n17 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n17;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-sql create aggregate function n18 as '/tmp/normal' outputtype BIGINT UNSIGNED;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n18 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 1 then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n18;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-sql create function t01 as '/tmp/normal' outputtype INT;
-sql_error create function t01 as '/tmp/normal' outputtype SMALLINT;
-sql drop function t01;
-sql create function t01 as '/tmp/normal' outputtype INT;
-sql create function t02 as '/tmp/normal' outputtype SMALLINT;
-sql show functions;
-if $rows != 2 then
-  return -1
-endi
-
-
-
-
-
-
-sql_error create function e1 as '/tmp/normal';
-sql_error create function e2 as '/tmp/normal' outputtype;
-sql_error create function e3 as '/tmp/normal' a;
-sql_error create function e4 as '/tmp/normal' outputtype a;
-sql_error create function e5 as '/tmp/normal' outputtype bool int;
-sql_error create function as '/tmp/normal' outputtype;
-sql_error create function e6 as '/tmp/empty' outputtype int;
-sql_error create function e7 as '/tmp/big' outputtype int;
-sql_error create function e8 as '/tmp/noexistfile' outputtype int;
-sql_error create function e0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456 as '/tmp/normal' outputtype int;
-sql_error create function e9 as outputtype int;
-
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/parser/udf_dll.sim

-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
-system sh/exec.sh -n dnode1 -s start
-system sh/prepare_udf.sh
-
-sleep 100
-sql connect
-print ======================== dnode1 start
-
-sql create function add_one as '/tmp/add_one.so' outputtype int;
-sql create aggregate function sum_double as '/tmp/sum_double.so' outputtype int;
-sql show functions;
-if $rows != 2 then
-  return -1
-endi
-
-sql create database db;
-sql use db;
-sql create table tb1 (ts timestamp, f1 int, f2 bool, f3 binary(10));
-sql insert into tb1 values ('2021-03-23 17:17:19.660', 1, true, 'tb1-1');
-sql insert into tb1 values ('2021-03-23 19:23:28.595', 2, false, 'tb1-2');
-sql insert into tb1 values ('2021-03-23 19:33:39.070', 3, true, 'tb1-3');
-sql insert into tb1 values ('2021-03-23 19:34:37.670', 4, false, 'tb1-4');
-sql insert into tb1 values ('2021-03-24 19:08:06.609', 5, true, 'tb1-5');
-sql insert into tb1 values ('2021-03-24 19:26:38.231', 6, false, 'tb1-6');
-sql insert into tb1 values ('2021-03-25 10:03:17.688', 7, true, 'tb1-7');
-
-sql select add_one(f1) from tb1;
-if $rows != 7 then
-  return -1
-endi
-
-if $data00 != 2 then 
-   return -1
-endi
-if $data10 != 3 then 
-   return -1
-endi
-if $data20 != 4 then 
-   return -1
-endi
-if $data30 != 5 then 
-   return -1
-endi
-if $data40 != 6 then 
-   return -1
-endi
-if $data50 != 7 then 
-   return -1
-endi
-if $data60 != 8 then 
-   return -1
-endi
-
-
-sql select sum_double(f1) from tb1;
-if $rows != 1 then
-  return -1
-endi
-
-if $data00 != 56 then 
-   return -1
-endi
-
-
-sql select ts,add_one(f1),f1 from tb1;
-if $rows != 7 then
-  return -1
-endi
-
-if $data00 != @21-03-23 17:17:19.660@ then 
-   return -1
-endi
-if $data01 != 2 then 
-   return -1
-endi
-if $data02 != 1 then 
-   return -1
-endi
-if $data10 != @21-03-23 19:23:28.595@ then 
-   return -1
-endi
-if $data11 != 3 then 
-   return -1
-endi
-if $data12 != 2 then 
-   return -1
-endi
-if $data20 != @21-03-23 19:33:39.070@ then 
-   return -1
-endi
-if $data21 != 4 then 
-   return -1
-endi
-if $data22 != 3 then 
-   return -1
-endi
-if $data30 != @21-03-23 19:34:37.670@ then 
-   return -1
-endi
-if $data31 != 5 then 
-   return -1
-endi
-if $data32 != 4 then 
-   return -1
-endi
-if $data40 != @21-03-24 19:08:06.609@ then 
-   return -1
-endi
-if $data41 != 6 then 
-   return -1
-endi
-if $data42 != 5 then 
-   return -1
-endi
-if $data50 != @21-03-24 19:26:38.231@ then 
-   return -1
-endi
-if $data51 != 7 then 
-   return -1
-endi
-if $data52 != 6 then 
-   return -1
-endi
-if $data60 != @21-03-25 10:03:17.688@ then 
-   return -1
-endi
-if $data61 != 8 then 
-   return -1
-endi
-if $data62 != 7 then 
-   return -1
-endi
-
-
-
-
-sql select add_one(f1),add_one(f1) from tb1;
-if $rows != 7 then
-  return -1
-endi
-
-if $data00 != 2 then 
-   return -1
-endi
-if $data01 != 2 then 
-   return -1
-endi
-if $data10 != 3 then 
-   return -1
-endi
-if $data11 != 3 then 
-   return -1
-endi
-if $data20 != 4 then 
-   return -1
-endi
-if $data21 != 4 then 
-   return -1
-endi
-if $data30 != 5 then 
-   return -1
-endi
-if $data31 != 5 then 
-   return -1
-endi
-if $data40 != 6 then 
-   return -1
-endi
-if $data41 != 6 then 
-   return -1
-endi
-if $data50 != 7 then 
-   return -1
-endi
-if $data51 != 7 then 
-   return -1
-endi
-if $data60 != 8 then 
-   return -1
-endi
-if $data61 != 8 then 
-   return -1
-endi
-
-
-sql select add_one(f1)+1 from tb1;
-if $rows != 7 then
-  return -1
-endi
-
-if $data00 != 3.000000000 then 
-   return -1
-endi
-if $data10 != 4.000000000 then 
-   return -1
-endi
-if $data20 != 5.000000000 then 
-   return -1
-endi
-if $data30 != 6.000000000 then 
-   return -1
-endi
-if $data40 != 7.000000000 then 
-   return -1
-endi
-if $data50 != 8.000000000 then 
-   return -1
-endi
-if $data60 != 9.000000000 then 
-   return -1
-endi
-
-
-sql select sum_double(f1)+1 from tb1;
-if $rows != 1 then
-  return -1
-endi
-
-if $data00 != 57.000000000 then 
-   return -1
-endi
-
-
-sql select add_one(f1)+1,f1 from tb1;
-if $rows != 7 then
-  return -1
-endi
-
-if $data00 != 3.000000000 then 
-   return -1
-endi
-if $data01 != 1 then 
-   return -1
-endi
-if $data10 != 4.000000000 then 
-   return -1
-endi
-if $data11 != 2 then 
-   return -1
-endi
-if $data20 != 5.000000000 then 
-   return -1
-endi
-if $data21 != 3 then 
-   return -1
-endi
-if $data30 != 6.000000000 then 
-   return -1
-endi
-if $data31 != 4 then 
-   return -1
-endi
-if $data40 != 7.000000000 then 
-   return -1
-endi
-if $data41 != 5 then 
-   return -1
-endi
-if $data50 != 8.000000000 then 
-   return -1
-endi
-if $data51 != 6 then 
-   return -1
-endi
-if $data60 != 9.000000000 then 
-   return -1
-endi
-if $data61 != 7 then 
-   return -1
-endi
-
-
-sql select sum_double(f1) from tb1 interval (10a);
-if $rows != 7 then
-  return -1
-endi
-
-if $data00 != @21-03-23 17:17:19.660@ then 
-   return -1
-endi
-if $data01 != 2 then 
-   return -1
-endi
-if $data10 != @21-03-23 19:23:28.590@ then 
-   return -1
-endi
-if $data11 != 4 then 
-   return -1
-endi
-if $data20 != @21-03-23 19:33:39.070@ then 
-   return -1
-endi
-if $data21 != 6 then 
-   return -1
-endi
-if $data30 != @21-03-23 19:34:37.670@ then 
-   return -1
-endi
-if $data31 != 8 then 
-   return -1
-endi
-if $data40 != @21-03-24 19:08:06.600@ then 
-   return -1
-endi
-if $data41 != 10 then 
-   return -1
-endi
-if $data50 != @21-03-24 19:26:38.230@ then 
-   return -1
-endi
-if $data51 != 12 then 
-   return -1
-endi
-if $data60 != @21-03-25 10:03:17.680@ then 
-   return -1
-endi
-if $data61 != 14 then 
-   return -1
-endi
-
-sql select ts,add_one(f1) from tb1 where ts>="2021-03-23 17:00:00.000" and ts<="2021-03-24 20:00:00.000";
-if $rows != 6 then
-  return -1
-endi
-
-if $data00 != @21-03-23 17:17:19.660@ then 
-   return -1
-endi
-if $data01 != 2 then 
-   return -1
-endi
-if $data10 != @21-03-23 19:23:28.595@ then 
-   return -1
-endi
-if $data11 != 3 then 
-   return -1
-endi
-if $data20 != @21-03-23 19:33:39.070@ then 
-   return -1
-endi
-if $data21 != 4 then 
-   return -1
-endi
-if $data30 != @21-03-23 19:34:37.670@ then 
-   return -1
-endi
-if $data31 != 5 then 
-   return -1
-endi
-if $data40 != @21-03-24 19:08:06.609@ then 
-   return -1
-endi
-if $data41 != 6 then 
-   return -1
-endi
-if $data50 != @21-03-24 19:26:38.231@ then 
-   return -1
-endi
-if $data51 != 7 then 
-   return -1
-endi
-
-sql select sum_double(f1) from tb1 where ts>="2021-03-23 17:00:00.000" and ts<="2021-03-24 20:00:00.000" interval (1h);
-if $rows != 3 then
-  return -1
-endi
-
-if $data00 != @21-03-23 17:00:00.000@ then 
-   return -1
-endi
-if $data01 != 2 then 
-   return -1
-endi
-if $data10 != @21-03-23 19:00:00.000@ then 
-   return -1
-endi
-if $data11 != 18 then 
-   return -1
-endi
-if $data20 != @21-03-24 19:00:00.000@ then 
-   return -1
-endi
-if $data21 != 22 then 
-   return -1
-endi
-
-
-sql select sum_double(f1) from tb1 where ts>="2021-03-23 17:00:00.000" and ts<="2021-03-24 20:00:00.000" interval (1h) fill(value,999);
-if $rows != 28 then
-  return -1
-endi
-
-sql_error select add_one(f1) from tb1 group by f1;
-
-sql select sum_double(f1) from tb1 group by f1;
-if $rows != 7 then
-  return -1
-endi
-
-if $data00 != 2 then 
-   return -1
-endi
-if $data10 != 4 then 
-   return -1
-endi
-if $data20 != 6 then 
-   return -1
-endi
-if $data30 != 8 then 
-   return -1
-endi
-if $data40 != 10 then 
-   return -1
-endi
-if $data50 != 12 then 
-   return -1
-endi
-if $data60 != 14 then 
-   return -1
-endi
-
-sql select sum_double(f1) from tb1 interval (1h) order by ts desc;
-if $rows != 4 then
-  return -1
-endi
-
-if $data00 != @21-03-25 10:00:00.000@ then 
-   return -1
-endi
-if $data01 != 14 then 
-   return -1
-endi
-if $data10 != @21-03-24 19:00:00.000@ then 
-   return -1
-endi
-if $data11 != 22 then 
-   return -1
-endi
-if $data20 != @21-03-23 19:00:00.000@ then 
-   return -1
-endi
-if $data21 != 18 then 
-   return -1
-endi
-if $data30 != @21-03-23 17:00:00.000@ then 
-   return -1
-endi
-if $data31 != 2 then 
-   return -1
-endi
-
-
-sql select add_one(f1) from tb1 limit 2;
-if $rows != 2 then
-  return -1
-endi
-
-if $data00 != 2 then 
-   return -1
-endi
-if $data10 != 3 then 
-   return -1
-endi
-
-
-sql select sum_double(f1) from tb1 interval (1d) limit 2;
-if $rows != 2 then
-  return -1
-endi
-
-if $data00 != @21-03-23 00:00:00.000@ then 
-   return -1
-endi
-if $data01 != 20 then 
-   return -1
-endi
-if $data10 != @21-03-24 00:00:00.000@ then 
-   return -1
-endi
-if $data11 != 22 then 
-   return -1
-endi
-
-
-sql_error select ts,sum_double(f1),f1 from tb1;
-sql_error select add_one(f1),count(f1) from tb1;
-sql_error select sum_double(f1),count(f1) from tb1;
-sql_error select add_one(f1),top(f1,3) from tb1;
-sql_error select add_one(f1) from tb1 interval(10a);
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/system-test/fulltest.sh

@@ -62,7 +62,7 @@ python3 ./test.py -f 2-query/char_length.py -R
 python3 ./test.py -f 2-query/check_tsdb.py
 python3 ./test.py -f 2-query/check_tsdb.py -R
 
-python3 ./test.py -f 1-insert/update_data.py
+# jira python3 ./test.py -f 1-insert/update_data.py
 python3 ./test.py -f 1-insert/delete_data.py
 python3 ./test.py -f 2-query/db.py
 
@@ -151,7 +151,7 @@ python3 ./test.py -f 2-query/max_partition.py
 python3 ./test.py -f 2-query/last_row.py
 
 python3 ./test.py -f 6-cluster/5dnode1mnode.py
-python3 ./test.py -f 6-cluster/5dnode2mnode.py  -N 5 -M 3
+#python3 ./test.py -f 6-cluster/5dnode2mnode.py  -N 5 -M 3
 #python3 ./test.py -f 6-cluster/5dnode3mnodeStop.py -N 5 -M 3
 python3 ./test.py -f 6-cluster/5dnode3mnodeStopLoop.py -N 5 -M 3
 # BUG python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateDb.py -N 5 -M 3
@@ -215,8 +215,8 @@ python3 ./test.py -f 7-tmq/tmqUdf.py
 # python3 ./test.py -f 7-tmq/tmqUdf-multCtb-snapshot0.py
 # python3 ./test.py -f 7-tmq/tmqUdf-multCtb-snapshot1.py
 python3 ./test.py -f 7-tmq/stbTagFilter-1ctb.py
-# python3 ./test.py -f 7-tmq/stbTagFilter-multiCtb.py
 
+# python3 ./test.py -f 7-tmq/stbTagFilter-multiCtb.py
 
 #------------querPolicy  2-----------
 

tools/shell/src/shellEngine.c

@@ -685,7 +685,7 @@ int32_t shellHorizontalPrintResult(TAOS_RES *tres, const char *sql) {
 
   uint64_t resShowMaxNum = UINT64_MAX;
 
-  if (shell.args.commands == NULL && shell.args.file[0] == 0 && !shellIsLimitQuery(sql) && !shellIsShowQuery(sql)) {
+  if (shell.args.commands == NULL && shell.args.file[0] == 0 && !shellIsLimitQuery(sql)) {
     resShowMaxNum = SHELL_DEFAULT_RES_SHOW_NUM;
   }
 
@@ -706,8 +706,12 @@ int32_t shellHorizontalPrintResult(TAOS_RES *tres, const char *sql) {
     } else if (showMore) {
       printf("\r\n");
       printf(" Notice: The result shows only the first %d rows.\r\n", SHELL_DEFAULT_RES_SHOW_NUM);
-      printf("         You can use the `LIMIT` clause to get fewer result to show.\r\n");
-      printf("           Or use '>>' to redirect the whole set of the result to a specified file.\r\n");
+      if (shellIsShowQuery(sql)) {
+        printf("         You can use '>>' to redirect the whole set of the result to a specified file.\r\n");
+      } else {
+        printf("         You can use the `LIMIT` clause to get fewer result to show.\r\n");
+        printf("           Or use '>>' to redirect the whole set of the result to a specified file.\r\n");
+      }
       printf("\r\n");
       printf("         You can use Ctrl+C to stop the underway fetching.\r\n");
       printf("\r\n");

taos-tools @ 69b558cc

-Subproject commit f84cb6e51556d8030585128c2b252aa2a6453328
+Subproject commit 69b558ccbfe54a4407fe23eeae2e67c540f59e55