From a6f0d2b55396d01f045f3cdc39df9b867fe5bcbb Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 30 Mar 2022 10:31:28 +0000
Subject: [PATCH] refact more

---
 source/libs/tdb/src/db/tdbPager.c |  1 -
 source/libs/tdb/src/inc/tdbOs.h   |  6 +++++-
 source/libs/tdb/test/tdbTest.cpp  | 18 ++----------------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/source/libs/tdb/src/db/tdbPager.c b/source/libs/tdb/src/db/tdbPager.c
index 748633da34..b00bba2f66 100644
--- a/source/libs/tdb/src/db/tdbPager.c
+++ b/source/libs/tdb/src/db/tdbPager.c
@@ -210,7 +210,6 @@ int tdbPagerCommit(SPager *pPager) {
 
   tdbOsClose(pPager->jfd);
   tdbOsRemove(pPager->jFileName);
-  // pPager->jfd = -1;
 
   return 0;
 }
diff --git a/source/libs/tdb/src/inc/tdbOs.h b/source/libs/tdb/src/inc/tdbOs.h
index 196bbdafc7..5259cfb4d3 100644
--- a/source/libs/tdb/src/inc/tdbOs.h
+++ b/source/libs/tdb/src/inc/tdbOs.h
@@ -95,7 +95,11 @@ typedef int tdb_fd_t;
 
 #define tdbOsOpen(PATH, OPTION, MODE) open((PATH), (OPTION), (MODE))
 
-#define tdbOsClose close
+#define tdbOsClose(FD) \
+  do {                 \
+    close(FD);         \
+    (FD) = -1;         \
+  } while (0)
 
 i64 tdbOsRead(tdb_fd_t fd, void *pData, i64 nBytes);
 i64 tdbOsPRead(tdb_fd_t fd, void *pData, i64 nBytes, i64 offset);
diff --git a/source/libs/tdb/test/tdbTest.cpp b/source/libs/tdb/test/tdbTest.cpp
index f41e2bcbee..2cb318a4d0 100644
--- a/source/libs/tdb/test/tdbTest.cpp
+++ b/source/libs/tdb/test/tdbTest.cpp
@@ -134,13 +134,7 @@ TEST(tdb_test, simple_test) {
     char val[64];
 
     {  // Insert some data
-      int       i = 1;
-      SPoolMem *pPool;
-      int       memPoolCapacity = 16 * 1024;
-
-      pPool = openPool();
-
-      tdbTxnBegin(pEnv);
+      int i = 1;
 
       for (;;) {
         if (i > nData) break;
@@ -150,18 +144,10 @@ TEST(tdb_test, simple_test) {
         ret = tdbDbInsert(pDb, key, strlen(key), val, strlen(val));
         GTEST_ASSERT_EQ(ret, 0);
 
-        if (pPool->size >= memPoolCapacity) {
-          tdbTxnCommit(pEnv);
-
-          clearPool(pPool);
-
-          tdbTxnBegin(pEnv);
-        }
-
         i++;
       }
 
-      closePool(pPool);
+      // tdbPagerCommit()
     }
 
     {  // Query the data
-- 
GitLab