From b4b0db9a3d0053344bd5c75ff45c82a168036397 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Fri, 26 May 2023 23:51:18 +0800
Subject: [PATCH] more code

---
 include/util/tarray2.h                           |  4 +---
 .../vnode/src/tsdb/dev/tsdbSttFReaderWriter.c    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/include/util/tarray2.h b/include/util/tarray2.h
index 9b67c84563..9c380b5e90 100644
--- a/include/util/tarray2.h
+++ b/include/util/tarray2.h
@@ -40,13 +40,11 @@ typedef void (*TArray2Cb)(void *);
 
 #define TARRAY2_MIN_SIZE 16
 
-#define TARRAY2_INITIALIZER \
-  { 0, 0, NULL }
 #define TARRAY2_SIZE(a)       ((a)->size)
 #define TARRAY2_CAPACITY(a)   ((a)->capacity)
 #define TARRAY2_DATA(a)       ((a)->data)
 #define TARRAY2_GET(a, i)     ((a)->data[i])
-#define TARRAY2_GET_PTR(a, i) (&((a)->data[i]))
+#define TARRAY2_GET_PTR(a, i) ((a)->data + i)
 #define TARRAY2_FIRST(a)      ((a)->data[0])
 #define TARRAY2_LAST(a)       ((a)->data[(a)->size - 1])
 
diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbSttFReaderWriter.c b/source/dnode/vnode/src/tsdb/dev/tsdbSttFReaderWriter.c
index 669368c861..0055751a86 100644
--- a/source/dnode/vnode/src/tsdb/dev/tsdbSttFReaderWriter.c
+++ b/source/dnode/vnode/src/tsdb/dev/tsdbSttFReaderWriter.c
@@ -252,14 +252,14 @@ struct SSttFileWriter {
   // file
   STFile file;
   // data
-  TARRAY2(SSttBlk) sttBlkArray;
-  TARRAY2(SDelBlk) delBlkArray;
-  TARRAY2(STbStatisBlk) statisBlkArray;
-  void          *bloomFilter;  // TODO
-  SFSttFooter    footer;
-  SBlockData     bData[1];
-  SDelBlock      dData[1];
-  STbStatisBlock sData[1];
+  TSttBlkArray    sttBlkArray;
+  TDelBlkArray    delBlkArray;
+  TStatisBlkArray statisBlkArray;
+  void           *bloomFilter;  // TODO
+  SFSttFooter     footer;
+  SBlockData      bData[1];
+  SDelBlock       dData[1];
+  STbStatisBlock  sData[1];
   // helper data
   SSkmInfo skmTb;
   SSkmInfo skmRow;