From 28d83d6ab6196131de80a0965611498470d12a2e Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 6 Mar 2024 16:42:54 +0800
Subject: [PATCH] more code

---
 include/common/tdataformat.h           |  3 +--
 source/common/src/tdataformat.c        | 23 ++++++++++-------------
 source/dnode/vnode/src/tsdb/tsdbUtil.c |  5 ++---
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/include/common/tdataformat.h b/include/common/tdataformat.h
index 2797042f9a..820dcd8285 100644
--- a/include/common/tdataformat.h
+++ b/include/common/tdataformat.h
@@ -176,8 +176,7 @@ int32_t tColDataCopy(SColData *pColDataFrom, SColData *pColData, xMallocFn xMall
 extern void (*tColDataCalcSMA[])(SColData *pColData, int64_t *sum, int64_t *max, int64_t *min, int16_t *numOfNull);
 
 int32_t tColDataCompress(SColData *colData, SColDataCompressInfo *info, SBuffer *output, SBuffer *assist);
-int32_t tColDataDecompress(void *input, int32_t inputSize, SColDataCompressInfo *info, SColData *colData,
-                           SBuffer *assist);
+int32_t tColDataDecompress(void *input, SColDataCompressInfo *info, SColData *colData, SBuffer *assist);
 
 // for stmt bind
 int32_t tColDataAddValueByBind(SColData *pColData, TAOS_MULTI_BIND *pBind, int32_t buffMaxLen);
diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c
index a34b420ad3..d9f37a10b4 100644
--- a/source/common/src/tdataformat.c
+++ b/source/common/src/tdataformat.c
@@ -2678,13 +2678,10 @@ int32_t tColDataCompress(SColData *colData, SColDataCompressInfo *info, SBuffer
   return 0;
 }
 
-int32_t tColDataDecompress(void *input, int32_t inputSize, SColDataCompressInfo *info, SColData *colData,
-                           SBuffer *assist) {
-  int32_t code;
-  SBuffer local;
-  char   *inputStart = input;
-
-  ASSERT(inputSize == info->bitmapCompressedSize + info->offsetCompressedSize + info->dataCompressedSize);
+int32_t tColDataDecompress(void *input, SColDataCompressInfo *info, SColData *colData, SBuffer *assist) {
+  int32_t  code;
+  SBuffer  local;
+  uint8_t *data = (uint8_t *)input;
 
   tBufferInit(&local);
   if (assist == NULL) {
@@ -2717,13 +2714,13 @@ int32_t tColDataDecompress(void *input, int32_t inputSize, SColDataCompressInfo
       return code;
     }
 
-    code = tDecompressData(inputStart, &cinfo, colData->pBitMap, cinfo.originalSize, assist);
+    code = tDecompressData(data, &cinfo, colData->pBitMap, cinfo.originalSize, assist);
     if (code) {
       tBufferDestroy(&local);
       return code;
     }
 
-    inputStart += cinfo.compressedSize;
+    data += cinfo.compressedSize;
   }
 
   if (info->flag == (HAS_NONE | HAS_NULL)) {
@@ -2745,13 +2742,13 @@ int32_t tColDataDecompress(void *input, int32_t inputSize, SColDataCompressInfo
       return code;
     }
 
-    code = tDecompressData(inputStart, &cinfo, colData->aOffset, cinfo.originalSize, assist);
+    code = tDecompressData(data, &cinfo, colData->aOffset, cinfo.originalSize, assist);
     if (code) {
       tBufferDestroy(&local);
       return code;
     }
 
-    inputStart += cinfo.compressedSize;
+    data += cinfo.compressedSize;
   }
 
   // data
@@ -2771,13 +2768,13 @@ int32_t tColDataDecompress(void *input, int32_t inputSize, SColDataCompressInfo
       return code;
     }
 
-    code = tDecompressData(inputStart, &cinfo, colData->pData, cinfo.originalSize, assist);
+    code = tDecompressData(data, &cinfo, colData->pData, cinfo.originalSize, assist);
     if (code) {
       tBufferDestroy(&local);
       return code;
     }
 
-    inputStart += cinfo.compressedSize;
+    data += cinfo.compressedSize;
   }
 
 _exit:
diff --git a/source/dnode/vnode/src/tsdb/tsdbUtil.c b/source/dnode/vnode/src/tsdb/tsdbUtil.c
index ee8c8074a6..ac87c6a41e 100644
--- a/source/dnode/vnode/src/tsdb/tsdbUtil.c
+++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c
@@ -1561,10 +1561,9 @@ int32_t tBlockDataDecompressColData(const SDiskDataHdr *hdr, const SBlockCol *bl
       break;
   }
 
-  int32_t totalCompressedSize = blockCol->szBitmap + blockCol->szOffset + blockCol->szValue;
-  code = tColDataDecompress(BR_PTR(br), totalCompressedSize, &info, colData, assist);
+  code = tColDataDecompress(BR_PTR(br), &info, colData, assist);
   TSDB_CHECK_CODE(code, lino, _exit);
-  br->offset += totalCompressedSize;
+  br->offset += blockCol->szBitmap + blockCol->szOffset + blockCol->szValue;
 
 _exit:
   return code;