Skip to content

PARQUET-645: Fix null handling in DictionaryFilter. #348

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

Closed
rdblue wants to merge 1 commit into from
Closed

PARQUET-645: Fix null handling in DictionaryFilter. #348

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 ...uet-hadoop/src/main/java/org/apache/parquet/filter2/dictionarylevel/DictionaryFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ public <T extends Comparable<T>> Boolean visit(Eq<T> eq) {

filterColumn.getColumnPath();

if (value == null) {
// the dictionary contains only non-null values so isn't helpful. this
// could check the column stats, but the StatisticsFilter is responsible
return BLOCK_MIGHT_MATCH;
}

try {
Set<T> dictSet = expandDictionary(meta);
if (dictSet != null && !dictSet.contains(value)) {
Expand Down Expand Up @@ -150,6 +156,12 @@ public <T extends Comparable<T>> Boolean visit(NotEq<T> notEq) {

filterColumn.getColumnPath();

if (value == null) {
// the dictionary contains only non-null values so isn't helpful. this
// could check the column stats, but the StatisticsFilter is responsible
return BLOCK_MIGHT_MATCH;
}

try {
Set<T> dictSet = expandDictionary(meta);
if (dictSet != null && dictSet.size() == 1 && dictSet.contains(value)) {
Expand Down
6 changes: 6 additions & 0 deletions ...hadoop/src/test/java/org/apache/parquet/filter2/dictionarylevel/DictionaryFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@ public void testEqBinary() throws Exception {

assertTrue("Should drop block for upper case letters",
canDrop(eq(b, Binary.fromString("A")), ccmd, dictionaries));

assertFalse("Should not drop block for null",
canDrop(eq(b, null), ccmd, dictionaries));
}

@Test
Expand All @@ -211,6 +214,9 @@ public void testNotEqBinary() throws Exception {

assertFalse("Should not drop block with a known value",
canDrop(notEq(b, Binary.fromString("B")), ccmd, dictionaries));

assertFalse("Should not drop block for null",
canDrop(notEq(b, null), ccmd, dictionaries));
}

@Test
Expand Down