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

fix:conflict from 3.0

This commit is contained in:
wangmm0220 2022-07-11 19:10:41 +08:00
parent f9d5c809c9
commit 5d3e07c022
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2114,8 +2114,8 @@ static char *buildCreateCTableJson(STag* pTag, char* sname, char* name, int64_t
// cJSON* tname = cJSON_CreateString(pTagVal->colName); // cJSON* tname = cJSON_CreateString(pTagVal->colName);
// cJSON_AddItemToObject(tag, "name", tname); // cJSON_AddItemToObject(tag, "name", tname);
cJSON* cid_ = cJSON_CreateString(""); // cJSON* cid_ = cJSON_CreateString("");
cJSON_AddItemToObject(tag, "cid", cid_); // cJSON_AddItemToObject(tag, "cid", cid_);
cJSON* ttype = cJSON_CreateNumber(TSDB_DATA_TYPE_JSON); cJSON* ttype = cJSON_CreateNumber(TSDB_DATA_TYPE_JSON);
cJSON_AddItemToObject(tag, "type", ttype); cJSON_AddItemToObject(tag, "type", ttype);
cJSON* tvalue = cJSON_CreateString(pJson); cJSON* tvalue = cJSON_CreateString(pJson);
@ -2130,10 +2130,8 @@ static char *buildCreateCTableJson(STag* pTag, char* sname, char* name, int64_t
cJSON* tag = cJSON_CreateObject(); cJSON* tag = cJSON_CreateObject();
char cid[32] = {0}; cJSON* cid = cJSON_CreateNumber(pTagVal->cid);
sprintf(cid, "%d", pTagVal->cid); cJSON_AddItemToObject(tag, "cid", cid);
cJSON* cid_ = cJSON_CreateString(cid);
cJSON_AddItemToObject(tag, "cid", cid_);
cJSON* ttype = cJSON_CreateNumber(pTagVal->type); cJSON* ttype = cJSON_CreateNumber(pTagVal->type);
cJSON_AddItemToObject(tag, "type", ttype); cJSON_AddItemToObject(tag, "type", ttype);