Skip to content

Fix requiredField logic in StructSelectiveStreamReader #13884

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
mbasmanova merged 1 commit into from
Dec 21, 2019
Merged

Fix requiredField logic in StructSelectiveStreamReader #13884

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
4 changes: 4 additions & 0 deletions presto-hive/src/test/java/com/facebook/presto/hive/TestHivePushdownFilterQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,9 +622,11 @@ public void testStructs()
assertQueryUsingH2Cte("SELECT info.orderkey, info.linenumber FROM lineitem_ex", rewriter);

assertQueryUsingH2Cte("SELECT info.linenumber, info.shipdate.ship_year FROM lineitem_ex WHERE orderkey < 1000", rewriter);
assertQueryUsingH2Cte("SELECT info.orderkey FROM lineitem_ex WHERE orderkey = 16515", rewriter);

assertQueryUsingH2Cte("SELECT info.orderkey FROM lineitem_ex WHERE info IS NULL", rewriter);
assertQueryUsingH2Cte("SELECT info.orderkey FROM lineitem_ex WHERE info IS NOT NULL", rewriter);
assertQueryUsingH2Cte("SELECT info.orderkey FROM lineitem_ex WHERE info IS NOT NULL AND orderkey = 16515", rewriter);

assertQueryUsingH2Cte("SELECT info, dates FROM lineitem_ex WHERE info.orderkey % 7 = 0", rewriter);
assertQueryUsingH2Cte("SELECT info.orderkey, dates FROM lineitem_ex WHERE info.orderkey % 7 = 0", rewriter);
Expand All @@ -641,6 +643,8 @@ public void testStructs()

// filter-only struct
assertQueryUsingH2Cte("SELECT orderkey FROM lineitem_ex WHERE info IS NOT NULL");
assertQueryUsingH2Cte("SELECT orderkey FROM lineitem_ex WHERE info IS NOT NULL AND info.orderkey = 16515", rewriter);
assertQueryUsingH2Cte("SELECT orderkey FROM lineitem_ex WHERE info IS NOT NULL AND info.orderkey + 1 = 16514", rewriter);

// filters on subfields
assertQueryUsingH2Cte("SELECT info.orderkey, info.linenumber FROM lineitem_ex WHERE info.linenumber = 2", rewriter);
Expand Down
2 changes: 1 addition & 1 deletion presto-orc/src/main/java/com/facebook/presto/orc/reader/StructSelectiveStreamReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ else if (outputRequired || !fieldsWithFilters.isEmpty()) {
StreamDescriptor nestedStream = nestedStreams.get(i);
String fieldName = nestedStream.getFieldName().toLowerCase(Locale.ENGLISH);
Optional<Type> fieldOutputType = nestedTypes.isPresent() ? Optional.of(nestedTypes.get().get(i)) : Optional.empty();
boolean requiredField = requiredFields.map(names -> names.containsKey(fieldName)).orElse(true);
boolean requiredField = requiredFields.map(names -> names.containsKey(fieldName)).orElse(outputRequired);

if (requiredField || fieldsWithFilters.contains(fieldName)) {
Map<Subfield, TupleDomainFilter> nestedFilters = filters.entrySet().stream()
Expand Down