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

fix: json null

This commit is contained in:
wangmm0220 2022-07-13 20:42:49 +08:00
parent d3cdd75b94
commit 56ec0a3920
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/client/src/tmq.c
View File

@ -2269,7 +2269,12 @@ static char *processAlterTable(SMqMetaRsp *metaRsp){
cJSON* tagName = cJSON_CreateString(vAlterTbReq.tagName); cJSON* tagName = cJSON_CreateString(vAlterTbReq.tagName);
cJSON_AddItemToObject(json, "colName", tagName); cJSON_AddItemToObject(json, "colName", tagName);
if (!vAlterTbReq.isNull){ bool isNull = vAlterTbReq.isNull;
if(vAlterTbReq.tagType == TSDB_DATA_TYPE_JSON){
STag *jsonTag = (STag *)vAlterTbReq.pTagVal;
if(jsonTag->nTag == 0) isNull = true;
}
if (!isNull){
char* buf = NULL; char* buf = NULL;
if (vAlterTbReq.tagType == TSDB_DATA_TYPE_JSON) { if (vAlterTbReq.tagType == TSDB_DATA_TYPE_JSON) {
@ -2285,8 +2290,8 @@ static char *processAlterTable(SMqMetaRsp *metaRsp){
taosMemoryFree(buf); taosMemoryFree(buf);
} }
cJSON* isNull = cJSON_CreateBool(vAlterTbReq.isNull); cJSON* isNullCJson = cJSON_CreateBool(isNull);
cJSON_AddItemToObject(json, "colValueNull", isNull); cJSON_AddItemToObject(json, "colValueNull", isNullCJson);
break; break;
} }
default: default:

3
source/libs/parser/src/parTranslater.c
View File

@ -5872,9 +5872,6 @@ static int32_t buildUpdateTagValReq(STranslateContext* pCxt, SAlterTableStmt* pS
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
return code; return code;
} }
if(pTag->nTag == 0){
pReq->isNull = true;
}
pReq->nTagVal = pTag->len; pReq->nTagVal = pTag->len;
pReq->pTagVal = (uint8_t*)pTag; pReq->pTagVal = (uint8_t*)pTag;
pStmt->pVal->datum.p = (char*)pTag; // for free pStmt->pVal->datum.p = (char*)pTag; // for free