From 632bb1b4d2c63e24b6fdf9f61ebb03a05102aa54 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 20 Jan 2022 05:13:32 +0000 Subject: [PATCH] refact --- source/libs/tdb/src/db/tdb_mpool.c | 4 ++-- source/libs/tdb/src/inc/tdb_mpool.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/libs/tdb/src/db/tdb_mpool.c b/source/libs/tdb/src/db/tdb_mpool.c index d61c0de2c3..c387b6adcc 100644 --- a/source/libs/tdb/src/db/tdb_mpool.c +++ b/source/libs/tdb/src/db/tdb_mpool.c @@ -70,13 +70,13 @@ int tdbCloseMP(TDB_MPOOL *mp) { return 0; } -int tdbMPFetchPage(TDB_MPOOL *mp, mp_pgid_t mpgid, void *p) { +int tdbMPFetchPage(TDB_MPOOL *mp, pgid_t mpgid, void *p) { // Search the hash // TODO return 0; } -int tdbMpUnfetchPage(TDB_MPOOL *mp, mp_pgid_t mpgid, void *p) { +int tdbMpUnfetchPage(TDB_MPOOL *mp, pgid_t mpgid, void *p) { // TODO return 0; } \ No newline at end of file diff --git a/source/libs/tdb/src/inc/tdb_mpool.h b/source/libs/tdb/src/inc/tdb_mpool.h index d84c2ffaeb..2e9e9be73e 100644 --- a/source/libs/tdb/src/inc/tdb_mpool.h +++ b/source/libs/tdb/src/inc/tdb_mpool.h @@ -29,11 +29,11 @@ typedef struct TDB_MPFILE TDB_MPFILE; typedef struct { uint8_t fuid[TDB_FILE_UID_LEN]; pgno_t pgid; -} mp_pgid_t; +} pgid_t; typedef struct MP_PAGE { // SRWLatch rwLatch; - mp_pgid_t mpgid; + pgid_t mpgid; uint8_t dirty; uint8_t fileid[TDB_FILE_UID_LEN]; int32_t pinRef; @@ -50,7 +50,7 @@ struct TDB_MPOOL { int32_t npages; MP_PAGE * pages; MP_PAGE_LIST freeList; - // Hash + // Hash int32_t nbucket; MP_PAGE_LIST *hashtab; // TODO: TD_DLIST(TD_MPFILE) mpfList; // MPFILE registered on this memory pool @@ -69,8 +69,8 @@ struct TDB_MPFILE { // TDB_MPOOL int tdbOpenMP(TDB_MPOOL **mpp, uint64_t cachesize, pgsize_t pgsize); int tdbCloseMP(TDB_MPOOL *mp); -int tdbMPFetchPage(TDB_MPOOL *mp, mp_pgid_t mpgid, void *p); -int tdbMpUnfetchPage(TDB_MPOOL *mp, mp_pgid_t mpgid, void *p); +int tdbMPFetchPage(TDB_MPOOL *mp, pgid_t mpgid, void *p); +int tdbMpUnfetchPage(TDB_MPOOL *mp, pgid_t mpgid, void *p); // TDB_MPFILE int tdbMPFOpen(TDB_MPFILE **mpfp, const char *fname, TDB_MPOOL *mp);