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

more TDB

This commit is contained in:
Hongze Cheng 2022-03-04 09:11:46 +00:00
parent 0b62ccf50e
commit c4e86a7339
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/tdb/src/db/tdbBtree.c
View File

@ -86,7 +86,7 @@ int tdbBtreeOpen(int keyLen, int valLen, SPager *pPager, FKeyComparator kcmpr, S
pBt->pageSize = tdbPagerGetPageSize(pPager); pBt->pageSize = tdbPagerGetPageSize(pPager);
// pBt->maxLocal // pBt->maxLocal
pBt->maxLocal = (pBt->pageSize - sizeof(SPageHdr)) / pBt->fanout; pBt->maxLocal = (pBt->pageSize - sizeof(SPageHdr)) / pBt->fanout;
// pBt->minLocal // pBt->minLocal: Should not be allowed smaller than 15, which is [nPayload][nKey][nData]
pBt->minLocal = (pBt->pageSize - sizeof(SPageHdr)) / pBt->fanout / 2; pBt->minLocal = (pBt->pageSize - sizeof(SPageHdr)) / pBt->fanout / 2;
// pBt->maxLeaf // pBt->maxLeaf
pBt->maxLeaf = pBt->pageSize - sizeof(SPageHdr); pBt->maxLeaf = pBt->pageSize - sizeof(SPageHdr);

5
source/libs/tdb/src/db/tdbPCache.c
View File

@ -85,11 +85,6 @@ SPage *tdbPCacheFetch(SPCache *pCache, const SPgid *pPgid, bool alcNewPage) {
return pPage; return pPage;
} }
void tdbPCacheFetchFinish(SPCache *pCache, SPage *pPage) {
/* TODO */
pPage->nRef++; // TODO: do we need atomic operation???
}
void tdbPCacheRelease(SPage *pPage) { void tdbPCacheRelease(SPage *pPage) {
pPage->nRef--; pPage->nRef--;
if (pPage->nRef == 0) { if (pPage->nRef == 0) {

1
source/libs/tdb/src/inc/tdbPCache.h
View File

@ -23,7 +23,6 @@ extern "C" {
int tdbPCacheOpen(int pageSize, int cacheSize, int extraSize, SPCache **ppCache); int tdbPCacheOpen(int pageSize, int cacheSize, int extraSize, SPCache **ppCache);
int tdbPCacheClose(SPCache *pCache); int tdbPCacheClose(SPCache *pCache);
SPage *tdbPCacheFetch(SPCache *pCache, const SPgid *pPgid, bool alcNewPage); SPage *tdbPCacheFetch(SPCache *pCache, const SPgid *pPgid, bool alcNewPage);
void tdbPCacheFetchFinish(SPCache *pCache, SPage *pPage);
void tdbPCacheRelease(SPage *pPage); void tdbPCacheRelease(SPage *pPage);
int tdbPCacheGetPageSize(SPCache *pCache); int tdbPCacheGetPageSize(SPCache *pCache);

9
source/libs/tdb/src/inc/tdbPage.h
View File

@ -54,12 +54,19 @@ struct SPage {
int minLocal; int minLocal;
}; };
#define TDB_INIT_PAGE_LOCK(pPage) pthread_spin_init(&((pPage)->lock), 0) // TODO: use the macros // For page lock
#define TDB_INIT_PAGE_LOCK(pPage) pthread_spin_init(&((pPage)->lock), 0)
#define TDB_DESTROY_PAGE_LOCK(pPage) pthread_spin_destroy(&((pPage)->lock)) #define TDB_DESTROY_PAGE_LOCK(pPage) pthread_spin_destroy(&((pPage)->lock))
#define TDB_LOCK_PAGE(pPage) pthread_spin_lock(&((pPage)->lock)) #define TDB_LOCK_PAGE(pPage) pthread_spin_lock(&((pPage)->lock))
#define TDB_TRY_LOCK_PAGE(pPage) pthread_spin_trylock(&((pPage)->lock)) #define TDB_TRY_LOCK_PAGE(pPage) pthread_spin_trylock(&((pPage)->lock))
#define TDB_UNLOCK_PAGE(pPage) pthread_spin_unlock(&((pPage)->lock)) #define TDB_UNLOCK_PAGE(pPage) pthread_spin_unlock(&((pPage)->lock))
// For page ref (TODO: Need atomic operation)
#define TDB_INIT_PAGE_REF(pPage) ((pPage)->nRef = 0)
#define TDB_REF_PAGE(pPage) (++(pPage)->nRef)
#define TDB_UNREF_PAGE(pPage) (--(pPage)->nRef)
#define TDB_PAGE_REF(pPage) ((pPage)->nRef)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif