Merge branch 'develop' into enhance/TD-6645

packaging/docker/dockerManifest.sh

@@ -45,6 +45,7 @@ echo "version=${version}"
 #docker manifest rm tdengine/tdengine:${version}
 if [ "$verType" == "beta" ]; then
   docker manifest inspect  tdengine/tdengine-beta:latest
+  docker manifest create -a tdengine/tdengine-beta:latest tdengine/tdengine-amd64-beta:latest tdengine/tdengine-aarch64-beta:latest tdengine/tdengine-aarch32-beta:latest
   docker manifest rm tdengine/tdengine-beta:latest
   docker manifest create -a tdengine/tdengine-beta:${version} tdengine/tdengine-amd64-beta:${version} tdengine/tdengine-aarch64-beta:${version} tdengine/tdengine-aarch32-beta:${version}
   docker manifest create -a tdengine/tdengine-beta:latest tdengine/tdengine-amd64-beta:latest tdengine/tdengine-aarch64-beta:latest tdengine/tdengine-aarch32-beta:latest
@@ -54,6 +55,7 @@ if [ "$verType" == "beta" ]; then
 
 elif [ "$verType" == "stable" ]; then
   docker manifest inspect  tdengine/tdengine:latest 
+  docker manifest create -a tdengine/tdengine:latest tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest
   docker manifest rm tdengine/tdengine:latest
   docker manifest create -a tdengine/tdengine:${version} tdengine/tdengine-amd64:${version} tdengine/tdengine-aarch64:${version} tdengine/tdengine-aarch32:${version}
   docker manifest create -a tdengine/tdengine:latest tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest

src/client/src/tscSQLParser.c

@@ -4399,7 +4399,16 @@ static int32_t validateMatchExpr(tSqlExpr* pExpr, STableMeta* pTableMeta, int32_
     regex_t regex;
     char    regErrBuf[256] = {0};
 
-    const char* pattern = pRight->value.pz;
+    //remove the quote at the begin end of original sql string.
+    uint32_t lenPattern = pRight->exprToken.n - 2;
+    char* pattern = malloc(lenPattern + 1);
+    strncpy(pattern, pRight->exprToken.z+1, lenPattern);
+    pattern[lenPattern] = '\0';
+
+    tfree(pRight->value.pz);
+    pRight->value.pz = pattern;
+    pRight->value.nLen = lenPattern;
+
     int cflags = REG_EXTENDED;
     if ((errCode = regcomp(&regex, pattern, cflags)) != 0) {
       regerror(errCode, &regex, regErrBuf, sizeof(regErrBuf));

tests/pytest/fulltest.sh

@@ -273,6 +273,7 @@ python3 ./test.py -f query/queryCnameDisplay.py
 # python3 ./test.py -f query/operator_cost.py
 # python3 ./test.py -f query/long_where_query.py
 python3 test.py -f query/nestedQuery/queryWithSpread.py
+python3 ./test.py -f query/bug6586.py
 
 #stream
 python3 ./test.py -f stream/metric_1.py
@@ -391,7 +392,7 @@ python3 test.py -f alter/alter_cacheLastRow.py
 python3 ./test.py -f query/querySession.py 
 python3 test.py -f  alter/alter_create_exception.py
 python3 ./test.py -f insert/flushwhiledrop.py
-python3 ./test.py -f insert/schemalessInsert.py
+#python3 ./test.py -f insert/schemalessInsert.py
 python3 ./test.py -f alter/alterColMultiTimes.py
 python3 ./test.py -f query/queryWildcardLength.py
 python3 ./test.py -f query/queryTbnameUpperLower.py

tests/pytest/query/bug6586.py

+###################################################################
+#           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 -*-
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        # TD-6586 Binary type value return None with python connector
+        # PR: https://github.com/taosdata/TDengine/pull/7913/files
+
+        tdSql.execute("create database if not exists binary_convertion")
+        tdSql.execute("use binary_convertion")
+        tdSql.execute("create stable stb (ts timestamp,value binary(3)) tags (t0 bool,t1 tinyint,t2 smallint,t3 int,t4 bigint,t5 float,t6 double,t7 binary(3),t8 nchar(3))")
+        tdSql.execute("create table if not exists tb1 using stb(t0,t1,t2,t3,t4,t5,t6,t7,t8) tags (1,127,32767,2147483647,9223372036854775807,11.123450279,22.123456789,'aaa','aaa')")
+        tdSql.execute("insert into tb1 (ts,value) values (1600000000000, \"aaa\")")
+        res = tdSql.query('select * from stb', True)
+        expected_res = [(datetime.datetime(2020, 9, 13, 20, 26, 40), 'aaa', True, 127, 32767, 2147483647, 9223372036854775807, 11.12345027923584, 22.123456789, 'aaa', 'aaa')]
+        tdSql.checkEqual(res, expected_res)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/pytest/query/queryCnameDisplay.py

@@ -49,10 +49,11 @@ class TDTestCase:
 
         # select as cname with cname_list
         sql_seq = f'select count(ts) as {cname_list[0]}, sum(pi1) as {cname_list[1]}, avg(pi2) as {cname_list[2]}, count(pf1) as {cname_list[3]}, count(pf2) as {cname_list[4]}, count(ps1) as {cname_list[5]}, min(pi3) as {cname_list[6]}, max(pi4) as {cname_list[7]}, count(pb1) as {cname_list[8]}, count(ps2) as {cname_list[9]} from regular_table_cname_check'
-        sql_seq_no_as = sql_seq.replace('as ', '')
+        sql_seq_no_as = sql_seq.replace(' as ', ' ')
+        print(sql_seq)
+        print(sql_seq_no_as)
         res = tdSql.getColNameList(sql_seq)
         res_no_as = tdSql.getColNameList(sql_seq_no_as)
-        
         # cname[1] > 64, it is expected to be equal to 64
         cname_list_1_expected = cname_list[1][:-1]
         cname_list[1] = cname_list_1_expected
@@ -79,7 +80,7 @@ class TDTestCase:
 
         # select as cname with cname_list
         sql_seq = f'select count(ts) as {cname_list[0]}, sum(pi1) as {cname_list[1]}, avg(pi2) as {cname_list[2]}, count(pf1) as {cname_list[3]}, count(pf2) as {cname_list[4]}, count(ps1) as {cname_list[5]}, min(pi3) as {cname_list[6]}, max(pi4) as {cname_list[7]}, count(pb1) as {cname_list[8]}, count(ps2) as {cname_list[9]}, count(si1) as {cname_list[10]}, count(si2) as {cname_list[11]}, count(sf1) as {cname_list[12]}, count(sf2) as {cname_list[13]}, count(ss1) as {cname_list[14]}, count(si3) as {cname_list[15]}, count(si4) as {cname_list[16]}, count(sb1) as {cname_list[17]}, count(ss2) as {cname_list[18]} from super_table_cname_check'
-        sql_seq_no_as = sql_seq.replace('as ', '')
+        sql_seq_no_as = sql_seq.replace(' as ', ' ')
         res = tdSql.getColNameList(sql_seq)
         res_no_as = tdSql.getColNameList(sql_seq_no_as)
 

tests/pytest/util/common.py

@@ -14,7 +14,7 @@
 import random
 import string
 from util.sql import tdSql
-
+from util.dnodes import tdDnodes
 class TDCom:
     def init(self, conn, logSql):
         tdSql.init(conn.cursor(), logSql)
@@ -47,6 +47,42 @@ class TDCom:
             chars = ''.join(random.choice(string.ascii_letters.lower() + string.digits) for i in range(len))
         return chars
 
+    def restartTaosd(self, index=1, db_name="db"):
+        tdDnodes.stop(index)
+        tdDnodes.startWithoutSleep(index)
+        tdSql.execute(f"use {db_name}")
+
+    def typeof(self, variate):
+        v_type=None
+        if type(variate) is int:
+            v_type = "int"
+        elif type(variate) is str:
+            v_type = "str"
+        elif type(variate) is float:
+            v_type = "float"
+        elif type(variate) is bool:
+            v_type = "bool"
+        elif type(variate) is list:
+            v_type = "list"
+        elif type(variate) is tuple:
+            v_type = "tuple"
+        elif type(variate) is dict:
+            v_type = "dict"
+        elif type(variate) is set:
+            v_type = "set"
+        return v_type
+
+    def splitNumLetter(self, input_mix_str):
+        nums, letters = "", ""
+        for i in input_mix_str:
+            if i.isdigit():
+                nums += i
+            elif i.isspace():
+                pass
+            else:
+                letters += i
+        return nums, letters
+
     def close(self):
         self.cursor.close()
 

tests/script/general/parser/regex.sim

@@ -79,6 +79,23 @@ if $rows != 1 then
   return -1
 endi  
 
+sql select c1b from $st_name where c1b match '\\.\\*'
+if $rows != 0 then
+  return -1
+endi
+
+sql select c1b from $st_name where c1b match '\\\\'
+if $rows != 0 then
+  return -1
+endi
+
+sql insert into $ct1_name values(now+3s, '\\this is engine')
+
+sql select c1b from $st_name where c1b match '\\'
+if $rows != 1 then
+  return -1
+endi
+
 sql_error select c1b from $st_name where c1b match e;
 sql_error select c1b from $st_name where c1b nmatch e;