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

Merge branch 'szhou/tms-duration' of github.com:taosdata/TDengine into szhou/tms-duration-2

This commit is contained in:
shenglian zhou 2023-11-29 08:18:27 +08:00
parent 5a75d74421 b2fa6209d9
commit 765b8384c0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/dnode/vnode/src/tsdb/tsdbRead2.c
View File

@ -4381,7 +4381,8 @@ static int32_t doTsdbNextDataBlockDurationOrder(STsdbReader* pReader) {
STimeWindow win = {0}; STimeWindow win = {0};
tsdbFidKeyRange(fid, pReader->pTsdb->keepCfg.days, pReader->pTsdb->keepCfg.precision, &win.skey, &win.ekey); tsdbFidKeyRange(fid, pReader->pTsdb->keepCfg.days, pReader->pTsdb->keepCfg.precision, &win.skey, &win.ekey);
code = buildBlockFromBufferSequentially(pReader, win.skey); int64_t endKey = (ASCENDING_TRAVERSE(pReader->info.order)) ? win.skey : win.ekey;
code = buildBlockFromBufferSequentially(pReader, endKey);
if (code != TSDB_CODE_SUCCESS || pBlock->info.rows > 0) { if (code != TSDB_CODE_SUCCESS || pBlock->info.rows > 0) {
return code; return code;
} else { } else {