Merge branch 'develop' into feature/TD-1413

Jenkinsfile

@@ -9,7 +9,7 @@ pipeline {
       stage('Parallel test stage') {
       parallel {
         stage('pytest') {
-          agent{label 'master'}
+          agent{label '184'}
           steps {
             sh '''
             date
@@ -34,7 +34,7 @@ pipeline {
           }
         }
         stage('test_b1') {
-          agent{label '184'}
+          agent{label 'master'}
           steps {
             sh '''
             cd ${WKC}

tests/pytest/insert/insertIntoTwoTables.py

@@ -39,7 +39,7 @@ class TDTestCase:
 
         tdSql.query("select * from t0")
         tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 1)
+        tdSql.checkData(0, 1, 1)
 
         tdSql.query("select * from t1")
         tdSql.checkRows(5)

tests/pytest/tag_lite/datatype.py

@@ -103,7 +103,7 @@ class TDTestCase:
         tdSql.execute('alter table stb add tag tnc nchar(10)')
         for tid in range(1, self.ntables + 1):
             tdSql.execute('alter table tb%d set tag tnc=\"%s\"' %
-                          (tid, str(tid * 1.2)))
+                          (tid, str(tid + 1000000000)))
         tdLog.info("insert %d data in to each %d tables" % (2, self.ntables))
         for rid in range(self.rowsPerTable + 1, self.rowsPerTable + 3):
             sqlcmd = ['insert into']

tests/script/general/insert/insert_drop.sim

@@ -52,10 +52,10 @@ sleep 1000
 
 sql use $db
 sql drop table tb5
-
+$i = 0
 while $i < 4
-  $tbId = $i + $halfNum
-  $tb = $tbPrefix . $i
+  
+  $tb = tb . $i
   $x = 0
   while $x < $rowNum
     $xs = $x * $delta