[TD-6443]<feature>: Support OpenTSDB HTTP JSON data import format

src/client/src/tscParseOpenTSDB.c

@@ -543,9 +543,9 @@ int32_t parseTimestampFromJSON(cJSON *root, TAOS_SML_KV **pTS, int *num_kvs, SSm
 
 }
 
-int32_t convertJSONBoolValue(TAOS_SML_KV *pVal, char* typeStr, int64_t valueInt, SSmlLinesInfo* info) {
+int32_t convertJSONBool(TAOS_SML_KV *pVal, char* typeStr, int64_t valueInt, SSmlLinesInfo* info) {
   if (strcasecmp(typeStr, "bool") != 0) {
-     tscError("OTD:0x%"PRIx64" invalid type(%s) in JSON payload", info->id, typeStr);
+    tscError("OTD:0x%"PRIx64" invalid type(%s) for JSON Bool", info->id, typeStr);
     return TSDB_CODE_TSC_INVALID_JSON_TYPE;
   }
   pVal->type = TSDB_DATA_TYPE_BOOL;
@@ -556,36 +556,9 @@ int32_t convertJSONBoolValue(TAOS_SML_KV *pVal, char* typeStr, int64_t valueInt,
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t parseValueFromJSONObj(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* info) {
-  int32_t ret = TSDB_CODE_SUCCESS;
-  int32_t size = cJSON_GetArraySize(root);
-
-  if (size != JSON_SUB_FIELDS_NUM) {
-    return TSDB_CODE_TSC_INVALID_JSON;
-  }
-
-  cJSON *value = cJSON_GetObjectItem(root, "value");
-  if (value == NULL) {
-    return TSDB_CODE_TSC_INVALID_JSON;
-  }
-
-  cJSON *type = cJSON_GetObjectItem(root, "type");
-  if (!cJSON_IsString(type)) {
-    return TSDB_CODE_TSC_INVALID_JSON;
-  }
-
-  switch (value->type) {
-    case cJSON_True:
-    case cJSON_False: {
-      ret = convertJSONBoolValue(pVal, type->valuestring, value->valueint, info);
-      if (ret != TSDB_CODE_SUCCESS) {
-        return ret;
-      }
-      break;
-    }
-    case cJSON_Number: {
+int32_t convertJSONNumber(TAOS_SML_KV *pVal, char* typeStr, cJSON *value, SSmlLinesInfo* info) {
   //tinyint
-      if (strcasecmp(type->valuestring, "i8") == 0) {
+  if (strcasecmp(typeStr, "i8") == 0) {
     if (!IS_VALID_TINYINT(value->valueint)) {
       tscError("OTD:0x%"PRIx64" JSON value(%ld) cannot fit in type(tinyint)", info->id, value->valueint);
       return TSDB_CODE_TSC_VALUE_OUT_OF_RANGE;
@@ -597,7 +570,7 @@ int32_t parseValueFromJSONObj(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* inf
     return TSDB_CODE_SUCCESS;
   }
   //smallint
-      if (strcasecmp(type->valuestring, "i16") == 0) {
+  if (strcasecmp(typeStr, "i16") == 0) {
     if (!IS_VALID_SMALLINT(value->valueint)) {
       tscError("OTD:0x%"PRIx64" JSON value(%ld) cannot fit in type(smallint)", info->id, value->valueint);
       return TSDB_CODE_TSC_VALUE_OUT_OF_RANGE;
@@ -609,7 +582,7 @@ int32_t parseValueFromJSONObj(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* inf
     return TSDB_CODE_SUCCESS;
   }
   //int
-      if (strcasecmp(type->valuestring, "i32") == 0) {
+  if (strcasecmp(typeStr, "i32") == 0) {
     if (!IS_VALID_INT(value->valueint)) {
       tscError("OTD:0x%"PRIx64" JSON value(%ld) cannot fit in type(int)", info->id, value->valueint);
       return TSDB_CODE_TSC_VALUE_OUT_OF_RANGE;
@@ -621,7 +594,7 @@ int32_t parseValueFromJSONObj(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* inf
     return TSDB_CODE_SUCCESS;
   }
   //bigint
-      if (strcasecmp(type->valuestring, "i64") == 0) {
+  if (strcasecmp(typeStr, "i64") == 0) {
     if (!IS_VALID_BIGINT(value->valueint)) {
       tscError("OTD:0x%"PRIx64" JSON value(%ld) cannot fit in type(bigint)", info->id, value->valueint);
       return TSDB_CODE_TSC_VALUE_OUT_OF_RANGE;
@@ -633,7 +606,7 @@ int32_t parseValueFromJSONObj(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* inf
     return TSDB_CODE_SUCCESS;
   }
   //float
-      if (strcasecmp(type->valuestring, "f32") == 0) {
+  if (strcasecmp(typeStr, "f32") == 0) {
     if (!IS_VALID_FLOAT(value->valuedouble)) {
       tscError("OTD:0x%"PRIx64" JSON value(%f) cannot fit in type(float)", info->id, value->valuedouble);
       return TSDB_CODE_TSC_VALUE_OUT_OF_RANGE;
@@ -645,7 +618,7 @@ int32_t parseValueFromJSONObj(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* inf
     return TSDB_CODE_SUCCESS;
   }
   //double
-      if (strcasecmp(type->valuestring, "f64") == 0) {
+  if (strcasecmp(typeStr, "f64") == 0) {
     if (!IS_VALID_DOUBLE(value->valuedouble)) {
       tscError("OTD:0x%"PRIx64" JSON value(%f) cannot fit in type(double)", info->id, value->valuedouble);
       return TSDB_CODE_TSC_VALUE_OUT_OF_RANGE;
@@ -657,9 +630,44 @@ int32_t parseValueFromJSONObj(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* inf
     return TSDB_CODE_SUCCESS;
   }
 
-      //if reach here means type string is not supported
-      tscError("OTD:0x%"PRIx64" invalid type(%s) in JSON payload", info->id, type->valuestring);
+  //if reach here means type is unsupported
+  tscError("OTD:0x%"PRIx64" invalid type(%s) for JSON number", info->id, typeStr);
   return TSDB_CODE_TSC_INVALID_JSON_TYPE;
+}
+
+int32_t parseValueFromJSONObj(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* info) {
+  int32_t ret = TSDB_CODE_SUCCESS;
+  int32_t size = cJSON_GetArraySize(root);
+
+  if (size != JSON_SUB_FIELDS_NUM) {
+    return TSDB_CODE_TSC_INVALID_JSON;
+  }
+
+  cJSON *value = cJSON_GetObjectItem(root, "value");
+  if (value == NULL) {
+    return TSDB_CODE_TSC_INVALID_JSON;
+  }
+
+  cJSON *type = cJSON_GetObjectItem(root, "type");
+  if (!cJSON_IsString(type)) {
+    return TSDB_CODE_TSC_INVALID_JSON;
+  }
+
+  switch (value->type) {
+    case cJSON_True:
+    case cJSON_False: {
+      ret = convertJSONBool(pVal, type->valuestring, value->valueint, info);
+      if (ret != TSDB_CODE_SUCCESS) {
+        return ret;
+      }
+      break;
+    }
+    case cJSON_Number: {
+      ret = convertJSONNumber(pVal, type->valuestring, value, info);
+      if (ret != TSDB_CODE_SUCCESS) {
+        return ret;
+      }
+      break;
     }
     case cJSON_String: {
       if (strcasecmp(type->valuestring, "binary") == 0) {