Skip to content
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

[BugFix] fix list partition with multi value issue (backport #53746) #53881

Merged
merged 1 commit into from
Dec 12, 2024
Merged

[BugFix] fix list partition with multi value issue (backport #53746) #53881

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
12 changes: 12 additions & 0 deletions fe/fe-core/src/main/java/com/starrocks/catalog/ListPartitionInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,18 @@ public Map<Long, List<String>> getIdToValues() {
return idToValues;
}

public boolean isSingleValuePartition(long id) {
List<String> values = getIdToValues().get(id);
if (values != null && values.size() == 1) {
return true;
}
List<List<String>> multiValues = getIdToMultiValues().get(id);
if (multiValues != null && multiValues.size() == 1) {
return true;
}
return false;
}

/**
* serialize data to log
*
Expand Down
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rewrite/OptOlapPartitionPruner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ private static List<Long> listPartitionPrune(OlapTable olapTable, ListPartitionI

List<ScalarOperator> scalarOperatorList = Utils.extractConjuncts(operator.getPredicate());
PartitionPruner partitionPruner = new ListPartitionPruner(columnToPartitionValuesMap,
columnToNullPartitions, scalarOperatorList, specifyPartitionIds);
columnToNullPartitions, scalarOperatorList, specifyPartitionIds, listPartitionInfo);
try {
List<Long> prune = partitionPruner.prune();
if (prune == null && isTemporaryPartitionPrune) {
Expand Down
36 changes: 34 additions & 2 deletions ...re/src/main/java/com/starrocks/sql/optimizer/rule/transformation/ListPartitionPruner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.starrocks.analysis.BinaryType;
import com.starrocks.analysis.Expr;
import com.starrocks.analysis.LiteralExpr;
import com.starrocks.catalog.ListPartitionInfo;
import com.starrocks.catalog.Type;
import com.starrocks.common.AnalysisException;
import com.starrocks.common.Pair;
Expand Down Expand Up @@ -83,17 +84,27 @@ public class ListPartitionPruner implements PartitionPruner {
private final Set<Long> allPartitions;
private final List<ColumnRefOperator> partitionColumnRefs;
private final List<Long> specifyPartitionIds;
private final ListPartitionInfo listPartitionInfo;

public ListPartitionPruner(
Map<ColumnRefOperator, ConcurrentNavigableMap<LiteralExpr, Set<Long>>> columnToPartitionValuesMap,
Map<ColumnRefOperator, Set<Long>> columnToNullPartitions,
List<ScalarOperator> partitionConjuncts, List<Long> specifyPartitionIds) {
this(columnToPartitionValuesMap, columnToNullPartitions, partitionConjuncts, specifyPartitionIds, null);
}

public ListPartitionPruner(
Map<ColumnRefOperator, ConcurrentNavigableMap<LiteralExpr, Set<Long>>> columnToPartitionValuesMap,
Map<ColumnRefOperator, Set<Long>> columnToNullPartitions,
List<ScalarOperator> partitionConjuncts, List<Long> specifyPartitionIds,
ListPartitionInfo listPartitionInfo) {
this.columnToPartitionValuesMap = columnToPartitionValuesMap;
this.columnToNullPartitions = columnToNullPartitions;
this.partitionConjuncts = partitionConjuncts;
this.allPartitions = getAllPartitions();
this.partitionColumnRefs = getPartitionColumnRefs();
this.specifyPartitionIds = specifyPartitionIds;
this.listPartitionInfo = listPartitionInfo;
}

private Set<Long> getAllPartitions() {
Expand Down Expand Up @@ -335,7 +346,17 @@ private Set<Long> evalBinaryPredicate(BinaryPredicateOperator binaryPredicate) {
matches.removeAll(nullPartitions);
// remove partition matches literal
if (partitionValueMap.containsKey(literal)) {
matches.removeAll(partitionValueMap.get(literal));
if (listPartitionInfo == null) {
// external table
matches.removeAll(partitionValueMap.get(literal));
} else {
Set<Long> partitionIds = partitionValueMap.get(literal);
for (Long id : partitionIds) {
if (listPartitionInfo.isSingleValuePartition(id)) {
matches.remove(id);
}
}
}
}
return matches;
case LE:
Expand Down Expand Up @@ -448,7 +469,18 @@ private Set<Long> evalInPredicate(InPredicateOperator inPredicate) {
Set<Long> partitions = partitionValueMap.get(literal);
if (partitions != null) {
if (inPredicate.isNotIn()) {
matches.removeAll(partitions);
// external table, one partition column for one partition can only have one value
if (listPartitionInfo == null) {
matches.removeAll(partitions);
} else {
// for olap table, if one partition is multi value partition like PARTITION pCalifornia VALUES IN ("Los Angeles","San Francisco","San Diego")
// and we have a not in predicate like city not in ("Los Angeles"), it's not safe to remove this partition
for (Long id : partitions) {
if (listPartitionInfo.isSingleValuePartition(id)) {
matches.remove(id);
}
}
}
} else {
matches.addAll(partitions);
}
Expand Down
Loading