From 97010fd7a78453e2022d8ee5ac2300aa04a0d493 Mon Sep 17 00:00:00 2001
From: hzcheng <hzcheng@taosdata.com>
Date: Fri, 1 May 2020 15:46:11 +0800
Subject: [PATCH] TD-166

---
 src/tsdb/src/tsdbRWHelper.c | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/tsdb/src/tsdbRWHelper.c b/src/tsdb/src/tsdbRWHelper.c
index ee2f29ea55..170decc13e 100644
--- a/src/tsdb/src/tsdbRWHelper.c
+++ b/src/tsdb/src/tsdbRWHelper.c
@@ -570,24 +570,14 @@ static int tsdbCheckAndDecodeColumnData(SDataCol *pDataCol, char *content, int32
     pDataCol->len = (*(tDataTypeDesc[pDataCol->type].decompFunc))(
         content, len - sizeof(TSCKSUM), numOfPoints, pDataCol->pData, pDataCol->spaceSize, comp, buffer, bufferSize);
     if (pDataCol->type == TSDB_DATA_TYPE_BINARY || pDataCol->type == TSDB_DATA_TYPE_NCHAR) {
-      pDataCol->len += (sizeof(int32_t) * maxPoints);
       dataColSetOffset(pDataCol, numOfPoints);
     }
   } else {
     // No need to decompress, just memcpy it
-    switch (pDataCol->type) {
-      case TSDB_DATA_TYPE_BINARY:
-      case TSDB_DATA_TYPE_NCHAR:
-        pDataCol->len = sizeof(int32_t) * maxPoints;
-        memcpy((char *)pDataCol->pData + pDataCol->len, content, len - sizeof(TSCKSUM));
-        pDataCol->len += (len - sizeof(TSCKSUM));
-        dataColSetOffset(pDataCol, numOfPoints);
-        break;
-
-      default:
-        pDataCol->len = len - sizeof(TSCKSUM);
-        memcpy(pDataCol->pData, content, pDataCol->len);
-        break;
+    pDataCol->len = len - sizeof(TSCKSUM);
+    memcpy(pDataCol->pData, content, pDataCol->len);
+    if (pDataCol->type == TSDB_DATA_TYPE_BINARY || pDataCol->type == TSDB_DATA_TYPE_NCHAR) {
+      dataColSetOffset(pDataCol, numOfPoints);
     }
   }
   return 0;
-- 
GitLab