diff --git a/source/libs/tdb/src/db/tdbEnv.c b/source/libs/tdb/src/db/tdbEnv.c index 0b27796790682623ea6dbb7af3147b2fef2c56e5..9a4dcdbcd59a72b10740e3754339bb312be745d0 100644 --- a/source/libs/tdb/src/db/tdbEnv.c +++ b/source/libs/tdb/src/db/tdbEnv.c @@ -19,7 +19,7 @@ int tdbEnvOpen(const char *rootDir, int pageSize, int cacheSize, STEnv **ppEnv) STEnv *pEnv; int dsize; int zsize; - u8 * pPtr; + u8 *pPtr; int ret; *ppEnv = NULL; @@ -48,7 +48,7 @@ int tdbEnvOpen(const char *rootDir, int pageSize, int cacheSize, STEnv **ppEnv) pEnv->jfd = -1; - ret = tdbPCacheOpen(pageSize, cacheSize, 0, &(pEnv->pCache)); + ret = tdbPCacheOpen(pageSize, cacheSize, &(pEnv->pCache)); if (ret < 0) { return -1; } diff --git a/source/libs/tdb/src/db/tdbPCache.c b/source/libs/tdb/src/db/tdbPCache.c index 3c8c8d84cd8b3df3299d099b27638f37c8f87651..54a0c038a0706e305a727b35bd24501f570e0f5b 100644 --- a/source/libs/tdb/src/db/tdbPCache.c +++ b/source/libs/tdb/src/db/tdbPCache.c @@ -17,7 +17,6 @@ struct SPCache { int pageSize; int cacheSize; - int extraSize; pthread_mutex_t mutex; int nFree; SPage *pFree; @@ -47,7 +46,7 @@ static void tdbPCacheRemovePageFromHash(SPage *pPage); static void tdbPCacheAddPageToHash(SPage *pPage); static void tdbPCacheUnpinPage(SPage *pPage); -int tdbPCacheOpen(int pageSize, int cacheSize, int extraSize, SPCache **ppCache) { +int tdbPCacheOpen(int pageSize, int cacheSize, SPCache **ppCache) { SPCache *pCache; void *pPtr; SPage *pPgHdr; @@ -59,7 +58,6 @@ int tdbPCacheOpen(int pageSize, int cacheSize, int extraSize, SPCache **ppCache) pCache->pageSize = pageSize; pCache->cacheSize = cacheSize; - pCache->extraSize = extraSize; if (tdbPCacheOpenImpl(pCache) < 0) { free(pCache); @@ -244,7 +242,7 @@ static int tdbPCacheOpenImpl(SPCache *pCache) { pCache->nFree = 0; pCache->pFree = NULL; for (int i = 0; i < pCache->cacheSize; i++) { - tsize = pCache->pageSize + sizeof(SPage) + pCache->extraSize; + tsize = pCache->pageSize + sizeof(SPage); pPtr = (u8 *)calloc(1, tsize); if (pPtr == NULL) { // TODO diff --git a/source/libs/tdb/src/inc/tdbPCache.h b/source/libs/tdb/src/inc/tdbPCache.h index 85b795a30e6f95338aec133766c983f452b842e8..fe5131e58b127e4a34089b49935155b8be2d5402 100644 --- a/source/libs/tdb/src/inc/tdbPCache.h +++ b/source/libs/tdb/src/inc/tdbPCache.h @@ -33,7 +33,7 @@ extern "C" { SPage *pDirtyNext; \ SPager *pPager; -int tdbPCacheOpen(int pageSize, int cacheSize, int extraSize, SPCache **ppCache); +int tdbPCacheOpen(int pageSize, int cacheSize, SPCache **ppCache); int tdbPCacheClose(SPCache *pCache); SPage *tdbPCacheFetch(SPCache *pCache, const SPgid *pPgid, bool alcNewPage); void tdbPCacheRelease(SPage *pPage);