From 200de3058ef7b8c21e3352c5364225d095dd6356 Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Mon, 6 Sep 2021 12:32:49 +0800 Subject: [PATCH] [TD-6443]: Support OpenTSDB HTTP JSON data import format --- src/client/src/tscParseOpenTSDB.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/client/src/tscParseOpenTSDB.c b/src/client/src/tscParseOpenTSDB.c index e97882156c..bb18b54a7c 100644 --- a/src/client/src/tscParseOpenTSDB.c +++ b/src/client/src/tscParseOpenTSDB.c @@ -434,7 +434,7 @@ int32_t parseMetricFromJSON(cJSON *root, TAOS_SML_DATA_POINT* pSml, SSmlLinesInf return TSDB_CODE_TSC_INVALID_JSON; } - uint64_t stableLen = strlen(metric->valuestring); + size_t stableLen = strlen(metric->valuestring); if (stableLen > TSDB_TABLE_NAME_LEN) { tscError("OTD:0x%"PRIx64" Metric cannot exceeds 193 characters in JSON", info->id); return TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH; @@ -480,7 +480,7 @@ int32_t parseTimestampFromJSONObj(cJSON *root, int64_t *tsVal, SSmlLinesInfo* in return TSDB_CODE_SUCCESS; } - uint64_t typeLen = strlen(type->valuestring); + size_t typeLen = strlen(type->valuestring); if (typeLen == 1 && type->valuestring[0] == 's') { //seconds *tsVal = (int64_t)(*tsVal * 1e9); @@ -786,8 +786,8 @@ int32_t parseTagsFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, char ** //only pick up the first ID value as child table name cJSON *id = cJSON_GetObjectItem(tags, "ID"); if (id != NULL) { - uint64_t idLen = strlen(id->valuestring); - ret = isValidChildTableName(id->valuestring, idLen); + size_t idLen = strlen(id->valuestring); + ret = isValidChildTableName(id->valuestring, (int16_t)idLen); if (ret != TSDB_CODE_SUCCESS) { return ret; } @@ -816,7 +816,7 @@ int32_t parseTagsFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, char ** return TSDB_CODE_TSC_INVALID_JSON; } //key - uint64_t keyLen = strlen(tag->string); + size_t keyLen = strlen(tag->string); pkv->key = tcalloc(keyLen + 1, sizeof(char)); strncpy(pkv->key, tag->string, keyLen); //value