From 31980afaa77f4a367dadd55cad5362b24d9ff45b Mon Sep 17 00:00:00 2001
From: xywang <xywang@taosdata.com>
Date: Thu, 9 Sep 2021 23:07:30 +0800
Subject: [PATCH] [TS-263]<fix>: make response of alter consistent with create
 and drop

---
 src/plugins/http/inc/httpUtil.h     |  1 +
 src/plugins/http/src/httpRestJson.c | 23 +++++++++++++++++++----
 src/plugins/http/src/httpUtil.c     | 12 ++++++++++++
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/plugins/http/inc/httpUtil.h b/src/plugins/http/inc/httpUtil.h
index 54c95b6980..21690ebca9 100644
--- a/src/plugins/http/inc/httpUtil.h
+++ b/src/plugins/http/inc/httpUtil.h
@@ -17,6 +17,7 @@
 #define TDENGINE_HTTP_UTIL_H
 
 bool httpCheckUsedbSql(char *sql);
+bool httpCheckAlterSql(char *sql);
 void httpTimeToString(int32_t t, char *buf, int32_t buflen);
 
 bool    httpUrlMatch(HttpContext *pContext, int32_t pos, char *cmp);
diff --git a/src/plugins/http/src/httpRestJson.c b/src/plugins/http/src/httpRestJson.c
index 47f2d4ff5b..13596b0e8a 100644
--- a/src/plugins/http/src/httpRestJson.c
+++ b/src/plugins/http/src/httpRestJson.c
@@ -16,6 +16,7 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 #include "tglobal.h"
+#include "tsclient.h"
 #include "httpLog.h"
 #include "httpJson.h"
 #include "httpRestHandle.h"
@@ -62,13 +63,21 @@ void restStartSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result)
   httpJsonItemToken(jsonBuf);
   httpJsonToken(jsonBuf, JsonArrStt);
 
+  SSqlObj *pObj = (SSqlObj *) result;
+  bool     isAlterSql = (pObj->sqlstr == NULL) ? false : httpCheckAlterSql(pObj->sqlstr);
+
   if (num_fields == 0) {
     httpJsonItemToken(jsonBuf);
     httpJsonString(jsonBuf, REST_JSON_AFFECT_ROWS, REST_JSON_AFFECT_ROWS_LEN);
   } else {
-    for (int32_t i = 0; i < num_fields; ++i) {
+    if (isAlterSql == true) {
       httpJsonItemToken(jsonBuf);
-      httpJsonString(jsonBuf, fields[i].name, (int32_t)strlen(fields[i].name));
+      httpJsonString(jsonBuf, REST_JSON_AFFECT_ROWS, REST_JSON_AFFECT_ROWS_LEN);
+    } else {
+      for (int32_t i = 0; i < num_fields; ++i) {
+        httpJsonItemToken(jsonBuf);
+        httpJsonString(jsonBuf, fields[i].name, (int32_t)strlen(fields[i].name));
+      }
     }
   }
 
@@ -99,8 +108,14 @@ void restStartSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result)
       httpJsonItemToken(jsonBuf);
       httpJsonToken(jsonBuf, JsonArrStt);
 
-      httpJsonItemToken(jsonBuf);
-      httpJsonString(jsonBuf, fields[i].name, (int32_t)strlen(fields[i].name));
+      if (isAlterSql == true) {
+        httpJsonItemToken(jsonBuf);
+        httpJsonString(jsonBuf, REST_JSON_AFFECT_ROWS, REST_JSON_AFFECT_ROWS_LEN);
+      } else {
+        httpJsonItemToken(jsonBuf);
+        httpJsonString(jsonBuf, fields[i].name, (int32_t)strlen(fields[i].name));
+      }
+
       httpJsonItemToken(jsonBuf);
       httpJsonInt(jsonBuf, fields[i].type);
       httpJsonItemToken(jsonBuf);
diff --git a/src/plugins/http/src/httpUtil.c b/src/plugins/http/src/httpUtil.c
index ade50bdad6..f30ac7326e 100644
--- a/src/plugins/http/src/httpUtil.c
+++ b/src/plugins/http/src/httpUtil.c
@@ -21,6 +21,7 @@
 #include "httpResp.h"
 #include "httpSql.h"
 #include "httpUtil.h"
+#include "ttoken.h"
 
 bool httpCheckUsedbSql(char *sql) {
   if (strstr(sql, "use ") != NULL) {
@@ -29,6 +30,17 @@ bool httpCheckUsedbSql(char *sql) {
   return false;
 }
 
+bool httpCheckAlterSql(char *sql) {
+  int32_t index = 0;
+
+  do {
+    SStrToken t0 = tStrGetToken(sql, &index, false);
+    if (t0.type != TK_LP) {
+      return t0.type == TK_ALTER;
+    }
+  } while (1);
+}
+
 void httpTimeToString(int32_t t, char *buf, int32_t buflen) {
   memset(buf, 0, (size_t)buflen);
   char ts[32] = {0};
-- 
GitLab