From 6dcd5cfae921741b94796bbcd610a66a9dc54a6c Mon Sep 17 00:00:00 2001 From: dmchen Date: Thu, 14 Sep 2023 15:21:59 +0800 Subject: [PATCH 1/2] null sql --- source/common/src/tmsg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c index 4b597d0a0f..b15e5dcb77 100644 --- a/source/common/src/tmsg.c +++ b/source/common/src/tmsg.c @@ -45,7 +45,9 @@ #define ENCODESQL() \ do { \ if (tEncodeI32(&encoder, pReq->sqlLen) < 0) return -1; \ - if (tEncodeCStr(&encoder, pReq->sql) < 0) return -1; \ + if (pReq->sqlLen > 0){ \ + if (tEncodeCStr(&encoder, pReq->sql) < 0) return -1; \ + } \ } while (0) #define FREESQL() \ @@ -6843,7 +6845,9 @@ int tEncodeSVCreateTbReq(SEncoder *pCoder, const SVCreateTbReq *pReq) { ASSERT(0); } if (tEncodeI32(pCoder, pReq->sqlLen) < 0) return -1; - if (tEncodeCStr(pCoder, pReq->sql) < 0) return -1; + if(pReq->sqlLen > 0) { + if (tEncodeCStr(pCoder, pReq->sql) < 0) return -1; + } tEndEncode(pCoder); return 0; From 3bcb8d5a86a116e646aa25bdd6fc40dbb9b17edd Mon Sep 17 00:00:00 2001 From: dmchen Date: Fri, 15 Sep 2023 09:18:20 +0800 Subject: [PATCH 2/2] is end --- source/common/src/tmsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c index b15e5dcb77..04c86938de 100644 --- a/source/common/src/tmsg.c +++ b/source/common/src/tmsg.c @@ -6891,7 +6891,7 @@ int tDecodeSVCreateTbReq(SDecoder *pCoder, SVCreateTbReq *pReq) { ASSERT(0); } - if(tDecodeIsEnd(pCoder)){ + if(!tDecodeIsEnd(pCoder)){ if(tDecodeI32(pCoder, &pReq->sqlLen) < 0) return -1; if(pReq->sqlLen > 0){ pReq->sql = taosMemoryCalloc(1, pReq->sqlLen + 1);