This commit is contained in:
Hongze Cheng 2022-03-11 07:16:22 +00:00
parent 3ac540f2e1
commit 69f5d9c829
2 changed files with 12 additions and 7 deletions

View File

@ -22,6 +22,8 @@ int tdbPageCreate(int pageSize, SPage **ppPage, void *(*xMalloc)(void *, size_t)
u8 *ptr; u8 *ptr;
int size; int size;
ASSERT(TDB_IS_PGSIZE_VLD(pageSize));
*ppPage = NULL; *ppPage = NULL;
size = pageSize + sizeof(*pPage); size = pageSize + sizeof(*pPage);
@ -35,6 +37,11 @@ int tdbPageCreate(int pageSize, SPage **ppPage, void *(*xMalloc)(void *, size_t)
pPage->pData = ptr; pPage->pData = ptr;
pPage->pageSize = pageSize; pPage->pageSize = pageSize;
if (pageSize < 65536) {
pPage->szOffset = 2;
} else {
pPage->szOffset = 3;
}
TDB_INIT_PAGE_LOCK(pPage); TDB_INIT_PAGE_LOCK(pPage);
/* TODO */ /* TODO */
@ -56,7 +63,7 @@ int tdbPageInsertCell(SPage *pPage, int idx, SCell *pCell, int szCell) {
int ret; int ret;
SCell *pTarget; SCell *pTarget;
if (pPage->nOverflow || szCell + TDB_PAGE_CELL_OFFSET_SIZE(pPage) > pPage->nFree) { if (pPage->nOverflow || szCell + pPage->szOffset > pPage->nFree) {
// TODO // TODO
} else { } else {
ret = tdbPageAllocate(pPage, szCell, &pTarget); ret = tdbPageAllocate(pPage, szCell, &pTarget);
@ -75,14 +82,12 @@ int tdbPageDropCell(SPage *pPage, int idx) {
static int tdbPageAllocate(SPage *pPage, int size, SCell **ppCell) { static int tdbPageAllocate(SPage *pPage, int size, SCell **ppCell) {
SCell *pCell; SCell *pCell;
int szOffset;
szOffset = TDB_PAGE_CELL_OFFSET_SIZE(pPage); ASSERT(pPage->nFree > size + pPage->szOffset);
ASSERT(pPage->nFree > size + szOffset);
if (pPage->pFreeEnd - pPage->pFreeStart > size + szOffset) { if (pPage->pFreeEnd - pPage->pFreeStart > size + pPage->szOffset) {
pPage->pFreeEnd -= size; pPage->pFreeEnd -= size;
pPage->pFreeStart += szOffset; pPage->pFreeStart += pPage->szOffset;
pCell = pPage->pFreeEnd; pCell = pPage->pFreeEnd;
} else { } else {

View File

@ -39,6 +39,7 @@ struct SPage {
pthread_spinlock_t lock; pthread_spinlock_t lock;
u8 *pData; u8 *pData;
int pageSize; int pageSize;
u8 szOffset;
// Fields below used by pager and am // Fields below used by pager and am
SPgid pgid; SPgid pgid;
SPageHdr *pPageHdr; SPageHdr *pPageHdr;
@ -59,7 +60,6 @@ struct SPage {
}; };
// Macros // Macros
#define TDB_PAGE_CELL_OFFSET_SIZE(pPage) (((pPage)->pageSize < 65536) ? 2 : 3)
#define TDB_PAGE_CELL_OFFSET_AT(pPage, idx) ((pPage)->aCellIdx[idx]) #define TDB_PAGE_CELL_OFFSET_AT(pPage, idx) ((pPage)->aCellIdx[idx])
#define TDB_PAGE_CELL_AT(pPage, idx) ((pPage)->pData + TDB_PAGE_CELL_OFFSET_AT(pPage, idx)) #define TDB_PAGE_CELL_AT(pPage, idx) ((pPage)->pData + TDB_PAGE_CELL_OFFSET_AT(pPage, idx))