From f253be5925f9e937e395404fc3238969181ebf43 Mon Sep 17 00:00:00 2001
From: jiacy-jcy <cyjia@taosdata.com>
Date: Wed, 22 Sep 2021 09:25:22 +0800
Subject: [PATCH] [TD-6585]<test>:add test case

---
 tests/pytest/fulltest.sh                      |  2 +
 .../pytest/query/queryGroupbyWithInterval.py  |  9 +++
 tests/pytest/query/queryRegex.py              | 74 +++++++++++++++++++
 3 files changed, 85 insertions(+)
 create mode 100644 tests/pytest/query/queryRegex.py

diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
index b8bb94b26d..ac164af60e 100755
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -398,6 +398,8 @@ python3 ./test.py -f query/queryWildcardLength.py
 python3 ./test.py -f query/queryTbnameUpperLower.py
 python3 ./test.py -f query/query.py
 python3 ./test.py -f query/queryDiffColsOr.py
+
+python3 ./test.py -f query/queryRegex.py
 #======================p4-end===============
 
 
diff --git a/tests/pytest/query/queryGroupbyWithInterval.py b/tests/pytest/query/queryGroupbyWithInterval.py
index 14f6999021..9f56d0654b 100644
--- a/tests/pytest/query/queryGroupbyWithInterval.py
+++ b/tests/pytest/query/queryGroupbyWithInterval.py
@@ -41,6 +41,15 @@ class TDTestCase:
         tdSql.execute(
             "insert into test22 using stest tags('test21','ccc') values ('2020-09-04 16:54:54.003',210,3)")
 
+        #2021-09-17 For jira: https://jira.taosdata.com:18080/browse/TD-6085
+        tdSql.query("select last(size),appname from stest where tbname in ('test1','test2','test11')")
+        tdSql.checkRows(1)
+
+        #2021-09-17 For jira: https://jira.taosdata.com:18080/browse/TD-6314
+        tdSql.query("select _block_dist() from stest")
+        tdSql.checkRows(1)
+
+
         tdSql.query("select sum(size) from stest interval(1d) group by appname")        
         tdSql.checkRows(3)
 
diff --git a/tests/pytest/query/queryRegex.py b/tests/pytest/query/queryRegex.py
new file mode 100644
index 0000000000..25afa6395f
--- /dev/null
+++ b/tests/pytest/query/queryRegex.py
@@ -0,0 +1,74 @@
+###################################################################
+#           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 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+from util.dnodes import tdDnodes
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+        print("==============step1")
+        ##2021-09-17 For jira: https://jira.taosdata.com:18080/browse/TD-6585
+        tdSql.execute(
+            "create stable if not exists stb_test(ts timestamp,c0 binary(32)) tags(t0 binary(32))"
+        )
+        tdSql.execute(
+            'create table if not exists stb_1 using stb_test tags("abcdefgasdfg12346")'
+        )
+        tdLog.info('insert into stb_1 values("2021-09-13 10:00:00.001","abcefdasdqwerxasdazx12345"')
+        tdSql.execute('insert into stb_1 values("2021-09-13 10:00:00.001","abcefdasdqwerxasdazx12345")')
+
+
+        tdSql.query('select * from stb_test where tbname match "asd"')
+        tdSql.checkRows(0)
+
+        tdSql.query('select * from stb_test where tbname nmatch "asd"')
+        tdSql.checkRows(1)
+
+        tdSql.query('select * from stb_test where c0 match "abc"')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,1,"abcefdasdqwerxasdazx12345")
+
+        tdSql.query('select * from stb_test where c0 nmatch "abc"')
+        tdSql.checkRows(0)
+
+        tdSql.error('select * from stb_test where c0 match abc')
+
+        tdSql.error('select * from stb_test where c0 nmatch abc')
+
+
+        tdSql.execute('insert into stb_1 values("2020-10-13 10:00:00.001","abcd\\\efgh")')
+        tdSql.query("select * from stb_1 where c0 match '\\\\'")
+        tdSql.checkRows(1)
+
+
+
+
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
-- 
GitLab