Skip to content

Fix CalcitePPLJoinIT #3369

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
merged 2 commits into from
Mar 3, 2025
Merged

Fix CalcitePPLJoinIT #3369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a8d99c
Fix PredicateAnalyzer for in and notIn
qianheng-aws Mar 3, 2025
3fa6e17
Change text field to keyword since we don't support push down for tha…
qianheng-aws Mar 3, 2025
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
2 changes: 1 addition & 1 deletion integ-test/src/test/resources/indexDefinitions/occupation_index_mapping.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "keyword"
},
"occupation": {
"type": "text"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@qianheng-aws , please create an issue of supporting text type pushdown. I will add it as child of #3309. Note, the new issue may not require product code change since it could be a part of adding external property to Calcite plan. But at least we need to add some tests to verify the text (may include more) type code be pushdown.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have a issue to fix text push down, #3334

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add this issue as a subtask of that as well, #3370

"type": "keyword"
},
"country": {
"type": "text"
Expand Down
2 changes: 1 addition & 1 deletion integ-test/src/test/resources/indexDefinitions/state_country_index_mapping.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}
},
"country": {
"type": "text"
"type": "keyword"
},
"year": {
"type": "integer"
Expand Down
9 changes: 5 additions & 4 deletions opensearch/src/main/java/org/opensearch/sql/opensearch/request/PredicateAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import com.google.common.base.Throwables;
import com.google.common.collect.Range;
import java.util.ArrayList;
import java.util.Collection;
import java.util.GregorianCalendar;
import java.util.LinkedHashMap;
import java.util.List;
Expand Down Expand Up @@ -897,15 +898,15 @@ public QueryExpression isTrue() {

@Override
public QueryExpression in(LiteralExpression literal) {
Iterable<?> iterable = (Iterable<?>) literal.value();
builder = termsQuery(getFieldReference(), iterable);
Collection<?> collection = (Collection<?>) literal.value();
builder = termsQuery(getFieldReference(), collection);
return this;
}

@Override
public QueryExpression notIn(LiteralExpression literal) {
Iterable<?> iterable = (Iterable<?>) literal.value();
builder = boolQuery().mustNot(termsQuery(getFieldReference(), iterable));
Collection<?> collection = (Collection<?>) literal.value();
builder = boolQuery().mustNot(termsQuery(getFieldReference(), collection));
return this;
}
}
Expand Down
Loading