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

Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_snapshot

This commit is contained in:
Hongze Cheng 2022-07-05 11:20:37 +00:00
parent e9d157dd2c 56efeefc56
commit 3b00de6d4b
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/dnode/vnode/src/tsdb/tsdbUtil.c
View File

@ -1190,16 +1190,12 @@ void tBlockDataGetColData(SBlockData *pBlockData, int16_t cid, SColData **ppColD
ASSERT(cid != PRIMARYKEY_TIMESTAMP_COL_ID); ASSERT(cid != PRIMARYKEY_TIMESTAMP_COL_ID);
int32_t lidx = 0; int32_t lidx = 0;
int32_t ridx = taosArrayGetSize(pBlockData->aIdx) - 1; int32_t ridx = taosArrayGetSize(pBlockData->aIdx) - 1;
int32_t midx;
while (lidx <= ridx) { while (lidx <= ridx) {
SColData *pColData; int32_t midx = (lidx + ridx) / 2;
int32_t c; SColData *pColData = tBlockDataGetColDataByIdx(pBlockData, midx);
int32_t c = tColDataCmprFn(pColData, &(SColData){.cid = cid});
midx = (lidx + midx) / 2;
pColData = tBlockDataGetColDataByIdx(pBlockData, midx);
c = tColDataCmprFn(pColData, &(SColData){.cid = cid});
if (c == 0) { if (c == 0) {
*ppColData = pColData; *ppColData = pColData;
return; return;