Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
airborne12 merged 1 commit into from
Oct 24, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...core/src/main/java/org/apache/doris/nereids/rules/implementation/AggregateStrategies.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ public List<Rule> buildRules() {
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;
Expand Down Expand Up @@ -164,8 +164,8 @@ public List<Rule> buildRules() {
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;
Expand Down
38 changes: 38 additions & 0 deletions regression-test/suites/inverted_index_p0/test_count_on_index.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
}
Expand Down