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

TD-34

This commit is contained in:
hzcheng 2020-03-21 12:13:06 +08:00
parent d5e4fc3201
commit d148a8e9c3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/util/src/tlist.c
View File

@ -24,7 +24,7 @@ SList *tdListNew(int eleSize) {
list->eleSize = eleSize; list->eleSize = eleSize;
list->numOfEles = 0; list->numOfEles = 0;
list->head = list->tail = NULL; list->head = list->tail = NULL;
return NULL; return list;
} }
void tdListEmpty(SList *list) { void tdListEmpty(SList *list) {
@ -135,7 +135,7 @@ SListNode *tdListPopNode(SList *list, SListNode *node) {
return node; return node;
} }
void tdListNodeGetData(SList *list, SListNode *node, void *target) { memcpy(node->data, target, list->eleSize); } void tdListNodeGetData(SList *list, SListNode *node, void *target) { memcpy(target, node->data, list->eleSize); }
void tdListInitIter(SList *list, SListIter *pIter, TD_LIST_DIRECTION_T direction) { void tdListInitIter(SList *list, SListIter *pIter, TD_LIST_DIRECTION_T direction) {
pIter->direction = direction; pIter->direction = direction;

3
src/vnode/tsdb/src/tsdbCache.c
View File

@ -23,6 +23,8 @@ STsdbCache *tsdbInitCache(int maxBytes, int cacheBlockSize) {
STsdbCache *pCache = (STsdbCache *)calloc(1, sizeof(STsdbCache)); STsdbCache *pCache = (STsdbCache *)calloc(1, sizeof(STsdbCache));
if (pCache == NULL) return NULL; if (pCache == NULL) return NULL;
if (cacheBlockSize < 0) cacheBlockSize = TSDB_DEFAULT_CACHE_BLOCK_SIZE;
pCache->maxBytes = maxBytes; pCache->maxBytes = maxBytes;
pCache->cacheBlockSize = cacheBlockSize; pCache->cacheBlockSize = cacheBlockSize;
@ -83,6 +85,7 @@ void *tsdbAllocFromCache(STsdbCache *pCache, int bytes) {
void *ptr = (void *)(pCache->curBlock->data + pCache->curBlock->offset); void *ptr = (void *)(pCache->curBlock->data + pCache->curBlock->offset);
pCache->curBlock->offset += bytes; pCache->curBlock->offset += bytes;
pCache->curBlock->remain -= bytes; pCache->curBlock->remain -= bytes;
memset(ptr, 0, bytes);
return ptr; return ptr;
} }