Merge branch 'feature/mwrite' of https://github.com/taosdata/TDengine into feature/mwrite

.travis.yml

@@ -6,6 +6,7 @@
 #
 matrix:
   - os: linux
+    dist: bionic
     language: c
 
     git:
@@ -61,7 +62,7 @@ matrix:
 
           grep 'start to execute\|ERROR SUMMARY' mem-error-out.txt|grep -v 'grep'|uniq|tee uniq-mem-error-out.txt
 
-          for memError in `cat uniq-mem-error-out.txt | awk '{print $4}'` 
+          for memError in `grep 'ERROR SUMMARY' uniq-mem-error-out.txt | awk '{print $4}'` 
           do
             if [ -n "$memError" ]; then
               if [ "$memError" -gt 12 ]; then
@@ -73,7 +74,7 @@ matrix:
           done
 
           grep 'start to execute\|definitely lost:' mem-error-out.txt|grep -v 'grep'|uniq|tee uniq-definitely-lost-out.txt
-          for defiMemError in `cat uniq-definitely-lost-out.txt | awk '{print $7}'`
+          for defiMemError in `grep 'definitely lost:' uniq-definitely-lost-out.txt | awk '{print $7}'`
           do
             if [ -n "$defiMemError" ]; then
               if [ "$defiMemError" -gt 13 ]; then

tests/pytest/dbmgmt/database-name-boundary.py

@@ -33,7 +33,7 @@ class TDTestCase:
 
         getDbNameLen = "grep -w '#define TSDB_DB_NAME_LEN' ../../src/inc/taosdef.h|awk '{print $3}'"
         dbNameMaxLen = int(subprocess.check_output(getDbNameLen, shell=True))
-        tdLog.notice("DB name max length is %d" % dbNameMaxLen)
+        tdLog.info("DB name max length is %d" % dbNameMaxLen)
 
         tdLog.info("=============== step1")
         db_name = ''.join(random.choices(chars, k=(dbNameMaxLen + 1)))

tests/pytest/table/column_num.py

 # -*- coding: utf-8 -*-
 
 import sys
+import subprocess
 from util.log import *
 from util.cases import *
 from util.sql import *
@@ -14,127 +15,71 @@ class TDTestCase:
     def run(self):
         tdSql.prepare()
 
-        # TSIM: system sh/stop_dnodes.sh
-        # TSIM:
-        # TSIM: system sh/ip.sh -i 1 -s up
-        # TSIM: system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
-        # TSIM: system sh/exec.sh -n dnode1 -s start
-        # TSIM:
-        # TSIM: sleep 3000
-        # TSIM: sql connect
-        # TSIM:
-        # TSIM: $i = 0
-        # TSIM: $dbPrefix = lm_cn_db
-        # TSIM: $tbPrefix = lm_cn_tb
-        # TSIM: $db = $dbPrefix . $i
-        # TSIM: $tb = $tbPrefix . $i
-        # TSIM:
-        # TSIM: print =============== step1
         tdLog.info('=============== step1')
-        # TSIM: sql create database $db
-        # TSIM: sql use $db
-        # TSIM:
-        # TSIM: sql create table $tb() -x step1
         tdLog.info('create table tb() -x step1')
         tdSql.error('create table tb()')
-        # TSIM: return -1
-        # TSIM: step1:
-        # TSIM:
-        # TSIM: sql show tables
         tdLog.info('show tables')
         tdSql.query('show tables')
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
-        # TSIM: return -1
-        # TSIM: endi
-        # TSIM:
-        # TSIM: print =============== step2
         tdLog.info('=============== step2')
         # TSIM: sql create table $tb (ts timestamp)  -x step2
         tdLog.info('create table tb (ts timestamp)  -x step2')
         tdSql.error('create table tb (ts timestamp) ')
-        # TSIM: return -1
-        # TSIM: step2:
-        # TSIM:
-        # TSIM: sql show tables
         tdLog.info('show tables')
         tdSql.query('show tables')
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
-        # TSIM: return -1
-        # TSIM: endi
-        # TSIM:
-        # TSIM: print =============== step3
         tdLog.info('=============== step3')
-        # TSIM: sql create table $tb (ts int)  -x step3
         tdLog.info('create table tb (ts int)  -x step3')
         tdSql.error('create table tb (ts int) ')
-        # TSIM: return -1
-        # TSIM: step3:
-        # TSIM:
-        # TSIM: sql show tables
         tdLog.info('show tables')
         tdSql.query('show tables')
-        # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
-        # TSIM: return -1
-        # TSIM: endi
-        # TSIM:
-        # TSIM: print =============== step4
         tdLog.info('=============== step4')
-        # TSIM: sql create table $tb (ts timestamp, a1 int, a2 int, a3 int, a4
-        # int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12
-        # int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int,
-        # a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27
-        # int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int,
-        # b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12
-        # int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int,
-        # b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27
-        # int, b28 int,b29 int,b30 int,b31 int,b32 int)
         tdLog.info('create table tb (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12 int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int, b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27 int, b28 int,b29 int,b30 int,b31 int,b32 int)')
         tdSql.execute('create table tb (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12 int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int, b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27 int, b28 int,b29 int,b30 int,b31 int,b32 int)')
         # TSIM:
         # TSIM: sql show tables
         tdLog.info('show tables')
         tdSql.query('show tables')
-        # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
-        # TSIM: return -1
-        # TSIM: endi
-        # TSIM:
-        # TSIM: print =============== step5
+
         tdLog.info('=============== step5')
-        # TSIM: $i = 1
-        # TSIM: $tb = $tbPrefix . $i
-        # TSIM:
-        # TSIM: sql create table $tb (ts timestamp, a1 int, a2 int, a3 int, a4
-        # int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12
-        # int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int,
-        # a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27
-        # int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int,
-        # b4 int, b5 int)
-        tdLog.info('create table tb1 (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int)')
-        tdSql.execute('create table tb1 (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int)')
-        # TSIM:
-        # TSIM: sql show tables
+
+        getMaxColumnNum = "grep -w '#define TSDB_MAX_COLUMNS' ../../src/inc/taosdef.h|awk '{print $3}'"
+        boundary = int(subprocess.check_output(getMaxColumnNum, shell=True))
+        tdLog.info("get max column number is %d" % boundary)
+
+        columnSeq = "ts timestamp"
+        for x in range(0, boundary):
+            columnSeq = columnSeq + ", col%d int" % x
+
+        tdLog.info("create table tb1 (%s)" % columnSeq)
+        tdSql.error('create table tb1 (%s)' % columnSeq)
+
+        columnSeq = "ts timestamp"
+        for x in range(0, boundary - 1):
+            columnSeq = columnSeq + ", col%d int" % x
+
+        tdLog.info("create table tb1 (%s)" % columnSeq)
+        tdSql.execute('create table tb1 (%s)' % columnSeq)
+
         tdLog.info('show tables')
         tdSql.query('show tables')
         # TSIM: if $rows != 2 then
         tdLog.info('tdSql.checkRow(2)')
         tdSql.checkRows(2)
-        # TSIM: return -1
-        # TSIM: endi
-        # TSIM:
-        # TSIM: sql insert into $tb values (now, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8
-        # , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 , 19 , 20 , 21 , 22
-        # , 23 , 24 , 25 ,26 , 27 ,28 ,29,30,31, 32, 33, 34, 35, 36, 37)
-        tdLog.info("insert into tb1 values (now, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 ,26 , 27 ,28 ,29,30,31, 32, 33, 34, 35, 36, 37)")
-        tdSql.execute("insert into tb1 values (now, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 ,26 , 27 ,28 ,29,30,31, 32, 33, 34, 35, 36, 37)")
+
+        data = "now"
+        for x in range(0, boundary-1):
+            data = data + ", %d" % x
+        tdLog.info("insert into tb1 values (%s)" % data)
+        tdSql.execute("insert into tb1 values (%s)" % data)
         # TSIM: sql select * from $tb
         tdLog.info('select * from tb1')
         tdSql.query('select * from tb1')

tests/pytest/tag_lite/create-tags-boundary.py

@@ -28,7 +28,7 @@ class TDTestCase:
 
         getMaxTagNum = "grep -w TSDB_MAX_TAGS ../../src/inc/taosdef.h|awk '{print $3}'"
         boundary = int(subprocess.check_output(getMaxTagNum, shell=True))
-        tdLog.notice("get max tags number is %d" % boundary)
+        tdLog.info("get max tags number is %d" % boundary)
         for x in range(0, boundary):
             stb_name = "stb%d" % x
 

tests/pytest/util/dnodes.py

@@ -244,11 +244,8 @@ class TDDnode:
                 time.sleep(1)
                 processID = subprocess.check_output(psCmd, shell=True)
 
+            self.running = 0
             tdLog.debug("dnode:%d is stopped by kill -INT" % (self.index))
-            tdLog.debug(
-                "wait 2 seconds for the dnode:%d to stop." %
-                (self.index))
-            time.sleep(2)
 
     def forcestop(self):
         if self.valgrind == 0:
@@ -267,11 +264,8 @@ class TDDnode:
                 time.sleep(1)
                 processID = subprocess.check_output(psCmd, shell=True)
 
+            self.running = 0
             tdLog.debug("dnode:%d is stopped by kill -KILL" % (self.index))
-            tdLog.debug(
-                "wait 2 seconds for the dnode:%d to stop." %
-                (self.index))
-            time.sleep(2)
 
     def startIP(self):
         cmd = "sudo ifconfig lo:%d 192.168.0.%d up" % (self.index, self.index)