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

TD-353

This commit is contained in:
Hongze Cheng 2020-06-13 02:47:44 +00:00
parent 6413285bb9
commit 21a5beabb9
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tsdb/src/tsdbBuffer.c
View File

@ -114,7 +114,7 @@ void tsdbCloseBufPool(STsdbRepo *pRepo) {
SListNode *tsdbAllocBufBlockFromPool(STsdbRepo *pRepo) { SListNode *tsdbAllocBufBlockFromPool(STsdbRepo *pRepo) {
ASSERT(pRepo != NULL && pRepo->pool != NULL); ASSERT(pRepo != NULL && pRepo->pool != NULL);
// ASSERT pRepo is locked ASSERT(IS_REPO_LOCKED(pRepo));
STsdbCfg * pCfg = &pRepo->config; STsdbCfg * pCfg = &pRepo->config;
STsdbBufPool *pBufPool = pRepo->pool; STsdbBufPool *pBufPool = pRepo->pool;

11
src/tsdb/src/tsdbMemTable.c
View File

@ -170,6 +170,17 @@ static void *tsdbAllocBytes(STsdbRepo *pRepo, int bytes) {
tsdbUnRefMemTable(pRepo, pIMem); tsdbUnRefMemTable(pRepo, pIMem);
} }
} else {
if (tsdbLockRepo(pRepo) < 0) {
tsdbFreeMemTable(pMemTable);
return NULL;
}
SListNode *pNode = tsdbAllocBufBlockFromPool(pRepo);
tdListAppendNode(pMemTable->bufBlockList, pNode);
pRepo->mem = pMemTable;
if (tsdbUnlockRepo(pRepo) < 0) return NULL;
} }
} }