From 193c9e7aa7b1ecf17e6e8d64aa15ef817b249f10 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Mon, 11 Mar 2024 02:05:02 +0000 Subject: [PATCH] Merge branch 'feature/compressData' of https://github.com/taosdata/TDengine into feature/compressData --- source/common/src/tmsg.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c index c19d759171..a66638a9e0 100644 --- a/source/common/src/tmsg.c +++ b/source/common/src/tmsg.c @@ -52,8 +52,8 @@ #define ENCODESQL() \ do { \ - if (pReq->sqlLen > 0 && pReq->sql != NULL) { \ - if (tEncodeI32(&encoder, pReq->sqlLen) < 0) return -1; \ + if (tEncodeI32(&encoder, pReq->sqlLen) < 0) return -1; \ + if (pReq->sqlLen > 0) { \ if (tEncodeBinary(&encoder, pReq->sql, pReq->sqlLen) < 0) return -1; \ } \ } while (0) @@ -7640,8 +7640,9 @@ int tEncodeSVCreateTbReq(SEncoder *pCoder, const SVCreateTbReq *pReq) { ASSERT(0); } // ENCODESQL - if (pReq->sqlLen > 0 && pReq->sql != NULL) { - if (tEncodeI32(pCoder, pReq->sqlLen) < 0) return -1; + + if (tEncodeI32(pCoder, pReq->sqlLen) < 0) return -1; + if (pReq->sqlLen > 0) { if (tEncodeBinary(pCoder, pReq->sql, pReq->sqlLen) < 0) return -1; } // Encode Column Options: encode compress level