提交 f9644f26 编写于 作者: D dapan1121

feature/qnode

上级 18c85e65
...@@ -1418,7 +1418,6 @@ static int32_t datumToJson(const void* pObj, SJson* pJson) { ...@@ -1418,7 +1418,6 @@ static int32_t datumToJson(const void* pObj, SJson* pJson) {
case TSDB_DATA_TYPE_VARCHAR: case TSDB_DATA_TYPE_VARCHAR:
case TSDB_DATA_TYPE_VARBINARY: case TSDB_DATA_TYPE_VARBINARY:
code = tjsonAddStringToObject(pJson, jkValueDatum, varDataVal(pNode->datum.p)); code = tjsonAddStringToObject(pJson, jkValueDatum, varDataVal(pNode->datum.p));
nodesDebug("!!!!!!!!tojson, value:%s", varDataVal(pNode->datum.p));
break; break;
case TSDB_DATA_TYPE_JSON: case TSDB_DATA_TYPE_JSON:
case TSDB_DATA_TYPE_DECIMAL: case TSDB_DATA_TYPE_DECIMAL:
...@@ -1488,7 +1487,6 @@ static int32_t jsonToDatum(const SJson* pJson, void* pObj) { ...@@ -1488,7 +1487,6 @@ static int32_t jsonToDatum(const SJson* pJson, void* pObj) {
} }
varDataSetLen(pNode->datum.p, pNode->node.resType.bytes); varDataSetLen(pNode->datum.p, pNode->node.resType.bytes);
code = tjsonGetStringValue(pJson, jkValueDatum, varDataVal(pNode->datum.p)); code = tjsonGetStringValue(pJson, jkValueDatum, varDataVal(pNode->datum.p));
nodesDebug("varchar len:%d,string:%s", pNode->node.resType.bytes, varDataVal(pNode->datum.p));
break; break;
} }
case TSDB_DATA_TYPE_JSON: case TSDB_DATA_TYPE_JSON:
...@@ -2430,4 +2428,11 @@ int32_t nodesStringToList(const char* pStr, SNodeList** pList) { ...@@ -2430,4 +2428,11 @@ int32_t nodesStringToList(const char* pStr, SNodeList** pList) {
if (NULL == pJson) { if (NULL == pJson) {
return TSDB_CODE_FAILED; return TSDB_CODE_FAILED;
} }
int32_t int32_t code = jsonToNodeListImpl(pJson, pList);
\ No newline at end of file if (TSDB_CODE_SUCCESS != code) {
nodesDestroyList(*pList);
terrno = code;
return code;
}
return TSDB_CODE_SUCCESS;
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册