diff --git a/include/dnode/vnode/tsdb/tsdb.h b/include/dnode/vnode/tsdb/tsdb.h
index 33528db112..3aeef4d013 100644
--- a/include/dnode/vnode/tsdb/tsdb.h
+++ b/include/dnode/vnode/tsdb/tsdb.h
@@ -34,7 +34,7 @@ typedef struct SDataStatis {
 } SDataStatis;
 
 typedef struct STable {
-  int32_t   tid;
+  uint64_t  tid;
   uint64_t  uid;
   STSchema *pSchema;
 } STable;
diff --git a/source/dnode/vnode/tsdb/CMakeLists.txt b/source/dnode/vnode/tsdb/CMakeLists.txt
index 0d77518100..65dc95a9d8 100644
--- a/source/dnode/vnode/tsdb/CMakeLists.txt
+++ b/source/dnode/vnode/tsdb/CMakeLists.txt
@@ -2,7 +2,7 @@ aux_source_directory(src TSDB_SRC)
 if(0)
     add_library(tsdb ${TSDB_SRC})
 else(0)
-    add_library(tsdb "")
+    add_library(tsdb STATIC "")
     target_sources(tsdb
         PRIVATE
         "src/tsdbCommit.c"
diff --git a/source/dnode/vnode/tsdb/src/tsdbCommit.c b/source/dnode/vnode/tsdb/src/tsdbCommit.c
index f4162d0652..2be032a335 100644
--- a/source/dnode/vnode/tsdb/src/tsdbCommit.c
+++ b/source/dnode/vnode/tsdb/src/tsdbCommit.c
@@ -421,12 +421,10 @@ static int tsdbCreateCommitIters(SCommitH *pCommith) {
     pCommitIter->pIter = tSkipListCreateIter(pTbData->pData);
     tSkipListIterNext(pCommitIter->pIter);
 
-#if 0
-    // TODO
     pCommitIter->pTable = (STable *)malloc(sizeof(STable));
     pCommitIter->pTable->uid = pTbData->uid;
-    pCommitIter->pTable->pSchema = metaGetTableSchema();
-#endif
+    pCommitIter->pTable->tid = pTbData->uid;
+    pCommitIter->pTable->pSchema = metaGetTbTSchema(pRepo->pMeta, pTbData->uid, 0);
   }
 
   return 0;
@@ -437,6 +435,8 @@ static void tsdbDestroyCommitIters(SCommitH *pCommith) {
 
   for (int i = 1; i < pCommith->niters; i++) {
     tSkipListDestroyIter(pCommith->iters[i].pIter);
+    tdFreeSchema(pCommith->iters[i].pTable->pSchema);
+    free(pCommith->iters[i].pTable);
   }
 
   free(pCommith->iters);