change all files.

tests/pytest/fulltest.sh

@@ -9,6 +9,11 @@ python3 ./test.py $1 -f insert/smallint.py
 python3 ./test.py $1 -f insert/tinyint.py
 python3 ./test.py $1 -f insert/date.py
 python3 ./test.py $1 -f insert/binary.py
+
+python3 ./test.py $1 -f table/column_name.py
+python3 ./test.py $1 -f table/column_num.py
+python3 ./test.py $1 -f table/db_table.py
+
 python3 ./test.py $1 -f import_merge/importBlock1HO.py
 python3 ./test.py $1 -f import_merge/importBlock1HPO.py
 python3 ./test.py $1 -f import_merge/importBlock1H.py

tests/pytest/import_merge/importDataH2.py

@@ -27,7 +27,7 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdDnodes.stop(1)
         tdDnodes.deploy(1)
@@ -35,7 +35,7 @@ class TDTestCase:
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")
@@ -43,19 +43,19 @@ class TDTestCase:
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
             "More than 10 rows less than %d rows will go to data file" %
-            self.rows)
+            self.maxrows)
 
         tdLog.info("================= step2")
-        tdLog.info("import %d sequential data" % (self.rows / 2))
+        tdLog.info("import %d sequential data" % (self.maxrows / 2))
         startTime = self.startTime
         sqlcmd = ['import into tb1 values']
-        for rid in range(1, self.rows / 2 + 1):
+        for rid in range(1, self.maxrows / 2 + 1):
             sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
         tdSql.execute(" ".join(sqlcmd))
 
         tdLog.info("================= step3")
         tdSql.query('select * from tb1')
-        tdSql.checkRows(self.rows / 2)
+        tdSql.checkRows(self.maxrows / 2)
 
         tdLog.info("================= step4")
         tdDnodes.stop(1)
@@ -70,7 +70,7 @@ class TDTestCase:
         tdLog.info("================= step7")
         tdSql.execute('reset query cache')
         tdSql.query('select * from tb1 order by ts desc')
-        tdSql.checkRows(self.rows / 2 + 1)
+        tdSql.checkRows(self.maxrows / 2 + 1)
 
         tdLog.info("================= step8")
         tdLog.info("import 10 data in batch before")
@@ -83,7 +83,7 @@ class TDTestCase:
         tdLog.info("================= step9")
         tdSql.execute('reset query cache')
         tdSql.query('select * from tb1 order by ts desc')
-        tdSql.checkRows(self.rows / 2 + 11)
+        tdSql.checkRows(self.maxrows / 2 + 11)
 
     def stop(self):
         tdSql.close()

tests/pytest/import_merge/importDataHO.py

@@ -27,7 +27,7 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxwrows = 200
         self.rowsPerTable = 20
 
         tdDnodes.stop(1)
@@ -36,7 +36,7 @@ class TDTestCase:
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")
@@ -44,7 +44,7 @@ class TDTestCase:
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
             "More than 10 rows less than %d rows will go to data file" %
-            self.rows)
+            self.maxrows)
 
         tdLog.info("================= step2")
         tdLog.info("import %d sequential data" % self.rowsPerTable)

tests/pytest/import_merge/importDataHO2.py

@@ -27,7 +27,7 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
         self.rowsPerTable = 100
 
         tdDnodes.stop(1)
@@ -36,7 +36,7 @@ class TDTestCase:
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")
@@ -44,7 +44,7 @@ class TDTestCase:
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
             "More than 10 rows less than %d rows will go to data file" %
-            self.rows)
+            self.maxrows)
 
         tdLog.info("================= step2")
         tdLog.info("import %d sequential data" % self.rowsPerTable)

tests/pytest/import_merge/importDataHPO.py

@@ -27,7 +27,7 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
         self.rowsPerTable = 20
 
         tdDnodes.stop(1)
@@ -36,7 +36,7 @@ class TDTestCase:
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")
@@ -44,7 +44,7 @@ class TDTestCase:
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
             "More than 10 rows less than %d rows will go to data file" %
-            self.rows)
+            self.maxrows)
 
         tdLog.info("================= step2")
         tdLog.info("import %d sequential data" % self.rowsPerTable)

tests/pytest/import_merge/importDataLastH.py

@@ -27,7 +27,7 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdDnodes.stop(1)
         tdDnodes.deploy(1)
@@ -35,7 +35,7 @@ class TDTestCase:
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")
@@ -43,7 +43,7 @@ class TDTestCase:
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
             "More than %d rows less than %d rows will go to data and last file" %
-            (self.rows, 10 + self.rows))
+            (self.maxrows, 10 + self.maxrows))
 
         tdLog.info("================= step2")
         tdLog.info("import 205 sequential data")

tests/pytest/import_merge/importDataLastHO.py

@@ -27,7 +27,7 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdDnodes.stop(1)
         tdDnodes.deploy(1)
@@ -35,7 +35,7 @@ class TDTestCase:
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")
@@ -43,7 +43,7 @@ class TDTestCase:
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
             "More than %d rows less than %d rows will go to data and last file" %
-            (self.rows, 10 + self.rows))
+            (self.maxrows, 10 + self.maxrows))
 
         tdLog.info("================= step2")
         tdLog.info("import 205 sequential data")

tests/pytest/import_merge/importDataLastHPO.py

@@ -27,7 +27,7 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdDnodes.stop(1)
         tdDnodes.deploy(1)
@@ -35,7 +35,7 @@ class TDTestCase:
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")
@@ -43,7 +43,7 @@ class TDTestCase:
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
             "More than %d rows less than %d rows will go to data and last file" %
-            (self.rows, 10 + self.rows))
+            (self.maxrows, 10 + self.maxrows))
 
         tdLog.info("================= step2")
         tdLog.info("import 205 sequential data")

tests/pytest/import_merge/importDataLastS.py

@@ -27,7 +27,7 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdDnodes.stop(1)
         tdDnodes.deploy(1)
@@ -35,7 +35,7 @@ class TDTestCase:
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")
@@ -43,7 +43,7 @@ class TDTestCase:
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
             "More than %d rows less than %d rows will go to data and last file" %
-            (self.rows, 10 + self.rows))
+            (self.maxrows, 10 + self.maxrows))
 
         tdLog.info("================= step2")
         tdLog.info("import 205 sequential data")

tests/pytest/import_merge/importDataLastSub.py

@@ -27,7 +27,7 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdDnodes.stop(1)
         tdDnodes.deploy(1)
@@ -35,7 +35,7 @@ class TDTestCase:
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")
@@ -43,7 +43,7 @@ class TDTestCase:
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
             "More than %d rows less than %d rows will go to data and last file" %
-            (self.rows, 10 + self.rows))
+            (self.maxrows, 10 + self.maxrows))
 
         tdLog.info("================= step2")
         tdLog.info("import 205 sequential data")

tests/pytest/import_merge/importDataLastT.py

@@ -27,11 +27,11 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")
@@ -39,7 +39,7 @@ class TDTestCase:
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
             "More than %d rows less than %d rows will go to data and last file" %
-            (self.rows, 10 + self.rows))
+            (self.maxrows, 10 + self.maxrows))
 
         tdLog.info("================= step2")
         tdLog.info("import 205 sequential data")

tests/pytest/import_merge/importDataLastTO.py

@@ -27,11 +27,11 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")
@@ -39,7 +39,7 @@ class TDTestCase:
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
             "More than %d rows less than %d rows will go to data and last file" %
-            (self.rows, 10 + self.rows))
+            (self.maxrows, 10 + self.maxrows))
 
         tdLog.info("================= step2")
         tdLog.info("import 205 sequential data")

tests/pytest/import_merge/importDataLastTPO.py

@@ -27,11 +27,11 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")
@@ -39,7 +39,7 @@ class TDTestCase:
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
             "More than %d rows less than %d rows will go to data and last file" %
-            (self.rows, 10 + self.rows))
+            (self.maxrows, 10 + self.maxrows))
 
         tdLog.info("================= step2")
         tdLog.info("import 205 sequential data")

tests/pytest/import_merge/importDataS.py

@@ -27,11 +27,11 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")
@@ -39,7 +39,7 @@ class TDTestCase:
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
             "More than 10 rows less than %d rows will go to data file" %
-            self.rows)
+            self.maxrows)
 
         tdLog.info("================= step2")
         tdLog.info("import 20 sequential data")

tests/pytest/import_merge/importDataSub.py

@@ -27,7 +27,7 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdDnodes.stop(1)
         tdDnodes.deploy(1)
@@ -35,7 +35,7 @@ class TDTestCase:
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")
@@ -43,19 +43,19 @@ class TDTestCase:
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
             "More than 10 rows less than %d rows will go to data file" %
-            self.rows)
+            self.maxrows)
 
         tdLog.info("================= step2")
-        tdLog.info("import %d sequential data" % (self.rows / 2))
+        tdLog.info("import %d sequential data" % (self.maxrows / 2))
         startTime = self.startTime
         sqlcmd = ['import into tb1 values']
-        for rid in range(1, self.rows / 2 + 1):
+        for rid in range(1, self.maxrows / 2 + 1):
             sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
         tdSql.execute(" ".join(sqlcmd))
 
         tdLog.info("================= step3")
         tdSql.query('select * from tb1')
-        tdSql.checkRows(self.rows / 2)
+        tdSql.checkRows(self.maxrows / 2)
 
         tdLog.info("================= step4")
         tdDnodes.stop(1)
@@ -73,7 +73,7 @@ class TDTestCase:
         tdLog.info("================= step9")
         tdSql.execute('reset query cache')
         tdSql.query('select * from tb1 order by ts desc')
-        tdSql.checkRows(self.rows / 2)
+        tdSql.checkRows(self.maxrows / 2)
 
     def stop(self):
         tdSql.close()

tests/pytest/import_merge/importDataT.py

@@ -38,7 +38,7 @@ class TDTestCase:
         tdLog.info("create 1 table")
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
-            "More than 10 rows less than %d maxrows will go to data file" %
+            "More than 10 rows less than %d rows will go to data file" %
             self.maxrows)
 
         tdLog.info("================= step2")

tests/pytest/import_merge/importDataTO.py

@@ -27,11 +27,11 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")
@@ -39,7 +39,7 @@ class TDTestCase:
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
             "More than 10 rows less than %d rows will go to data file" %
-            self.rows)
+            self.maxrows)
 
         tdLog.info("================= step2")
         tdLog.info("import 20 sequential data")

tests/pytest/import_merge/importDataTPO.py

@@ -27,11 +27,11 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")
@@ -39,7 +39,7 @@ class TDTestCase:
         tdSql.execute('create table tb1 (ts timestamp, speed int)')
         tdLog.info(
             "More than 10 rows less than %d rows will go to data file" %
-            self.rows)
+            self.maxrows)
 
         tdLog.info("================= step2")
         tdLog.info("import 20 sequential data")

tests/pytest/import_merge/importLastH.py

@@ -27,11 +27,11 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")

tests/pytest/import_merge/importLastHO.py

@@ -27,11 +27,11 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")

tests/pytest/import_merge/importLastHPO.py

@@ -27,11 +27,11 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")

tests/pytest/import_merge/importLastS.py

@@ -27,11 +27,11 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")

tests/pytest/import_merge/importLastSub.py

@@ -27,11 +27,11 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")

tests/pytest/import_merge/importLastT.py

@@ -27,7 +27,7 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdDnodes.stop(1)
         tdDnodes.deploy(1)
@@ -35,7 +35,7 @@ class TDTestCase:
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")

tests/pytest/import_merge/importLastTO.py

@@ -27,7 +27,7 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdDnodes.stop(1)
         tdDnodes.deploy(1)
@@ -35,7 +35,7 @@ class TDTestCase:
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")

tests/pytest/import_merge/importLastTPO.py

@@ -27,7 +27,7 @@ class TDTestCase:
     def run(self):
         self.ntables = 1
         self.startTime = 1520000010000
-        self.rows = 200
+        self.maxrows = 200
 
         tdDnodes.stop(1)
         tdDnodes.deploy(1)
@@ -35,7 +35,7 @@ class TDTestCase:
 
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
         tdSql.execute('use db')
 
         tdLog.info("================= step1")

tests/pytest/smoketest.sh

@@ -34,12 +34,12 @@ python3 ./test.py $1 -f table/db_table.py
 python3 ./test.py -s $1
 sleep 1
 
-#python3 ./test.py $1 -f import_merge/importDataLastTO.py 
-#python3 ./test.py -s $1
-#sleep 1
-#python3 ./test.py $1 -f import_merge/importDataLastT.py 
-#python3 ./test.py -s $1
-#sleep 1
+python3 ./test.py $1 -f import_merge/importDataLastTO.py 
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importDataLastT.py 
+python3 ./test.py -s $1
+sleep 1
 python3 ./test.py $1 -f import_merge/importDataTO.py 
 python3 ./test.py -s $1
 sleep 1