Skip to content

T
TDengine

taosdata / TDengine
接近 2 年 前同步成功

通知 1192
Star 22018
Fork 4786
T
TDengine
提交 5d3e07c0 编写于 作者: wmmhello's avatar wmmhello
浏览文件
操作

fix:conflict from 3.0

上级 f9d5c809
隐藏空白更改
内联 并排
Showing with 4 addition and 6 deletion
source/client/src/tmq.c
浏览文件 @ 5d3e07c0
...@@ -2114,8 +2114,8 @@ static char *buildCreateCTableJson(STag* pTag, char* sname, char* name, int64_t ...@@ -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 ...@@ -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);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或