From 6363169a478a1772ac788139a3a6d4efb08251e5 Mon Sep 17 00:00:00 2001
From: Shenglian Zhou <shenglian_zhou@163.com>
Date: Wed, 1 Sep 2021 10:15:44 +0800
Subject: [PATCH] [TD-6145]<feature>:add test for regex filter

---
 src/client/src/tscSQLParser.c         |  2 +-
 src/tsdb/src/tsdbRead.c               |  2 +-
 src/util/src/tcompare.c               |  2 +-
 tests/script/fullGeneralSuite.sim     |  1 +
 tests/script/general/parser/regex.sim | 51 +++++++++++++++++++++++++++
 5 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 tests/script/general/parser/regex.sim

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index fea02900fb..3f3a3b0150 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -4525,7 +4525,7 @@ static int32_t validateMatchExpr(tSqlExpr* pExpr, STableMeta* pTableMeta, int32_
     char    regErrBuf[256] = {0};
 
     const char* pattern = pRight->value.pz;
-    int cflags = REG_EXTENDED | REG_ICASE;
+    int cflags = REG_EXTENDED;
     if ((errCode = regcomp(&regex, pattern, cflags)) != 0) {
       regerror(errCode, &regex, regErrBuf, sizeof(regErrBuf));
       tscError("Failed to compile regex pattern %s. reason %s", pattern, regErrBuf);
diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index 60ecb238ca..c1b935e0ee 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -4236,7 +4236,7 @@ void getTableListfromSkipList(tExprNode *pExpr, SSkipList *pSkipList, SArray *re
     param->setupInfoFn(pExpr, param->pExtInfo);
 
     tQueryInfo *pQueryInfo = pExpr->_node.info;
-    if (pQueryInfo->indexed && (pQueryInfo->optr != TSDB_RELATION_LIKE && pQueryInfo->optr == TSDB_RELATION_MATCH
+    if (pQueryInfo->indexed && (pQueryInfo->optr != TSDB_RELATION_LIKE && pQueryInfo->optr != TSDB_RELATION_MATCH
                                 && pQueryInfo->optr != TSDB_RELATION_IN)) {
       queryIndexedColumn(pSkipList, pQueryInfo, result);
     } else {
diff --git a/src/util/src/tcompare.c b/src/util/src/tcompare.c
index e906eb8423..4c76724921 100644
--- a/src/util/src/tcompare.c
+++ b/src/util/src/tcompare.c
@@ -365,7 +365,7 @@ int32_t compareStrRegexComp(const void* pLeft, const void* pRight) {
   regex_t regex;
   char    msgbuf[256] = {0};
 
-  int cflags = REG_EXTENDED | REG_ICASE;
+  int cflags = REG_EXTENDED;
   if ((errCode = regcomp(&regex, pattern, cflags)) != 0) {
     regerror(errCode, &regex, msgbuf, sizeof(msgbuf));
     uError("Failed to compile regex pattern %s. reason %s", pattern, msgbuf);
diff --git a/tests/script/fullGeneralSuite.sim b/tests/script/fullGeneralSuite.sim
index 9f46b07847..188ce14055 100644
--- a/tests/script/fullGeneralSuite.sim
+++ b/tests/script/fullGeneralSuite.sim
@@ -222,3 +222,4 @@ run general/stream/metrics_replica1_vnoden.sim
 run general/db/show_create_db.sim
 run general/db/show_create_table.sim
 run general/parser/like.sim
+run general/parser/regex.sim
diff --git a/tests/script/general/parser/regex.sim b/tests/script/general/parser/regex.sim
new file mode 100644
index 0000000000..59c7384d6c
--- /dev/null
+++ b/tests/script/general/parser/regex.sim
@@ -0,0 +1,51 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sleep 100
+sql connect
+
+$db = testdb
+sql drop database if exists $db
+sql create database $db
+sql use $db
+
+print ======================== regular expression match test
+$st_name = st
+$ct1_name = ct1
+$ct2_name = ct2
+
+sql create table $st_name (ts timestamp, c1b binary(20)) tags(t1b binary(20));
+sql create table $ct1_name using $st_name tags('taosdata1')
+sql create table $ct2_name using $st_name tags('taosdata2')
+sql create table not_match using $st_name tags('NOTMATCH')
+
+sql select tbname from $st_name where tbname match '^ct[[:digit:]]'
+
+if $rows != 2 then
+  return -1
+endi
+
+sql select tbname from $st_name where t1b match '[[:lower:]]+'
+if $rows != 2 then
+  return -1
+endi
+
+sql insert into $ct1_name values(now, 'this is engine')
+sql insert into $ct2_name values(now, 'this is app egnine')
+
+sql select c1b from $st_name where c1b match 'engine'
+if $data00 != @this is engine@ then
+  return -1
+endi
+
+if $rows != 1 then
+  return -1
+endi  
+
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+
+