From 3c4b16b8bcf93477022062a1f4ca0f02ede8edfe Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 24 Sep 2024 09:56:42 +0800
Subject: [PATCH] make it  compile

---
 source/libs/tdb/test/tdbExOVFLTest.cpp        | 12 ++++------
 .../libs/tdb/test/tdbPageDefragmentTest.cpp   | 12 ++++------
 source/libs/tdb/test/tdbPageRecycleTest.cpp   | 23 +++++++------------
 source/libs/tdb/test/tdbTest.cpp              | 12 ++++------
 4 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/source/libs/tdb/test/tdbExOVFLTest.cpp b/source/libs/tdb/test/tdbExOVFLTest.cpp
index a2deba4696..388a812ff5 100644
--- a/source/libs/tdb/test/tdbExOVFLTest.cpp
+++ b/source/libs/tdb/test/tdbExOVFLTest.cpp
@@ -197,8 +197,7 @@ static void insertOfp(void) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 }
 
 // TEST(TdbOVFLPagesTest, DISABLED_TbInsertTest) {
@@ -247,8 +246,7 @@ TEST(TdbOVFLPagesTest, TbGetTest) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 }
 
 // TEST(TdbOVFLPagesTest, DISABLED_TbDeleteTest) {
@@ -357,8 +355,7 @@ tdbBegin(pEnv, &txn);
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 }
 
 // TEST(tdb_test, DISABLED_simple_insert1) {
@@ -492,6 +489,5 @@ TEST(tdb_test, simple_insert1) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 }
diff --git a/source/libs/tdb/test/tdbPageDefragmentTest.cpp b/source/libs/tdb/test/tdbPageDefragmentTest.cpp
index b64517c787..85b5c6e6b3 100644
--- a/source/libs/tdb/test/tdbPageDefragmentTest.cpp
+++ b/source/libs/tdb/test/tdbPageDefragmentTest.cpp
@@ -468,8 +468,7 @@ TEST(TdbPageDefragmentTest, DISABLED_simple_insert1) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 }
 
 // TEST(TdbPageDefragmentTest, DISABLED_seq_insert) {
@@ -551,8 +550,7 @@ TEST(TdbPageDefragmentTest, seq_insert) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 }
 
 // TEST(TdbPageDefragmentTest, DISABLED_seq_delete) {
@@ -635,8 +633,7 @@ TEST(TdbPageDefragmentTest, seq_delete) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 }
 
 // TEST(TdbPageDefragmentTest, DISABLED_defragment_insert) {
@@ -717,6 +714,5 @@ TEST(TdbPageDefragmentTest, defragment_insert) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 }
diff --git a/source/libs/tdb/test/tdbPageRecycleTest.cpp b/source/libs/tdb/test/tdbPageRecycleTest.cpp
index bbbd90e73d..30e1081d0c 100644
--- a/source/libs/tdb/test/tdbPageRecycleTest.cpp
+++ b/source/libs/tdb/test/tdbPageRecycleTest.cpp
@@ -123,7 +123,7 @@ static int tDefaultKeyCmpr(const void *pKey1, int keyLen1, const void *pKey2, in
 static TDB *openEnv(char const *envName, int const pageSize, int const pageNum) {
   TDB *pEnv = NULL;
 
-  int ret = tdbOpen(envName, pageSize, pageNum, &pEnv, 0 , 0, NULL);
+  int ret = tdbOpen(envName, pageSize, pageNum, &pEnv, 0, 0, NULL);
   if (ret) {
     pEnv = NULL;
   }
@@ -187,8 +187,7 @@ static void insertOfp(void) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 }
 
 static void clearDb(char const *db) { taosRemoveDir(db); }
@@ -471,8 +470,7 @@ TEST(TdbPageRecycleTest, DISABLED_simple_insert1) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 }
 
 static void insertDb(int nData) {
@@ -537,8 +535,7 @@ static void insertDb(int nData) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 
   system("ls -l ./tdb");
 }
@@ -607,8 +604,7 @@ static void deleteDb(int nData) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 
   system("ls -l ./tdb");
 }
@@ -675,8 +671,7 @@ static void deleteOfp(void) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 }
 
 // TEST(TdbPageRecycleTest, DISABLED_seq_delete_ofp) {
@@ -761,8 +756,7 @@ TEST(TdbPageRecycleTest, recycly_seq_insert_ofp_nocommit) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 
   system("ls -l ./tdb");
 }
@@ -828,8 +822,7 @@ TEST(TdbPageRecycleTest, recycly_delete_interior_ofp_nocommit) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 
   system("ls -l ./tdb");
 }
diff --git a/source/libs/tdb/test/tdbTest.cpp b/source/libs/tdb/test/tdbTest.cpp
index e358ac0197..a8fdce2c38 100644
--- a/source/libs/tdb/test/tdbTest.cpp
+++ b/source/libs/tdb/test/tdbTest.cpp
@@ -231,8 +231,7 @@ TEST(tdb_test, DISABLED_simple_insert1) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 }
 
 TEST(tdb_test, DISABLED_simple_insert2) {
@@ -315,8 +314,7 @@ TEST(tdb_test, DISABLED_simple_insert2) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 }
 
 TEST(tdb_test, DISABLED_simple_delete1) {
@@ -620,8 +618,7 @@ TEST(tdb_test, multi_thread_query) {
   tdbTbClose(pDb);
 
   // Close Env
-  ret = tdbClose(pEnv);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 }
 
 TEST(tdb_test, DISABLED_multi_thread1) {
@@ -745,7 +742,6 @@ TEST(tdb_test, DISABLED_multi_thread1) {
   tdbTbClose(pTb);
 
   // Close Env
-  ret = tdbClose(pDb);
-  GTEST_ASSERT_EQ(ret, 0);
+  tdbClose(pEnv);
 #endif
 }