From 4b9b44d0eb00b5f4acf0040d43cb1882d7bd947a Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Mon, 6 Sep 2021 12:32:49 +0800
Subject: [PATCH] [TD-6443]<feature>: Support OpenTSDB HTTP JSON data import
 format

---
 src/client/src/tscParseOpenTSDB.c | 82 ++++++++++++++-----------------
 1 file changed, 36 insertions(+), 46 deletions(-)

diff --git a/src/client/src/tscParseOpenTSDB.c b/src/client/src/tscParseOpenTSDB.c
index 42c6f2d39a..69d2316fb1 100644
--- a/src/client/src/tscParseOpenTSDB.c
+++ b/src/client/src/tscParseOpenTSDB.c
@@ -495,24 +495,17 @@ int32_t parseTimestampFromJSON(cJSON *root, TAOS_SML_KV **pTS, int *num_kvs, SSm
 
 }
 
-int32_t parseMetricValueFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, SSmlLinesInfo* info) {
-  //skip timestamp
-  TAOS_SML_KV *pVal = *pKVs + 1;
-  char key[] = OTS_METRIC_VALUE_COLUMN_NAME;
 
-  cJSON *metricVal = cJSON_GetObjectItem(root, "value");
-  if (metricVal == NULL) {
-    tscError("OTD:0x%"PRIx64" failed to parse metric value from JSON Payload", info->id);
-    return  TSDB_CODE_TSC_INVALID_JSON;
-  }
+int32_t parseValueFromJSON(cJSON *root, TAOS_SML_KV *pVal) {
+  int type = root->type;
 
-  switch (metricVal->type) {
+  switch (type) {
     case cJSON_True:
     case cJSON_False: {
       pVal->type = TSDB_DATA_TYPE_BOOL;
       pVal->length = (int16_t)tDataTypes[pVal->type].bytes;
       pVal->value = tcalloc(pVal->length, 1);
-      *(bool *)(pVal->value) = metricVal->type ? true : false;
+      *(bool *)(pVal->value) = type ? true : false;
       break;
     }
     case cJSON_Number: {
@@ -520,21 +513,40 @@ int32_t parseMetricValueFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs,
       pVal->type = TSDB_DATA_TYPE_FLOAT;
       pVal->length = (int16_t)tDataTypes[pVal->type].bytes;
       pVal->value = tcalloc(pVal->length, 1);
-      *(float *)(pVal->value) = (float)(metricVal->valuedouble);
+      *(float *)(pVal->value) = (float)(root->valuedouble);
       break;
     }
     case cJSON_String: {
       //convert default JSON String type to nchar
       pVal->type = TSDB_DATA_TYPE_NCHAR;
-      pVal->length = wcslen((wchar_t *)metricVal->valuestring) * TSDB_NCHAR_SIZE;
+      pVal->length = wcslen((wchar_t *)root->valuestring) * TSDB_NCHAR_SIZE;
       pVal->value = tcalloc(pVal->length + 1, 1);
-      memcpy(pVal->value, metricVal->valuestring, pVal->length);
+      memcpy(pVal->value, root->valuestring, pVal->length);
       break;
     }
     default:
       return TSDB_CODE_TSC_INVALID_JSON;
   }
 
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t parseMetricValueFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, SSmlLinesInfo* info) {
+  //skip timestamp
+  TAOS_SML_KV *pVal = *pKVs + 1;
+  char key[] = OTS_METRIC_VALUE_COLUMN_NAME;
+
+  cJSON *metricVal = cJSON_GetObjectItem(root, "value");
+  if (metricVal == NULL) {
+    tscError("OTD:0x%"PRIx64" failed to parse metric value from JSON Payload", info->id);
+    return TSDB_CODE_TSC_INVALID_JSON;
+  }
+
+  int32_t ret = parseValueFromJSON(metricVal, pVal);
+  if (ret != TSDB_CODE_SUCCESS) {
+    return ret;
+  }
+
   pVal->key = tcalloc(sizeof(key), 1);
   memcpy(pVal->key, key, sizeof(key));
 
@@ -544,6 +556,7 @@ int32_t parseMetricValueFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs,
 }
 
 int32_t parseTagsFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, char **childTableName, SSmlLinesInfo* info) {
+  int32_t ret;
 
   cJSON *tags = cJSON_GetObjectItem(root, "tags");
   if (tags == NULL || tags->type != cJSON_Object) {
@@ -554,8 +567,8 @@ int32_t parseTagsFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, char **
   cJSON *id = cJSON_GetObjectItem(root, "ID");
   if (id != NULL) {
     int32_t idLen = strlen(id->string);
-    int32_t ret = isValidChildTableName(id->string, idLen);
-    if (ret) {
+    ret = isValidChildTableName(id->string, idLen);
+    if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
     *childTableName = tcalloc(idLen + 1, sizeof(char));
@@ -577,39 +590,16 @@ int32_t parseTagsFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, char **
   for (int32_t i = 0; i < tagNum; ++i) {
     cJSON *tag = cJSON_GetArrayItem(tags, i);
     //key
-    pkv->key = tcalloc(strlen(tag->string) + 1, sizeof(char));
-    strncpy(pkv->key, tag->string, strlen(tag->string));
+    int32_t keyLen = strlen(tag->string);
+    pkv->key = tcalloc(keyLen + 1, sizeof(char));
+    strncpy(pkv->key, tag->string, keyLen);
     //value
-    switch (tag->type) {
-      case cJSON_True:
-      case cJSON_False: {
-        pkv->type = TSDB_DATA_TYPE_BOOL;
-        pkv->length = (int16_t)tDataTypes[pkv->type].bytes;
-        pkv->value = tcalloc(pkv->length, 1);
-        *(bool *)(pkv->value) = tag->type ? true : false;
-        break;
-      }
-      case cJSON_Number: {
-        //convert default JSON Number type to float
-        pkv->type = TSDB_DATA_TYPE_FLOAT;
-        pkv->length = (int16_t)tDataTypes[pkv->type].bytes;
-        pkv->value = tcalloc(pkv->length, 1);
-        *(float *)(pkv->value) = (float)(tag->valuedouble);
-        break;
-      }
-      case cJSON_String: {
-        //convert default JSON String type to nchar
-        pkv->type = TSDB_DATA_TYPE_NCHAR;
-        pkv->length = wcslen((wchar_t *)tag->valuestring) * TSDB_NCHAR_SIZE;
-        pkv->value = tcalloc(pkv->length + 1, 1);
-        memcpy(pkv->value, tag->valuestring, pkv->length);
-        break;
-      }
-      default:
-        tfree(pkv->key);
-        return TSDB_CODE_TSC_INVALID_JSON;
+    ret = parseValueFromJSON(tag, pkv);
+    if (ret != TSDB_CODE_SUCCESS) {
+      return ret;
     }
     *num_kvs += 1;
+    pkv++;
   }
 
   return TSDB_CODE_SUCCESS;
-- 
GitLab