Merge pull request #8699 from taosdata/szhou/hotfix/escape-percentage-master

[TS-636]<fix>:escape % with \ suport

src/kit/shell/src/shellEngine.c

@@ -262,7 +262,7 @@ int32_t shellRunCommand(TAOS* con, char* command) {
     }
 
     if (c == '\\') {
-      if (quote != 0 && (*command == '_' || *command == '\\')) {
+      if (quote != 0 && (*command == '_' || *command == '%' || *command == '\\')) {
         //DO nothing 
       } else {
         esc = true;

src/util/src/tcompare.c

@@ -263,6 +263,7 @@ int patternMatch(const char *patterStr, const char *str, size_t size, const SPat
 
     if (j <= size) {
       if (c == '\\' && patterStr[i] == '_' && c1 == '_') { i++; continue; }
+      if (c == '\\' && patterStr[i] == '%' && c1 == '%') { i++; continue; }
       if (c == c1 || tolower(c) == tolower(c1) || (c == pInfo->matchOne && c1 != 0)) {
         continue;
       }

src/util/src/tutil.c

@@ -64,7 +64,7 @@ int32_t strRmquote(char *z, int32_t len){
     int32_t j = 0;
     for (uint32_t k = 1; k < len - 1; ++k) {
       if (z[k] == '\\' || (z[k] == delim && z[k + 1] == delim)) {
-        if (z[k] == '\\' && z[k + 1] == '_') {
+        if ((z[k] == '\\' && z[k + 1] == '_') || (z[k] == '\\' && z[k + 1] == '%')) {
           //match '_' self
         } else {
           z[j] = z[k + 1];

tests/script/general/parser/like.sim

+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 10
+sql connect
+print ======================== dnode1 start
+
+
+$db = testdb
+sql drop database if exists $db
+sql create database $db cachelast 2
+sql use $db
+
+$table1 = table_name
+$table2 = tablexname
+
+sql create table $table1 (ts timestamp, b binary(20))
+sql create table $table2 (ts timestamp, b binary(20))
+
+sql insert into $table1 values(now,    "table_name")
+sql insert into $table1 values(now-1m, "tablexname")
+sql insert into $table1 values(now-2m, "tablexxx")
+sql insert into $table1 values(now-3m, "table")
+
+sql select b from $table1 
+if $rows != 4 then
+  return -1
+endi
+
+sql select b from $table1 where b like 'table_name' 
+if $rows != 2 then
+  return -1
+endi
+
+
+sql select b from $table1 where b like 'table\_name'
+if $rows != 1 then
+  return -1
+endi
+
+sql show tables;
+if $rows != 2 then 
+  return -1
+endi
+
+sql show tables like 'table_name'
+if $rows != 2 then 
+  return -1
+endi
+
+sql show tables like 'table\_name'
+if $rows != 1 then 
+  return -1
+endi
+
+sql create database escape_percentage;
+sql use  escape_percentage;
+$table1 = tablename
+$table2 = table2
+
+sql create table $table1 (ts timestamp, b binary(20))
+sql create table $table2 (ts timestamp, b binary(20))
+
+sql insert into $table1 values(now,    "table%name")
+sql insert into $table1 values(now-1m, "table%")
+sql insert into $table1 values(now-2m, "table%%%")
+sql insert into $table1 values(now-3m, "table")
+
+sql select b from $table1 where b like 'table\%'
+print $rows
+if $rows != 1 then 
+  return -1
+endi
+sql select b from $table1 where b like 'table\%\%\%'
+print $rows
+if $rows != 1 then 
+  return -1
+endi
+sql select b from $table1 where b like 'table%'
+print $rows
+if $rows != 4 then 
+  return -1
+endi
+sql show tables like 'table\%'
+print $rows
+if $rows != 0 then 
+  return -1
+endi
+sql show tables like 'table%'
+print $rows
+if $rows != 2 then 
+  return -1
+endi
+sql drop database escape_percentage
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+
+