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

use new macros from bcache & pgcache opening

This commit is contained in:
Minglei Jin 2024-07-24 14:34:27 +08:00
parent 45e00afad1
commit 45b1bbf0ed
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/dnode/vnode/src/tsdb/tsdbCache.c
View File

@ -23,13 +23,12 @@
#define ROCKS_BATCH_SIZE (4096) #define ROCKS_BATCH_SIZE (4096)
static int32_t tsdbOpenBCache(STsdb *pTsdb) { static int32_t tsdbOpenBCache(STsdb *pTsdb) {
int32_t code = 0; int32_t code = 0, lino = 0;
int32_t szPage = pTsdb->pVnode->config.tsdbPageSize; int32_t szPage = pTsdb->pVnode->config.tsdbPageSize;
int64_t szBlock = tsS3BlockSize <= 1024 ? 1024 : tsS3BlockSize; int64_t szBlock = tsS3BlockSize <= 1024 ? 1024 : tsS3BlockSize;
SLRUCache *pCache = taosLRUCacheInit((int64_t)tsS3BlockCacheSize * szBlock * szPage, 0, .5); SLRUCache *pCache = taosLRUCacheInit((int64_t)tsS3BlockCacheSize * szBlock * szPage, 0, .5);
if (pCache == NULL) { if (pCache == NULL) {
code = TSDB_CODE_OUT_OF_MEMORY; TAOS_CHECK_GOTO(TSDB_CODE_OUT_OF_MEMORY, &lino, _err);
goto _err;
} }
taosLRUCacheSetStrictCapacity(pCache, false); taosLRUCacheSetStrictCapacity(pCache, false);
@ -39,7 +38,11 @@ static int32_t tsdbOpenBCache(STsdb *pTsdb) {
pTsdb->bCache = pCache; pTsdb->bCache = pCache;
_err: _err:
return code; if (code) {
tsdbError("tsdb/bcache: vgId:%d, open failed at line %d since %s.", TD_VID(pTsdb->pVnode), lino, tstrerror(code));
}
TAOS_RETURN(code);
} }
static void tsdbCloseBCache(STsdb *pTsdb) { static void tsdbCloseBCache(STsdb *pTsdb) {
@ -58,23 +61,27 @@ static void tsdbCloseBCache(STsdb *pTsdb) {
} }
static int32_t tsdbOpenPgCache(STsdb *pTsdb) { static int32_t tsdbOpenPgCache(STsdb *pTsdb) {
int32_t code = 0; int32_t code = 0, lino = 0;
// SLRUCache *pCache = taosLRUCacheInit(10 * 1024 * 1024, 0, .5); // SLRUCache *pCache = taosLRUCacheInit(10 * 1024 * 1024, 0, .5);
int32_t szPage = pTsdb->pVnode->config.tsdbPageSize; int32_t szPage = pTsdb->pVnode->config.tsdbPageSize;
SLRUCache *pCache = taosLRUCacheInit((int64_t)tsS3PageCacheSize * szPage, 0, .5); SLRUCache *pCache = taosLRUCacheInit((int64_t)tsS3PageCacheSize * szPage, 0, .5);
if (pCache == NULL) { if (pCache == NULL) {
code = TSDB_CODE_OUT_OF_MEMORY; TAOS_CHECK_GOTO(TSDB_CODE_OUT_OF_MEMORY, &lino, _err);
goto _err;
} }
taosLRUCacheSetStrictCapacity(pCache, false); taosLRUCacheSetStrictCapacity(pCache, false);
taosThreadMutexInit(&pTsdb->pgMutex, NULL); taosThreadMutexInit(&pTsdb->pgMutex, NULL);
_err:
pTsdb->pgCache = pCache; pTsdb->pgCache = pCache;
return code;
_err:
if (code) {
tsdbError("tsdb/pgcache: vgId:%d, open failed at line %d since %s.", TD_VID(pTsdb->pVnode), lino, tstrerror(code));
}
TAOS_RETURN(code);
} }
static void tsdbClosePgCache(STsdb *pTsdb) { static void tsdbClosePgCache(STsdb *pTsdb) {