Skip to content

Fix ClassCastException in UnifiedQueryPlanner.preserveCollation on composite-collation plans #5650

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

Draft
noCharger wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix ClassCastException in UnifiedQueryPlanner.preserveCollation on composite-collation plans #5650

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
20 changes: 16 additions & 4 deletions api/src/main/java/org/opensearch/sql/api/UnifiedQueryPlanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@

import static org.opensearch.sql.monitor.profile.MetricName.ANALYZE;

import java.util.List;
import lombok.RequiredArgsConstructor;
import org.apache.calcite.rel.RelCollation;
import org.apache.calcite.rel.RelCollations;
import org.apache.calcite.rel.RelCollationTraitDef;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.RelRoot;
import org.apache.calcite.rel.core.Sort;
Expand Down Expand Up @@ -154,9 +155,20 @@ public RelNode plan(String query) {
}

private RelNode preserveCollation(RelNode logical) {
RelCollation collation = logical.getTraitSet().getCollation();
if (!(logical instanceof Sort) && collation != RelCollations.EMPTY) {
return LogicalSort.create(logical, collation, null, null);
if (logical instanceof Sort) {
return logical;
}
// Only a genuine single-sort collation is materialized. A literal-row plan (makeresults
// data=) carries several incidental derived collations kept as a RelCompositeTrait; those
// are not a user sort, so getTraits returns more than one and we leave the plan unwrapped.
// RelTraitSet.getCollation() would instead cast the composite to a single RelCollation and
// throw.
List<RelCollation> collations =
logical.getTraitSet().getTraits(RelCollationTraitDef.INSTANCE);
if (collations != null
&& collations.size() == 1
&& !collations.get(0).getFieldCollations().isEmpty()) {
return LogicalSort.create(logical, collations.get(0), null, null);
}
return logical;
}
Expand Down
Loading