From 05d69e77ce45e83cff563fcb3a58feedf4fa53d9 Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Thu, 12 Aug 2021 09:49:31 +0800 Subject: [PATCH] [TD-5623]: removed compressed from SSqlRes --- src/client/inc/tsclient.h | 1 - src/client/src/tscServer.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h index b025ca17c3..b6821de87a 100644 --- a/src/client/inc/tsclient.h +++ b/src/client/inc/tsclient.h @@ -303,7 +303,6 @@ typedef struct { int16_t numOfCols; int16_t precision; bool completed; - bool compressed; int32_t code; int32_t numOfGroups; SResRec * pGroupRec; diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c index 452bbb1117..29c0eb693f 100644 --- a/src/client/src/tscServer.c +++ b/src/client/src/tscServer.c @@ -2702,6 +2702,7 @@ static void decompressQueryColData(SSqlRes *pRes, SQueryInfo* pQueryInfo, char * decompLen +=flen; pData += htonl(compSizes[i]); } + /* Resize rsp as decompressed data will occupy more space */ pRes->rspLen = pRes->rspLen - (compLen + numOfCols * sizeof(int32_t)) + decompLen; char *new_rsp = (char *)realloc(pRes->pRsp, pRes->rspLen); @@ -2738,7 +2739,6 @@ int tscProcessRetrieveRspFromNode(SSqlObj *pSql) { pRes->offset = htobe64(pRetrieve->offset); pRes->useconds = htobe64(pRetrieve->useconds); pRes->completed = (pRetrieve->completed == 1); - pRes->compressed = (pRetrieve->compressed == 1); pRes->data = pRetrieve->data; SQueryInfo* pQueryInfo = tscGetQueryInfo(pCmd); @@ -2747,9 +2747,9 @@ int tscProcessRetrieveRspFromNode(SSqlObj *pSql) { } //Decompress col data if compressed from server - if (pRes->compressed) { + if (pRetrieve->compressed) { int32_t compLen = htonl(pRetrieve->compLen); - decompressQueryColData(pRes, pQueryInfo, &pRes->data, pRes->compressed, compLen); + decompressQueryColData(pRes, pQueryInfo, &pRes->data, pRetrieve->compressed, compLen); } STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);