From 35f1f9c1cb199de2fab1575c050b80a7809b82a7 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Thu, 21 Oct 2021 17:56:15 +0800
Subject: [PATCH] code optimization

---
 src/tsdb/inc/tsdbReadImpl.h | 10 +---------
 src/tsdb/src/tsdbCommit.c   |  1 -
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/tsdb/inc/tsdbReadImpl.h b/src/tsdb/inc/tsdbReadImpl.h
index fe04e0ce2b..20d8b88c83 100644
--- a/src/tsdb/inc/tsdbReadImpl.h
+++ b/src/tsdb/inc/tsdbReadImpl.h
@@ -159,15 +159,7 @@ typedef struct {
   SBlockCol cols[];
 } SBlockData;
 
-#if 0
-typedef struct {
-  int32_t     numOfCols;  // For recovery usage
-  uint32_t    padding;
-  SAggrBlkCol cols[];
-} SAggrBlkData;
-#endif
-
-typedef void SAggrBlkData;
+typedef void SAggrBlkData;  // SBlockCol cols[];
 
 struct SReadH {
   STsdbRepo * pRepo;
diff --git a/src/tsdb/src/tsdbCommit.c b/src/tsdb/src/tsdbCommit.c
index 02d8aaeca9..eccdcbdbf6 100644
--- a/src/tsdb/src/tsdbCommit.c
+++ b/src/tsdb/src/tsdbCommit.c
@@ -1188,7 +1188,6 @@ int tsdbWriteBlockImpl(STsdbRepo *pRepo, STable *pTable, SDFile *pDFile, SDFile
 
   uint32_t aggrStatus = ((nColsNotAllNull > 0) && (rowsToWrite > 8)) ? 1 : 0;  // TODO: How to make the decision?
   if (aggrStatus > 0) {
-    // pAggrBlkData->numOfCols = nColsNotAllNull;
 
     taosCalcChecksumAppend(0, (uint8_t *)pAggrBlkData, tsizeAggr);
     tsdbUpdateDFileMagic(pDFileAggr, POINTER_SHIFT(pAggrBlkData, tsizeAggr - sizeof(TSCKSUM)));
-- 
GitLab