From 629d58a078d54228e5242f95009ebf1c75994cf7 Mon Sep 17 00:00:00 2001
From: xywang <xywang@taosdata.com>
Date: Sun, 8 May 2022 02:53:04 +0800
Subject: [PATCH] feat(query): fixed parsing error in rewriting results to file

---
 src/kit/shell/src/shellEngine.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
index 6d9a19fbda..0364d03974 100644
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -244,13 +244,22 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
   int64_t   st, et;
   wordexp_t full_path;
   char *    sptr = NULL;
+  char *    tmp = NULL;
   char *    cptr = NULL;
   char *    fname = NULL;
   bool      printMode = false;
 
   sptr = command;
   while ((sptr = tstrstr(sptr, ">>", true)) != NULL) {
-    if (regex_match(sptr + 2, "^\\s*+[a-zA-Z0-9_]+\\s*;\\s*$", REG_EXTENDED | REG_ICASE)) {
+    // find the last ">>" if any
+    tmp = sptr;
+    sptr += 2;
+  }
+
+  sptr = tmp;
+
+  if (sptr != NULL) {
+    if (regex_match(sptr + 2, "^\\s*[\\>|\\<|\\<=|\\>=|=|!=]\\s*;\\s*$", REG_EXTENDED | REG_ICASE) == 0) {
       cptr = tstrstr(command, ";", true);
       if (cptr != NULL) {
         *cptr = '\0';
@@ -262,10 +271,6 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
       }
       *sptr = '\0';
       fname = full_path.we_wordv[0];
-
-      break;
-    } else {
-      sptr += 2;
     }
   }
 
-- 
GitLab