Merge branch '3.0' into feat/TD-30053-3.0

source/dnode/vnode/src/tsdb/tsdbReadUtil.h

@@ -47,10 +47,8 @@ extern "C" {
       }                                                                    \
     } else {                                                               \
       (_pKey)->ts = (_pRow)->pBlockData->aTSKEY[(_pRow)->iRow];            \
-      if ((_pRow)->pBlockData->nColData > 0) {                             \
       tColRowGetPrimaryKey((_pRow)->pBlockData, (_pRow)->iRow, (_pKey));   \
     }                                                                      \
-    }                                                                      \
   }
 
 typedef enum {

source/libs/executor/src/sysscanoperator.c

@@ -1651,6 +1651,8 @@ static SSDataBlock* doSysTableScan(SOperatorInfo* pOperator) {
   SSysTableScanInfo* pInfo = pOperator->info;
   char               dbName[TSDB_DB_NAME_LEN] = {0};
 
+  while (1) {
+
     if (isTaskKilled(pOperator->pTaskInfo)) {
       setOperatorCompleted(pOperator);
       return NULL;
@@ -1692,10 +1694,14 @@ static SSDataBlock* doSysTableScan(SOperatorInfo* pOperator) {
         setOperatorCompleted(pOperator);
       }
 
-    return pBlock->info.rows > 0 ? pBlock : NULL;
+      if (pBlock->info.rows == 0) {
+        continue;
+      }
+      return pBlock;
     } else {
       return NULL;
     }
+  }
 }
 
 static void sysTableScanFillTbName(SOperatorInfo* pOperator, const SSysTableScanInfo* pInfo, const char* name,

tests/army/community/insert/insert_basic.py

@@ -0,0 +1,86 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import time
+import random
+
+import taos
+import frame
+import frame.etool
+
+
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+
+
+class TDTestCase(TBase):
+
+    def checkGeometry(self):
+        tdLog.info(f"check geometry")
+
+        tdSql.execute("create database db_geometry;")
+        tdSql.execute("use db_geometry;")
+        tdSql.execute("create table t_ge (ts timestamp, id int, c1 GEOMETRY(512));")
+        tdSql.execute("insert into t_ge values(now, 1, 'MULTIPOINT ((0 0), (1 1))');")
+        tdSql.execute("insert into t_ge values(now, 1, 'MULTIPOINT (0 0, 1 1)');")
+        tdSql.execute("insert into t_ge values(now, 2, 'POINT (0 0)');")
+        tdSql.execute("insert into t_ge values(now, 2, 'POINT EMPTY');")
+        tdSql.execute("insert into t_ge values(now, 3, 'LINESTRING (0 0, 0 1, 1 2)');")
+        tdSql.execute("insert into t_ge values(now, 3, 'LINESTRING EMPTY');")
+        tdSql.execute("insert into t_ge values(now, 4, 'POLYGON ((0 0, 1 0, 1 1, 0 1, 0 0))');")
+        tdSql.execute("insert into t_ge values(now, 4, 'POLYGON ((0 0, 4 0, 4 4, 0 4, 0 0), (1 1, 1 2, 2 2, 2 1, 1 1))');")
+        tdSql.execute("insert into t_ge values(now, 4, 'POLYGON EMPTY');")
+        tdSql.execute("insert into t_ge values(now, 5, 'MULTILINESTRING ((0 0, 1 1), (2 2, 3 3))');")
+        tdSql.execute("insert into t_ge values(now, 6, 'MULTIPOLYGON (((1 1, 1 3, 3 3, 3 1, 1 1)), ((4 3, 6 3, 6 1, 4 1, 4 3)))');")
+        tdSql.execute("insert into t_ge values(now, 7, 'GEOMETRYCOLLECTION (MULTIPOINT((0 0), (1 1)), POINT(3 4), LINESTRING(2 3, 3 4))');")
+        tdSql.query("select * from t_ge;")
+        tdSql.checkRows(12)
+        tdSql.query("select * from t_ge where id=1;")
+        tdSql.checkRows(2)
+        tdSql.query("select * from t_ge where id=2;")
+        tdSql.checkRows(2)
+        tdSql.query("select * from t_ge where id=3;")
+        tdSql.checkRows(2)
+        tdSql.query("select * from t_ge where id=4;")
+        tdSql.checkRows(3)
+        tdSql.query("select * from t_ge where id=5;")
+        tdSql.checkRows(1)
+        tdSql.query("select * from t_ge where id=6;")
+        tdSql.checkRows(1)
+        tdSql.query("select * from t_ge where id=7;")
+        tdSql.checkRows(1)
+
+    def checkDataType(self):
+        tdLog.info(f"check datatype")
+
+        self.checkGeometry()
+
+
+
+    # run
+    def run(self):
+        tdLog.debug(f"start to excute {__file__}")
+
+        # check insert datatype
+        self.checkDataType()
+
+        tdLog.success(f"{__file__} successfully executed")
+
+
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())

tests/parallel_test/cases.task

@@ -20,6 +20,7 @@
 ,,y,army,./pytest.sh python3 ./test.py -f community/query/fill/fill_desc.py -N 3 -L 3 -D 2
 ,,y,army,./pytest.sh python3 ./test.py -f community/cluster/incSnapshot.py -N 3
 ,,y,army,./pytest.sh python3 ./test.py -f community/query/query_basic.py -N 3
+,,y,army,./pytest.sh python3 ./test.py -f community/insert/insert_basic.py -N 3
 ,,y,army,./pytest.sh python3 ./test.py -f community/cluster/splitVgroupByLearner.py -N 3
 ,,n,army,python3 ./test.py -f community/cmdline/fullopt.py
 ,,n,army,python3 ./test.py -f community/query/show.py -N 3

tests/script/tsim/query/sys_tbname.sim

@@ -135,4 +135,177 @@ endi
 print =========================== td-24781
 sql select DISTINCT (`precision`) from `information_schema`.`ins_databases` PARTITION BY `precision`
 
+print =========================ins_stables
+
+print create database test vgroups 4;
+sql create database test vgroups 4;
+sql use test;
+sql create stable st1(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st2(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st3(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st4(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st5(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st6(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st7(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st8(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st9(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st10(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st11(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st12(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st13(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st14(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st15(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st16(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st17(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st18(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st19(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st20(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st21(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st22(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st23(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st24(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st25(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st26(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st27(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st28(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st29(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st30(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st31(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st32(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st33(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st34(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st35(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st36(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st37(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st38(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st39(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st40(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st41(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st42(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st43(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st44(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st45(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st46(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st47(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st48(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st49(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st50(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st51(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st52(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st53(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st54(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st55(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st56(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st57(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st58(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st59(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st60(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st61(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st62(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st63(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st64(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st65(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st66(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st67(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st68(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st69(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st70(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+
+print create database test1 vgroups 4;
+sql create database test1 vgroups 4;
+sql use test1;
+
+sql create stable st1(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st2(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st3(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st4(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st5(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st6(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st7(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st8(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st9(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st10(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st11(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st12(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st13(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st14(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st15(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st16(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st17(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st18(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st19(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st20(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st21(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st22(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st23(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st24(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st25(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st26(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st27(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st28(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st29(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st30(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st31(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st32(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st33(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st34(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st35(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st36(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st37(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st38(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st39(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st40(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st41(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st42(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st43(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st44(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st45(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st46(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st47(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st48(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st49(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st50(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st51(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st52(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st53(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st54(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st55(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st56(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st57(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st58(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st59(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st60(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st61(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st62(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st63(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st64(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st65(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st66(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st67(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st68(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st69(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create stable st70(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+
+sleep 1000
+
+sql select * from information_schema.ins_stables where db_name = "test" limit 68,32;
+
+print $data00 $data01 $data02 $data03
+print $data10 $data11 $data12 $data13
+print $data20 $data21 $data22 $data23
+
+if $rows != 2 then
+  return -1
+endi
+
+sql select * from information_schema.ins_stables where db_name = "test1" limit 68,32;
+
+print $data00 $data01 $data02 $data03
+print $data10 $data11 $data12 $data13
+print $data20 $data21 $data22 $data23
+
+if $rows != 2 then
+  return -1
+endi
+
 #system sh/exec.sh -n dnode1 -s stop -x SIGINT