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

fix: when querying super table, using ORDER BY and LIMIT together may return an unexpected record. 

* fix: limit error

* fix: limit error, test case.
This commit is contained in:
xinsheng Ren 2025-03-18 13:58:30 +08:00 committed by GitHub
parent a3b042c078
commit 8453726080
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/executor/src/scanoperator.c
View File

@ -6546,7 +6546,7 @@ int32_t createTableMergeScanOperatorInfo(STableScanPhysiNode* pTableScanNode, SR
pInfo->mergeLimit = -1; pInfo->mergeLimit = -1;
bool hasLimit = pInfo->limitInfo.limit.limit != -1 || pInfo->limitInfo.limit.offset != -1; bool hasLimit = pInfo->limitInfo.limit.limit != -1 || pInfo->limitInfo.limit.offset != -1;
if (hasLimit) { if (hasLimit) {
pInfo->mergeLimit = pInfo->limitInfo.limit.limit + pInfo->limitInfo.limit.offset; pInfo->mergeLimit = pInfo->limitInfo.limit.offset != -1 ? pInfo->limitInfo.limit.limit + pInfo->limitInfo.limit.offset : pInfo->limitInfo.limit.limit;
pInfo->mSkipTables = NULL; pInfo->mSkipTables = NULL;
} }

46
tests/system-test/2-query/large_data.py
View File

@ -43,10 +43,56 @@ class TDTestCase:
tdSql.query("select d0.ts from test.d0 left join test.d1 on d0.ts=d1.ts limit 1000000;") tdSql.query("select d0.ts from test.d0 left join test.d1 on d0.ts=d1.ts limit 1000000;")
tdSql.checkRows(num1) tdSql.checkRows(num1)
def ts6136(self):
start = 1500000000000
tdSql.execute("drop database if exists test1;")
tdCases.taosBenchmarkExec(f"-d test1 -t 3 -n 1000000 -s {start} -y")
while True:
tdSql.query("select count(*) from test1.meters;")
tdSql.checkRowCol(0, 0)
if tdSql.queryResult[0][0] == 3000000:
tdLog.info(f"ts6136 data ready, sum: {tdSql.queryResult[0][0]}")
break
tdLog.info(f"waiting for data ready, sum: {tdSql.queryResult[0][0]}")
time.sleep(1)
tdSql.query(f"insert into test1.d0 values({start + 962000}, 1, 1, 1);")
tdSql.query(f"insert into test1.d0 values({start + 961000}, 1, 1, 1);")
tdSql.query(f"insert into test1.d0 values({start + 960000}, 1, 1, 1);")
tdSql.query(f"insert into test1.d0 values({start + 602000}, 1, 1, 1);")
tdSql.query(f"insert into test1.d1 values({start + 602000}, 1, 1, 1);")
tdSql.query(f"insert into test1.d0 values({start + 302000}, 1, 1, 1);")
tdSql.query(f"insert into test1.d0 values({start + 2000}, 1, 1, 1);")
tdSql.query(f"insert into test1.d0 values({start + 0}, 1, 1, 1);")
# Query with limit 20 and store the results
tdSql.query("select tbname, ts, current from test1.meters where current = 1 and voltage = 1 and phase = 1 order by ts desc limit 8;")
tdSql.checkRows(8)
tbname_list = [row[0] for row in tdSql.queryResult]
ts_list = [row[1] for row in tdSql.queryResult]
# Test with different limits
for limit in range(1, 10):
row = min(8, limit)
tdSql.query(f"select tbname, ts, current from test1.meters where current = 1 and voltage = 1 and phase = 1 order by ts desc limit {limit};")
tdSql.checkRows(row)
result = tdSql.queryResult[:row]
for i in range(min(10, len(result))):
tdSql.checkData(i, 0, tbname_list[i])
tdSql.checkData(i, 1, ts_list[i])
tdLog.info("All tests passed for ts6136")
def run(self): def run(self):
self.prepare_data() self.prepare_data()
self.ts5803() self.ts5803()
self.ts6136()
def stop(self): def stop(self):
tdSql.close() tdSql.close()