From 8cfc194c1cca1055fea2d8a2504f4ead6bd3e5d2 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Fri, 25 Mar 2022 15:23:12 +0800 Subject: [PATCH 1/3] feature/scheduler --- source/libs/nodes/src/nodesCodeFuncs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/libs/nodes/src/nodesCodeFuncs.c b/source/libs/nodes/src/nodesCodeFuncs.c index 6e60c6cadc..11cae9a142 100644 --- a/source/libs/nodes/src/nodesCodeFuncs.c +++ b/source/libs/nodes/src/nodesCodeFuncs.c @@ -1418,6 +1418,7 @@ static int32_t datumToJson(const void* pObj, SJson* pJson) { case TSDB_DATA_TYPE_VARCHAR: case TSDB_DATA_TYPE_VARBINARY: code = tjsonAddStringToObject(pJson, jkValueDatum, varDataVal(pNode->datum.p)); + nodesDebug("!!!!!!!!tojson, value:%s", varDataVal(pNode->datum.p)); break; case TSDB_DATA_TYPE_JSON: case TSDB_DATA_TYPE_DECIMAL: From d47015d4ebe1a986c7f0431824a79944f1e505c2 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Fri, 25 Mar 2022 15:29:59 +0800 Subject: [PATCH 2/3] feature/scheduler --- source/libs/nodes/src/nodesCloneFuncs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/libs/nodes/src/nodesCloneFuncs.c b/source/libs/nodes/src/nodesCloneFuncs.c index 12cd6f1bc1..60692323f5 100644 --- a/source/libs/nodes/src/nodesCloneFuncs.c +++ b/source/libs/nodes/src/nodesCloneFuncs.c @@ -141,12 +141,12 @@ static SNode* valueNodeCopy(const SValueNode* pSrc, SValueNode* pDst) { case TSDB_DATA_TYPE_NCHAR: case TSDB_DATA_TYPE_VARCHAR: case TSDB_DATA_TYPE_VARBINARY: - pDst->datum.p = malloc(pSrc->node.resType.bytes + VARSTR_HEADER_SIZE); + pDst->datum.p = malloc(pSrc->node.resType.bytes + VARSTR_HEADER_SIZE + 1); if (NULL == pDst->datum.p) { nodesDestroyNode(pDst); return NULL; } - memcpy(pDst->datum.p, pSrc->datum.p, pSrc->node.resType.bytes + VARSTR_HEADER_SIZE); + memcpy(pDst->datum.p, pSrc->datum.p, pSrc->node.resType.bytes + VARSTR_HEADER_SIZE + 1); break; case TSDB_DATA_TYPE_JSON: case TSDB_DATA_TYPE_DECIMAL: From 0a0699e4f934ad08c357fc5fa7d85204830b8b56 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Fri, 25 Mar 2022 15:32:16 +0800 Subject: [PATCH 3/3] feature/scheduler --- source/libs/nodes/src/nodesCodeFuncs.c | 9 +-------- source/libs/parser/src/parTranslater.c | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/source/libs/nodes/src/nodesCodeFuncs.c b/source/libs/nodes/src/nodesCodeFuncs.c index 39a1b24e2e..eed97234cc 100644 --- a/source/libs/nodes/src/nodesCodeFuncs.c +++ b/source/libs/nodes/src/nodesCodeFuncs.c @@ -2430,11 +2430,4 @@ int32_t nodesStringToList(const char* pStr, SNodeList** pList) { if (NULL == pJson) { return TSDB_CODE_FAILED; } - int32_t code = jsonToNodeListImpl(pJson, pList); - if (TSDB_CODE_SUCCESS != code) { - nodesDestroyList(*pList); - terrno = code; - return code; - } - return TSDB_CODE_SUCCESS; -} + int32_t \ No newline at end of file diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index af4351500d..1998fbc626 100644 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -404,7 +404,6 @@ static EDealRes translateValue(STranslateContext* pCxt, SValueNode* pVal) { } varDataSetLen(pVal->datum.p, pVal->node.resType.bytes); strncpy(varDataVal(pVal->datum.p), pVal->literal, pVal->node.resType.bytes); - parserDebug("!!!!!!!!!!!!value:%s,len:%d", pVal->literal, pVal->node.resType.bytes); break; } case TSDB_DATA_TYPE_TIMESTAMP: {