xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix:json parse error in the end

This commit is contained in:
wangmm0220 2022-12-30 10:02:15 +08:00
parent 55f4d9524b
commit e6627f6955
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/client/src/clientSml.c
View File

@ -1267,11 +1267,13 @@ int32_t smlClearForRerun(SSmlHandle *info) {
pList = pList->next; pList = pList->next;
} }
if (!info->dataFormat){
if (unlikely(info->lines != NULL)) { if (unlikely(info->lines != NULL)) {
uError("SML:0x%" PRIx64 " info->lines != NULL", info->id); uError("SML:0x%" PRIx64 " info->lines != NULL", info->id);
return TSDB_CODE_SML_INVALID_DATA; return TSDB_CODE_SML_INVALID_DATA;
} }
info->lines = (SSmlLineInfo *)taosMemoryCalloc(info->lineNum, sizeof(SSmlLineInfo)); info->lines = (SSmlLineInfo *)taosMemoryCalloc(info->lineNum, sizeof(SSmlLineInfo));
}
memset(&info->preLine, 0, sizeof(SSmlLineInfo)); memset(&info->preLine, 0, sizeof(SSmlLineInfo));
info->currSTableMeta = NULL; info->currSTableMeta = NULL;

17
source/client/src/clientSmlJson.c
View File

@ -406,7 +406,7 @@ static int32_t smlParseJSONString(SSmlHandle *info, char **start, SSmlLineInfo *
}else{ }else{
smlJsonParseObj(start, elements, info->offset); smlJsonParseObj(start, elements, info->offset);
} }
if(**start == '\0') return TSDB_CODE_SUCCESS; if(**start == '\0' && elements->measure == NULL) return TSDB_CODE_SUCCESS;
SSmlKv kv = {.key = VALUE, .keyLen = VALUE_LEN, .value = elements->cols, .length = (size_t)elements->colsLen}; SSmlKv kv = {.key = VALUE, .keyLen = VALUE_LEN, .value = elements->cols, .length = (size_t)elements->colsLen};
if (smlParseValue(&kv, &info->msgBuf) != TSDB_CODE_SUCCESS) { if (smlParseValue(&kv, &info->msgBuf) != TSDB_CODE_SUCCESS) {
@ -804,7 +804,7 @@ static int32_t smlParseTagsFromJSONExt(SSmlHandle *info, cJSON *tags, SSmlLineIn
cnt++; cnt++;
} }
SSmlTableInfo *tinfo = (SSmlTableInfo *)nodeListGet(info->childTables, elements->tags, POINTER_BYTES, is_same_child_table_telnet); SSmlTableInfo *tinfo = (SSmlTableInfo *)nodeListGet(info->childTables, elements, POINTER_BYTES, is_same_child_table_telnet);
if (unlikely(tinfo == NULL)) { if (unlikely(tinfo == NULL)) {
tinfo = smlBuildTableInfo(1, elements->measure, elements->measureLen); tinfo = smlBuildTableInfo(1, elements->measure, elements->measureLen);
if (unlikely(!tinfo)) { if (unlikely(!tinfo)) {
@ -822,7 +822,10 @@ static int32_t smlParseTagsFromJSONExt(SSmlHandle *info, cJSON *tags, SSmlLineIn
} }
} }
nodeListSet(&info->childTables, tags, POINTER_BYTES, tinfo, is_same_child_table_telnet); SSmlLineInfo *key = (SSmlLineInfo *)taosMemoryMalloc(sizeof(SSmlLineInfo));
*key = *elements;
tinfo->key = key;
nodeListSet(&info->childTables, key, POINTER_BYTES, tinfo, is_same_child_table_telnet);
} }
if (info->dataFormat) info->currTableDataCtx = tinfo->tableDataCtx; if (info->dataFormat) info->currTableDataCtx = tinfo->tableDataCtx;
@ -1054,6 +1057,9 @@ static int32_t smlParseJSONExt(SSmlHandle *info, char *payload) {
info->lines = NULL; info->lines = NULL;
} }
ret = smlClearForRerun(info); ret = smlClearForRerun(info);
if(ret != TSDB_CODE_SUCCESS){
return ret;
}
cJSON *head = (payloadNum == 1 && cJSON_IsObject(info->root)) ? info->root : info->root->child; cJSON *head = (payloadNum == 1 && cJSON_IsObject(info->root)) ? info->root : info->root->child;
int cnt = 0; int cnt = 0;
@ -1103,6 +1109,7 @@ int32_t smlParseJSON(SSmlHandle *info, char *payload) {
void* tmp = taosMemoryRealloc(info->lines, payloadNum * sizeof(SSmlLineInfo)); void* tmp = taosMemoryRealloc(info->lines, payloadNum * sizeof(SSmlLineInfo));
if(tmp != NULL){ if(tmp != NULL){
info->lines = (SSmlLineInfo*)tmp; info->lines = (SSmlLineInfo*)tmp;
memset(info->lines + cnt, 0, (payloadNum - cnt) * sizeof(SSmlLineInfo));
} }
} }
ret = smlParseJSONString(info, &dataPointStart, info->lines + cnt); ret = smlParseJSONString(info, &dataPointStart, info->lines + cnt);
@ -1112,8 +1119,6 @@ int32_t smlParseJSON(SSmlHandle *info, char *payload) {
return smlParseJSONExt(info, payload); return smlParseJSONExt(info, payload);
} }
if(*dataPointStart == '\0') break;
if(unlikely(info->reRun)){ if(unlikely(info->reRun)){
cnt = 0; cnt = 0;
dataPointStart = payload; dataPointStart = payload;
@ -1124,6 +1129,8 @@ int32_t smlParseJSON(SSmlHandle *info, char *payload) {
} }
continue; continue;
} }
if(*dataPointStart == '\0') break;
cnt++; cnt++;
} }
info->lineNum = cnt; info->lineNum = cnt;