database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix] (inverted index) fix the error result in the query when using count on index (#42346) (#42347)

Browse Source 
## Proposed changes

pick from master #42346
This commit is contained in:
Sun Chenyang
2024-10-24 12:11:59 +08:00
committed by GitHub
parent d891ed9de8
commit aa0fe8ccf4
2 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/implementation/AggregateStrategies.java
View File

@ -130,8 +130,8 @@ public class AggregateStrategies implements ImplementationRuleFactory {
Set<Slot> aggSlots = funcs.stream()
.flatMap(f -> f.getInputSlots().stream())
.collect(Collectors.toSet());
return conjuncts.stream().allMatch(expr -> checkSlotInOrExpression(expr, aggSlots)
&& checkIsNullExpr(expr, aggSlots));
return aggSlots.isEmpty() || conjuncts.stream().allMatch(expr ->
checkSlotInOrExpression(expr, aggSlots) && checkIsNullExpr(expr, aggSlots));
})
.thenApply(ctx -> {
LogicalAggregate<LogicalFilter<LogicalOlapScan>> agg = ctx.root;
@ -164,8 +164,8 @@ public class AggregateStrategies implements ImplementationRuleFactory {
Set<Slot> aggSlots = funcs.stream()
.flatMap(f -> f.getInputSlots().stream())
.collect(Collectors.toSet());
return conjuncts.stream().allMatch(expr -> checkSlotInOrExpression(expr, aggSlots)
&& checkIsNullExpr(expr, aggSlots));
return aggSlots.isEmpty() || conjuncts.stream().allMatch(expr ->
checkSlotInOrExpression(expr, aggSlots) && checkIsNullExpr(expr, aggSlots));
})
.thenApply(ctx -> {
LogicalAggregate<LogicalProject<LogicalFilter<LogicalOlapScan>>> agg = ctx.root;

38
regression-test/suites/inverted_index_p0/test_count_on_index.groovy
View File

@ -332,6 +332,44 @@ suite("test_count_on_index_httplogs", "p0") {
contains "pushAggOp=NONE"
}
qt_sql_bad2 "${bad_sql2}"
// case 6: test select count() from table where a or b;
def tableName6 = 'test_count_where_or'
sql "DROP TABLE IF EXISTS ${tableName6}"
sql """
CREATE TABLE IF NOT EXISTS ${tableName6} (
`key_id` varchar(20) NULL COMMENT '',
`value1` int NULL,
`value2` bigint NULL,
INDEX idx_key (`key_id`) USING INVERTED PROPERTIES("parser" = "english"),
INDEX idx_v1 (`value1`) USING INVERTED,
INDEX idx_v2 (`value2`) USING INVERTED
) ENGINE=OLAP
DUPLICATE KEY(`key_id`)
COMMENT 'OLAP'
DISTRIBUTED BY HASH(`key_id`) BUCKETS 3
PROPERTIES("replication_num" = "1");
"""
sql "INSERT INTO ${tableName6} values ('dt_bjn001', 100, 200);"
sql "INSERT INTO ${tableName6} values ('dt_bjn002', 300, 400);"
sql "INSERT INTO ${tableName6} values ('dt_bjn003', 500, 600);"
sql "sync"
sql "analyze table ${tableName6} with sync;"
explain {
sql("select COUNT() from ${tableName6} where value1 > 20 or value2 < 10")
contains "pushAggOp=COUNT_ON_INDEX"
}
explain {
sql("select COUNT(value1) from ${tableName6} where value1 > 20 and value2 > 5")
contains "pushAggOp=COUNT_ON_INDEX"
}
explain {
sql("select COUNT(value1) from ${tableName6} where value1 > 20 or value2 < 10")
contains "pushAggOp=NONE"
}
} finally {
//try_sql("DROP TABLE IF EXISTS ${testTable}")
}