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

Feature/td 11463 update colId to PRIMARYKEY_TIMESTAMP_COL_ID during commit (#10150) 

* initial commit

* fix commit error

* update colId to PRIMARYKEY_TIMESTAMP_COL_ID during commit

* update colId to PRIMARYKEY_TIMESTAMP_COL_ID during commit

* update colId to PRIMARYKEY_TIMESTAMP_COL_ID during commit

Co-authored-by: Hongze Cheng <hzcheng@taosdata.com>
This commit is contained in:
Cary Xu 2022-02-09 10:30:39 +08:00 committed by GitHub
parent 71f4d0a0f1
commit e2d4c81cdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/dnode/vnode/src/tsdb/tsdbCommit.c
View File

@ -1327,7 +1327,7 @@ static int tsdbMergeMemData(SCommitH *pCommith, SCommitIter *pIter, int bidx) {
int nBlocks = pCommith->readh.pBlkIdx->numOfBlocks;
SBlock * pBlock = pCommith->readh.pBlkInfo->blocks + bidx;
TSKEY keyLimit;
int16_t colId = 0;
int16_t colId = PRIMARYKEY_TIMESTAMP_COL_ID;
SMergeInfo mInfo;
SBlock subBlocks[TSDB_MAX_SUBBLOCKS];
SBlock block, supBlock;

2
source/dnode/vnode/src/tsdb/tsdbReadImpl.c
View File

@ -472,7 +472,7 @@ static int tsdbLoadBlockDataImpl(SReadH *pReadh, SBlock *pBlock, SDataCols *pDat
continue;
}
int16_t tcolId = 0;
int16_t tcolId = PRIMARYKEY_TIMESTAMP_COL_ID;
uint32_t toffset = TSDB_KEY_COL_OFFSET;
int32_t tlen = pBlock->keyLen;

1
source/dnode/vnode/src/vnd/vnodeBufferPool.c
View File

@ -185,6 +185,7 @@ static void vBufPoolDestroyMA(SMemAllocatorFactory *pMAF, SMemAllocator *pMA) {
free(pMA);
if (--pVMA->_ref.val == 0) {
TD_DLIST_POP(&(pVnode->pBufPool->incycle), pVMA);
vmaReset(pVMA);
TD_DLIST_APPEND(&(pVnode->pBufPool->free), pVMA);
}
}