From 314e1e1af423094e1ae68abd1e5c1a974dd119d8 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Fri, 21 Jan 2022 10:14:39 +0000
Subject: [PATCH] more tdb

---
 source/libs/tdb/CMakeLists.txt        |  2 +-
 source/libs/tdb/src/db/tdb_mpool.c    |  2 +-
 source/libs/tdb/src/inc/tdb_mpool.h   |  4 +++-
 source/libs/tdb/test/CMakeLists.txt   |  4 ++++
 source/libs/tdb/test/tdbMPoolTest.cpp | 31 +++++++++++++++++++++++++++
 source/libs/tdb/test/tdbTest.cpp      |  4 ++--
 6 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 source/libs/tdb/test/tdbMPoolTest.cpp

diff --git a/source/libs/tdb/CMakeLists.txt b/source/libs/tdb/CMakeLists.txt
index bb8904117c..3cb5a65572 100644
--- a/source/libs/tdb/CMakeLists.txt
+++ b/source/libs/tdb/CMakeLists.txt
@@ -18,5 +18,5 @@ target_link_libraries(
 )
 
 if(${BUILD_TEST})
-    # add_subdirectory(test)
+    add_subdirectory(test)
 endif(${BUILD_TEST})
diff --git a/source/libs/tdb/src/db/tdb_mpool.c b/source/libs/tdb/src/db/tdb_mpool.c
index a6df79c9b3..9b67f405a9 100644
--- a/source/libs/tdb/src/db/tdb_mpool.c
+++ b/source/libs/tdb/src/db/tdb_mpool.c
@@ -225,7 +225,7 @@ int tdbMPoolFileGetPage(TDB_MPFILE *mpf, pgno_t pgno, void *addr) {
   return 0;
 }
 
-int tdbMPoolFilePutPage(TDB_MPOOL *mpf, pgno_t pgno, void *addr) {
+int tdbMPoolFilePutPage(TDB_MPFILE *mpf, pgno_t pgno, void *addr) {
   // TODO
   return 0;
 }
diff --git a/source/libs/tdb/src/inc/tdb_mpool.h b/source/libs/tdb/src/inc/tdb_mpool.h
index d951040d8d..37c82f3833 100644
--- a/source/libs/tdb/src/inc/tdb_mpool.h
+++ b/source/libs/tdb/src/inc/tdb_mpool.h
@@ -76,6 +76,7 @@ struct TDB_MPFILE {
 // TDB_MPOOL
 int tdbMPoolOpen(TDB_MPOOL **mpp, uint64_t cachesize, pgsize_t pgsize);
 int tdbMPoolClose(TDB_MPOOL *mp);
+int tdbMPoolSync(TDB_MPOOL *mp);
 
 // TDB_MPFILE
 int tdbMPoolFileOpen(TDB_MPFILE **mpfp, const char *fname, TDB_MPOOL *mp);
@@ -83,7 +84,8 @@ int tdbMPoolFileClose(TDB_MPFILE *mpf);
 int tdbMPoolFileNewPage(TDB_MPFILE *mpf, pgno_t *pgno, void *addr);
 int tdbMPoolFileFreePage(TDB_MPOOL *mpf, pgno_t *pgno, void *addr);
 int tdbMPoolFileGetPage(TDB_MPFILE *mpf, pgno_t pgno, void *addr);
-int tdbMPoolFilePutPage(TDB_MPOOL *mpf, pgno_t pgno, void *addr);
+int tdbMPoolFilePutPage(TDB_MPFILE *mpf, pgno_t pgno, void *addr);
+int tdbMPoolFileSync(TDB_MPFILE *mpf);
 
 #ifdef __cplusplus
 }
diff --git a/source/libs/tdb/test/CMakeLists.txt b/source/libs/tdb/test/CMakeLists.txt
index 2d77c1f4e9..7fbfaf5506 100644
--- a/source/libs/tdb/test/CMakeLists.txt
+++ b/source/libs/tdb/test/CMakeLists.txt
@@ -1,3 +1,7 @@
+# tdbMPoolTest
+add_executable(tdbMPoolTest "tdbMPoolTest.cpp")
+target_link_libraries(tdbMPoolTest tdb gtest gtest_main)
+
 # tdbTest
 add_executable(tdbTest "tdbTest.cpp")
 target_link_libraries(tdbTest tdb gtest gtest_main)
\ No newline at end of file
diff --git a/source/libs/tdb/test/tdbMPoolTest.cpp b/source/libs/tdb/test/tdbMPoolTest.cpp
new file mode 100644
index 0000000000..17381759fb
--- /dev/null
+++ b/source/libs/tdb/test/tdbMPoolTest.cpp
@@ -0,0 +1,31 @@
+#include "gtest/gtest.h"
+
+#include <iostream>
+
+#include "tdb_mpool.h"
+
+TEST(tdb_mpool_test, test1) {
+  TDB_MPOOL * mp;
+  TDB_MPFILE *mpf;
+  pgno_t      pgno;
+  void *      pgdata;
+
+  // open mp
+  tdbMPoolOpen(&mp, 16384, 4096);
+
+  // open mpf
+  tdbMPoolFileOpen(&mpf, "test.db", mp);
+
+#define TEST1_TOTAL_PAGES 100
+  for (int i = 0; i < TEST1_TOTAL_PAGES; i++) {
+    tdbMPoolFileNewPage(mpf, &pgno, pgdata);
+
+    *(pgno_t *)pgdata = i;
+  }
+
+  // close mpf
+  tdbMPoolFileClose(mpf);
+
+  // close mp
+  tdbMPoolClose(mp);
+}
diff --git a/source/libs/tdb/test/tdbTest.cpp b/source/libs/tdb/test/tdbTest.cpp
index f27e17f1ca..113bb2560f 100644
--- a/source/libs/tdb/test/tdbTest.cpp
+++ b/source/libs/tdb/test/tdbTest.cpp
@@ -3,8 +3,8 @@
 #include "tdb.h"
 
 TEST(tdb_api_test, tdb_create_open_close_db_test) {
-  int  ret;
-  TDB *dbp;
+  // int  ret;
+  // TDB *dbp;
 
   // tdbCreateDB(&dbp, TDB_BTREE_T);