optimize strRmquote function

src/util/src/tutil.c

@@ -60,33 +60,29 @@ int32_t strdequote(char *z) {
 
 int32_t strRmquote(char *z, int32_t len){
   // delete escape character: \\, \', \"
-    char delim = z[0];
-    if (delim != '\'' && delim != '\"') {
-      return len;
-    }
-
+  char delim = 0;
   int32_t cnt = 0;
   int32_t j = 0;
-    for (uint32_t k = 1; k < len - 1; ++k) {
-      if (z[k] == '\\' || (z[k] == delim && z[k + 1] == delim)) {
+  for (size_t k = 0; k < len; ++k) {
+    if (!delim && (z[k] == '\'' || z[k] == '"')){   // find the start ' or "
+      delim = z[k];
+    }
+
     if ((z[k] == '\\' && z[k + 1] == '_') || (z[k] == '\\' && z[k + 1] == '%')) {
-          //match '_' self
-        } else {
+      //match '_' '%' self
+    }else if(z[k] == '\\'){
       z[j] = z[k + 1];
       cnt++;
       j++;
       k++;
       continue;
+    }else if(z[k] == delim){
+      continue;
     }
-      }
-
     z[j] = z[k];
     j++;
   }
-
-    z[j] = 0;
-
-    return len - 2 - cnt;
+  return j;
 }
 
 int32_t strRmquoteEscape(char *z, int32_t len) {

src/util/tests/stringTest.cpp

@@ -6,6 +6,28 @@
 #include "taos.h"
 #include "tutil.h"
 
+TEST(testCase, str_rmquote_test) {
+  char    t1[] = "\"\".dd";
+  int32_t len = strRmquote(t1);
+
+  printf("t1:%s, len:%d\n", t1, len);
+
+  char    t2[] = "\"fsd\\\"fs\".dd";
+  len = strRmquote(t2);
+
+  printf("t2:%s, len:%d\n", t2, len);
+
+  char    t3[] = "fs\\_d\\%.d\\d";
+  len = strRmquote(t3);
+
+  printf("t3:%s, len:%d\n", t3, len);
+
+  char    t4[] = "\"fs\\_d\\%\".dd";
+  len = strRmquote(t4);
+
+  printf("t4:%s, len:%d\n", t4, len);
+}
+
 TEST(testCase, string_dequote_test) {
   char    t1[] = "'abc'";
   int32_t len = strdequote(t1);