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

Merge pull request #22696 from taosdata/fix/m/TD-26096 

fix: 1. select tag from meters partition by tag limit returned wrong …
This commit is contained in:
dapan1121 2023-09-06 09:54:00 +08:00 committed by GitHub
parent 17d7c13754 22b53c3ece
commit 8cbc49a083
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/libs/executor/src/sortoperator.c
View File

@ -668,10 +668,15 @@ static void doGetSortedBlockData(SMultiwayMergeOperatorInfo* pInfo, SSortHandle*
appendOneRowToDataBlock(p, pTupleHandle); appendOneRowToDataBlock(p, pTupleHandle);
p->info.id.groupId = tupleGroupId; p->info.id.groupId = tupleGroupId;
pInfo->groupId = tupleGroupId; pInfo->groupId = tupleGroupId;
} else {
if (p->info.rows == 0) {
appendOneRowToDataBlock(p, pTupleHandle);
p->info.id.groupId = pInfo->groupId = tupleGroupId;
} else { } else {
pInfo->prefetchedTuple = pTupleHandle; pInfo->prefetchedTuple = pTupleHandle;
break; break;
} }
}
} else { } else {
appendOneRowToDataBlock(p, pTupleHandle); appendOneRowToDataBlock(p, pTupleHandle);
} }
@ -715,14 +720,9 @@ SSDataBlock* getMultiwaySortedBlockData(SSortHandle* pHandle, SSDataBlock* pData
resetLimitInfoForNextGroup(&pInfo->limitInfo); resetLimitInfoForNextGroup(&pInfo->limitInfo);
} }
bool limitReached = applyLimitOffset(&pInfo->limitInfo, p, pTaskInfo); applyLimitOffset(&pInfo->limitInfo, p, pTaskInfo);
// if limit is reached within a group, do not clear limiInfo otherwise the next block
// will be processed.
if (newgroup && limitReached) {
resetLimitInfoForNextGroup(&pInfo->limitInfo);
}
if (p->info.rows > 0 || limitReached) { if (p->info.rows > 0) {
break; break;
} }
} }

9
tests/system-test/2-query/interval_limit_opt.py
View File

@ -251,10 +251,19 @@ class TDTestCase:
tdSql.checkData(2, 4, 9) tdSql.checkData(2, 4, 9)
tdSql.checkData(3, 4, 9) tdSql.checkData(3, 4, 9)
def test_partition_by_limit_no_agg(self):
sql_template = 'select t1 from meters partition by t1 limit %d'
for i in range(1, 5000, 1000):
tdSql.query(sql_template % i)
tdSql.checkRows(5 * i)
def run(self): def run(self):
self.prepareTestEnv() self.prepareTestEnv()
self.test_interval_limit_offset() self.test_interval_limit_offset()
self.test_interval_partition_by_slimit_limit() self.test_interval_partition_by_slimit_limit()
self.test_partition_by_limit_no_agg()
def stop(self): def stop(self):
tdSql.close() tdSql.close()