From d2941c06088c20e150f9faf459cf000e054ebf8e Mon Sep 17 00:00:00 2001
From: xywang <xywang@taosdata.com>
Date: Thu, 15 Jul 2021 13:17:10 +0800
Subject: [PATCH] [TD-5169]<enhance>: simplified function implementation

---
 src/inc/taoserror.h                 |  2 ++
 src/plugins/http/src/httpGcHandle.c |  8 ++------
 src/plugins/http/src/httpSql.c      | 10 +++++-----
 src/plugins/http/src/httpTgHandle.c |  8 ++------
 src/util/src/terror.c               |  2 ++
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h
index 1e996be889..b18aa2c2d9 100644
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
@@ -395,6 +395,8 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_HTTP_OP_VALUE_NULL            TAOS_DEF_ERROR_CODE(0, 0x11A5)  //"value not find")
 #define TSDB_CODE_HTTP_OP_VALUE_TYPE            TAOS_DEF_ERROR_CODE(0, 0x11A6)  //"value type should be boolean number or string")
 
+#define TSDB_CODE_HTTP_REQUEST_JSON_ERROR       TAOS_DEF_ERROR_CODE(0, 0x1F00)  //"http request json error")
+
 // odbc
 #define TSDB_CODE_ODBC_OOM                      TAOS_DEF_ERROR_CODE(0, 0x2100)  //"out of memory")
 #define TSDB_CODE_ODBC_CONV_CHAR_NOT_NUM        TAOS_DEF_ERROR_CODE(0, 0x2101)  //"convertion not a valid literal input")
diff --git a/src/plugins/http/src/httpGcHandle.c b/src/plugins/http/src/httpGcHandle.c
index ed3a28567e..883afcc4ec 100644
--- a/src/plugins/http/src/httpGcHandle.c
+++ b/src/plugins/http/src/httpGcHandle.c
@@ -178,12 +178,8 @@ bool gcProcessQueryRequest(HttpContext* pContext) {
 
 #define ESCAPE_ERROR_PROC(code, context, root)                          \
   do {                                                                  \
-    if (code != 0) {                                                    \
-      if (code == 1) {                                                  \
-        httpSendErrorResp(context, TSDB_CODE_HTTP_GC_REQ_PARSE_ERROR);  \
-      } else {                                                          \
-        httpSendErrorResp(context, TSDB_CODE_HTTP_NO_ENOUGH_MEMORY);    \
-      }                                                                 \
+    if (code != TSDB_CODE_SUCCESS) {                                    \
+      httpSendErrorResp(context, code);                                 \
                                                                         \
       cJSON_Delete(root);                                               \
       return false;                                                     \
diff --git a/src/plugins/http/src/httpSql.c b/src/plugins/http/src/httpSql.c
index b2480dcad8..c2e723732a 100644
--- a/src/plugins/http/src/httpSql.c
+++ b/src/plugins/http/src/httpSql.c
@@ -429,27 +429,27 @@ int32_t httpCheckAllocEscapeSql(char *oldSql, char **newSql)
   char *pos;
 
   if (oldSql == NULL || newSql == NULL) {
-    return 0;
+    return TSDB_CODE_SUCCESS;
   }
 
   /* bad sql clause */
   pos = strstr(oldSql, "%%");
   if (pos) {
     httpError("bad sql:%s", oldSql);
-    return 1;
+    return TSDB_CODE_HTTP_REQUEST_JSON_ERROR;
   }
 
   pos = strchr(oldSql, '%');
   if (pos == NULL) {
     httpDebug("sql:%s", oldSql);
     *newSql = oldSql;
-    return 0;
+    return TSDB_CODE_SUCCESS;
   }
 
   *newSql = (char *) calloc(1, (strlen(oldSql) << 1) + 1);
   if (newSql == NULL) {
     httpError("failed to allocate for new sql, old sql:%s", oldSql);
-    return -1;
+    return TSDB_CODE_HTTP_NO_ENOUGH_MEMORY;
   }
 
   char *src = oldSql;
@@ -473,7 +473,7 @@ int32_t httpCheckAllocEscapeSql(char *oldSql, char **newSql)
     }
   }
 
-  return 0;
+  return TSDB_CODE_SUCCESS;
 }
 
 void httpCheckFreeEscapedSql(char *oldSql, char *newSql)
diff --git a/src/plugins/http/src/httpTgHandle.c b/src/plugins/http/src/httpTgHandle.c
index 8aa156b84a..32516b9fd1 100644
--- a/src/plugins/http/src/httpTgHandle.c
+++ b/src/plugins/http/src/httpTgHandle.c
@@ -613,12 +613,8 @@ bool tgProcessSingleMetric(HttpContext *pContext, cJSON *metric, char *db) {
 
     char *tagStr = NULL;
     int32_t retCode = httpCheckAllocEscapeSql(tag->string, &tagStr);
-    if (retCode != 0) {
-      if (retCode == 1) {
-        httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_INVALID_JSON);
-      } else {
-        httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_ENOUGH_MEMORY);
-      }
+    if (retCode != TSDB_CODE_SUCCESS) {
+      httpSendErrorResp(pContext, retCode);
 
       return false;
     }
diff --git a/src/util/src/terror.c b/src/util/src/terror.c
index 27a08d8e9e..6cb508ebae 100644
--- a/src/util/src/terror.c
+++ b/src/util/src/terror.c
@@ -403,6 +403,8 @@ TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_TAG_VALUE_TOO_LONG,   "tag value can not mor
 TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_VALUE_NULL,           "value not find")
 TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_VALUE_TYPE,           "value type should be boolean, number or string")
 
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_REQUEST_JSON_ERROR,      "http request json error")
+
 // odbc
 TAOS_DEFINE_ERROR(TSDB_CODE_ODBC_OOM,                     "out of memory")
 TAOS_DEFINE_ERROR(TSDB_CODE_ODBC_CONV_CHAR_NOT_NUM,       "convertion not a valid literal input")
-- 
GitLab