Merge remote-tracking branch 'origin/develop' into feature/d8

src/kit/taosdemo/src/demoJsonOpt.c

@@ -854,6 +854,7 @@ int getMetaFromInsertJsonFile(cJSON *root) {
                     g_Dbs.db[i].superTbls[j].iface = STMT_IFACE;
                 } else if (0 == strcasecmp(stbIface->valuestring, "sml")) {
                     g_Dbs.db[i].superTbls[j].iface = SML_IFACE;
+                    g_args.iface = SML_IFACE;
                 } else {
                     errorPrint(
                         "failed to read json, insert_mode %s not recognized\n",

src/kit/taosdemo/src/demoUtil.c

@@ -204,13 +204,14 @@ int getChildNameOfSuperTableWithLimitAndOffset(TAOS *taos, char *dbName,
     int64_t   childTblCount = (limit < 0) ? DEFAULT_CHILDTABLES : limit;
     int64_t   count = 0;
     char *    childTblName = *childTblNameOfSuperTbl;
-    char *    pTblName = childTblName;
+
     if (childTblName == NULL) {
         childTblName = (char *)calloc(1, childTblCount * TSDB_TABLE_NAME_LEN);
         if (childTblName == NULL) {
             errorPrint("%s", "failed to allocate memory\n");
         }
     }
+    char *pTblName = childTblName;
 
     snprintf(limitBuf, 100, " limit %" PRId64 " offset %" PRIu64 "", limit,
              offset);

src/query/src/qFilter.c

@@ -2354,7 +2354,6 @@ int32_t filterMergeGroups(SFilterInfo *info, SFilterGroupCtx** gRes, int32_t *gR
     }
     
     cStart = i;
-    cEnd = i;
     cColNum = gRes[i]->colNum;    
   }
 

tests/pytest/insert/basic.py

@@ -45,6 +45,11 @@ class TDTestCase:
 
         # test case for https://jira.taosdata.com:18080/browse/TD-3716:
         tdSql.error("insert into tb(now, 1)")
+        # test case for TD-10717
+        tdSql.error("insert into tb values(now,1),,(now+1s,1)")
+        tdSql.execute("insert into tb values(now+2s,1),(now+3s,1),(now+4s,1)")
+        tdSql.query("select * from tb")
+        tdSql.checkRows(insertRows + 4 +3)
 
     def stop(self):
         tdSql.close()

tests/pytest/query/query.py

@@ -31,13 +31,42 @@ class TDTestCase:
         tdSql.execute("create database bug6387 ")
         tdSql.execute("use bug6387 ")
         tdSql.execute("create table test(ts timestamp, c1 int) tags(t1 int)")
+        prefix = "insert into "
+        sql = ""
         for i in range(5000):
-            sql = "insert into t%d using test tags(1) values " % i
+            temp = "t%d using test tags(1) values " % i
             for j in range(21):
-                sql = sql + "(now+%ds,%d)" % (j ,j )
-            tdSql.execute(sql)
+                temp = temp + "(now+%ds,%d)" % (j ,j )
+            sql = sql + temp
+            if i % 1000 == 0 :
+                tdSql.execute(prefix + sql)
+                sql = ""
         tdSql.query("select count(*) from test interval(1s) group by tbname")
         tdSql.checkData(0,1,1)
+    
+    def escape_ascii(self):
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+        tdSql.execute("create table car (ts timestamp, s int) tags(j int)")
+        for i in range(32,127):
+            if i == 96 : continue    #`
+            sql = 'create table `是否出现%s` using car tags(%d)' % (chr(i), i)
+            tdSql.execute(sql)
+        for i in range(32,65):
+            sql = 'select tbname from car where tbname like "是否出现\%s"' % chr(i)
+            tdSql.query(sql)
+            if i == 37 : continue  # " `
+            tdSql.checkRows(1)
+        for i in range(91,97):
+            sql = 'select tbname from car where tbname like "是否出现\%s"' % chr(i)
+            tdSql.query(sql)
+            if i == 96: continue  #  `
+            tdSql.checkRows(1)
+        for i in range(123,127):
+            sql = 'select tbname from car where tbname like "是否出现\%s"' % chr(i)
+            tdSql.query(sql)
+            tdSql.checkRows(1)
 
     def run(self):
         tdSql.prepare()
@@ -165,6 +194,10 @@ class TDTestCase:
         tdSql.query("show create table t1")        
         tdSql.checkRows(1)
 
+        #TS-636
+        tdLog.info("case for TS-636")
+        self.escape_ascii()
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)