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

Merge pull request #20183 from taosdata/fix/TD-22797 

fix: avoid filter slow when not exist target value
This commit is contained in:
Haojun Liao 2023-02-28 09:18:46 +08:00 committed by GitHub
parent ca42ae6f13 d9f8a84a55
commit 52a8912969
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/dnode/vnode/src/meta/metaQuery.c
View File

@ -1301,6 +1301,7 @@ int32_t metaFilterTableIds(SMeta *pMeta, SMetaFltParam *param, SArray *pUids) {
/// src: [[suid, cid1, type1]....[suid, cid2, type2]....[suid, cid3, type3]...]
/// target: [suid, cid2, type2]
int diffCidCount = 0;
do {
void *entryKey = NULL, *entryVal = NULL;
int32_t nEntryKey, nEntryVal;
@ -1317,7 +1318,9 @@ int32_t metaFilterTableIds(SMeta *pMeta, SMetaFltParam *param, SArray *pUids) {
if (p == NULL) break;
if (p->type != pCursor->type || p->suid != pCursor->suid || p->cid != pCursor->cid) {
if (found == true) break;
if (found == true) break; //
if (diffCidCount > TRY_ERROR_LIMIT) break;
diffCidCount++;
count++;
valid = param->reverse ? tdbTbcMoveToPrev(pCursor->pCur) : tdbTbcMoveToNext(pCursor->pCur);
if (valid < 0) {

55
tests/script/tsim/tagindex/add_index.sim
View File

@ -7,7 +7,7 @@ print ======== step0
$dbPrefix = ta_3_db
$tbPrefix = ta_3_tb
$mtPrefix = ta_3_mt
$tbNum = 100
$tbNum = 500
$rowNum = 20
$totalNum = 200
@ -26,9 +26,10 @@ endi
print =============== create child table
$i = 0
$val = 1
while $i < $tbNum
$tb = $tbPrefix . $i
sql create table $tb using $mtPrefix tags( $i , $i , $i , $i , $i );
sql create table $tb using $mtPrefix tags( $i , $i , $i , $i , $val );
$i = $i + 1
endw
@ -49,6 +50,7 @@ endw
sql create index ti2 on $mtPrefix (t2)
sql create index ti5 on $mtPrefix (t5)
print ==== test name conflict
#
@ -120,6 +122,53 @@ while $i < $tbNum
$i = $i + 1
endw
# test special boundary condtion
print ===== test operator low on ti5
# great equal than
sql select * from $mtPrefix where t5 < 0 ;
if $rows != 0 then
return -1
endi
print ===== test operator lower equal on ti5
# great equal than
sql select * from $mtPrefix where t5 <= $val ;
if $rows != $tbNum then
return -1
endi
print ===== test operator equal on ti5
# great equal than
sql select * from $mtPrefix where t5 = $val ;
if $rows != $tbNum then
return -1
endi
print ===== test operator great equal on ti5
# great equal than
sql select * from $mtPrefix where t5 >= $val ;
if $rows != $tbNum then
return -1
endi
print ===== test operator great than on ti5
# great equal than
sql select * from $mtPrefix where t5 > $val ;
if $rows != 0 then
return -1
endi
print ===== test operator great on ti5
# great equal than
sql select * from $mtPrefix where t5 > $val + 1 ;
if $rows != 0 then
return -1
endi
sql drop index ti5
print ===== add table after index created
$interval = $tbNum + $tbNum
$i = $interval
@ -130,8 +179,6 @@ while $i < $limit
$i = $i + 1
endw
print ===== add table after index created (opeator great equal than)
# great equal than
$i = $interval