xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refact TDB

This commit is contained in:
Hongze Cheng 2022-01-20 05:20:06 +00:00
parent 632bb1b4d2
commit 8bbc560321
3 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/libs/tdb/src/db/tdb_mpool.c
View File

@ -15,7 +15,7 @@
#include "tdb_mpool.h" #include "tdb_mpool.h"
int tdbOpenMP(TDB_MPOOL **mpp, uint64_t cachesize, pgsize_t pgsize) { int tdbMPoolOpen(TDB_MPOOL **mpp, uint64_t cachesize, pgsize_t pgsize) {
TDB_MPOOL *mp; TDB_MPOOL *mp;
size_t tsize; size_t tsize;
MP_PAGE * pagep; MP_PAGE * pagep;
@ -65,18 +65,7 @@ int tdbOpenMP(TDB_MPOOL **mpp, uint64_t cachesize, pgsize_t pgsize) {
return 0; return 0;
} }
int tdbCloseMP(TDB_MPOOL *mp) { int tdbMPoolClose(TDB_MPOOL *mp) {
// TODO
return 0;
}
int tdbMPFetchPage(TDB_MPOOL *mp, pgid_t mpgid, void *p) {
// Search the hash
// TODO
return 0;
}
int tdbMpUnfetchPage(TDB_MPOOL *mp, pgid_t mpgid, void *p) {
// TODO // TODO
return 0; return 0;
} }

12
source/libs/tdb/src/inc/tdb_inc.h
View File

@ -27,6 +27,15 @@ extern "C" {
typedef int32_t pgno_t; typedef int32_t pgno_t;
#define TDB_IVLD_PGID ((pgno_t)-1) #define TDB_IVLD_PGID ((pgno_t)-1)
// fileid
#define TDB_FILE_UID_LEN 20
// pgid_t
typedef struct {
uint8_t fuid[TDB_FILE_UID_LEN];
pgno_t pgid;
} pgid_t;
// framd_id_t // framd_id_t
typedef int32_t frame_id_t; typedef int32_t frame_id_t;
@ -37,9 +46,6 @@ typedef int32_t pgsize_t;
#define TDB_DEFAULT_PGSIZE 4096 #define TDB_DEFAULT_PGSIZE 4096
#define TDB_IS_PGSIZE_VLD(s) (((s) >= TDB_MIN_PGSIZE) && ((s) <= TDB_MAX_PGSIZE)) #define TDB_IS_PGSIZE_VLD(s) (((s) >= TDB_MIN_PGSIZE) && ((s) <= TDB_MAX_PGSIZE))
// fileid
#define TDB_FILE_UID_LEN 20
// tdb_log // tdb_log
#define tdbError(var) #define tdbError(var)

19
source/libs/tdb/src/inc/tdb_mpool.h
View File

@ -26,17 +26,12 @@ extern "C" {
typedef struct TDB_MPOOL TDB_MPOOL; typedef struct TDB_MPOOL TDB_MPOOL;
typedef struct TDB_MPFILE TDB_MPFILE; typedef struct TDB_MPFILE TDB_MPFILE;
typedef struct {
uint8_t fuid[TDB_FILE_UID_LEN];
pgno_t pgid;
} pgid_t;
typedef struct MP_PAGE { typedef struct MP_PAGE {
// SRWLatch rwLatch; // SRWLatch rwLatch;
pgid_t mpgid; pgid_t mpgid;
uint8_t dirty; uint8_t dirty;
uint8_t fileid[TDB_FILE_UID_LEN]; uint8_t fileid[TDB_FILE_UID_LEN];
int32_t pinRef; int32_t pinRef;
TD_DLIST_NODE(MP_PAGE); TD_DLIST_NODE(MP_PAGE);
char *page[]; char *page[];
} MP_PAGE; } MP_PAGE;
@ -67,10 +62,8 @@ struct TDB_MPFILE {
/*=================================================== Exposed apis ==================================================*/ /*=================================================== Exposed apis ==================================================*/
// TDB_MPOOL // TDB_MPOOL
int tdbOpenMP(TDB_MPOOL **mpp, uint64_t cachesize, pgsize_t pgsize); int tdbMPoolOpen(TDB_MPOOL **mpp, uint64_t cachesize, pgsize_t pgsize);
int tdbCloseMP(TDB_MPOOL *mp); int tdbMPoolClose(TDB_MPOOL *mp);
int tdbMPFetchPage(TDB_MPOOL *mp, pgid_t mpgid, void *p);
int tdbMpUnfetchPage(TDB_MPOOL *mp, pgid_t mpgid, void *p);
// TDB_MPFILE // TDB_MPFILE
int tdbMPFOpen(TDB_MPFILE **mpfp, const char *fname, TDB_MPOOL *mp); int tdbMPFOpen(TDB_MPFILE **mpfp, const char *fname, TDB_MPOOL *mp);