Skip to content

GH-3632: Fix record-level notIn evaluation #3631

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
wgtmac merged 1 commit into from
Jun 24, 2026
+67 −33
Merged

GH-3632: Fix record-level notIn evaluation #3631

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
63 changes: 31 additions & 32 deletions ...rc/main/java/org/apache/parquet/filter2/IncrementallyUpdatedFilterPredicateGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,51 +281,50 @@ private void addInequalityCase(TypeInfo info, String op, boolean expectMultipleR
}

private void addInNotInCase(TypeInfo info, boolean isEq, boolean expectMultipleResults) throws IOException {
add(" if (clazz.equals(" + info.className + ".class)) {\n" + " if (pred.getValues().contains(null)) {\n"
+ " valueInspector = new ValueInspector() {\n"
+ " @Override\n"
+ " public void updateNull() {\n"
+ " setResult("
+ isEq + ");\n" + " }\n"
+ "\n"
+ " @Override\n"
+ " public void update("
+ info.primitiveName + " value) {\n" + " setResult("
+ !isEq + ");\n" + " }\n"
+ " };\n"
+ " } else {\n"
+ " final Set<"
String nullResult = isEq ? "containsNull" : "!containsNull";
add(" if (clazz.equals(" + info.className + ".class)) {\n" + " final Set<"
+ info.className + "> target = (Set<" + info.className + ">) pred.getValues();\n"
+ " final PrimitiveComparator<"
+ " final boolean containsNull = target.contains(null);\n"
+ " final PrimitiveComparator<"
+ info.className + "> comparator = getComparator(columnPath);\n" + "\n"
+ " valueInspector = new ValueInspector() {\n"
+ " @Override\n"
+ " public void updateNull() {\n"
+ " setResult("
+ !isEq + ");\n" + " }\n"
+ " valueInspector = new ValueInspector() {\n"
+ " @Override\n"
+ " public void updateNull() {\n");
if (!expectMultipleResults) {
add(" setResult(" + nullResult + ");\n");
} else {
add(" if (" + nullResult + ") { setResult(true); }\n");
}
add(" }\n"
+ "\n"
+ " @Override\n"
+ " public void update("
+ " @Override\n"
+ " public void update("
+ info.primitiveName + " value) {\n");

if (expectMultipleResults) {
add(" if (isKnown()) return;\n");
add(" if (isKnown()) return;\n");
}
add(" for (" + info.primitiveName + " i : target) {\n");

add(" if(" + compareEquality("value", "i", isEq) + ") {\n");
add(" for (" + info.className + " i : target) {\n"
+ " if (i == null) { continue; }\n"
+ " "
+ info.primitiveName + " targetValue = i;\n");

add(" setResult(true);\n return;\n");
add(" if(" + compareEquality("value", "targetValue", true) + ") {\n");

add(" }\n");
if (!expectMultipleResults || isEq) {
add(" setResult(" + isEq + ");\n");
}
add(" return;\n");

add(" }\n");
if (!expectMultipleResults) {
add(" setResult(false);\n");
}

add(" }\n");
if (!expectMultipleResults || !isEq) {
add(" setResult(" + !isEq + ");\n");
}
add(" }\n");

add(" };\n" + " }\n" + " }\n\n");
add(" };\n" + " }\n\n");
}

private void addUdpBegin() throws IOException {
Expand Down
37 changes: 36 additions & 1 deletion ...t-hadoop/src/test/java/org/apache/parquet/filter2/recordlevel/TestRecordLevelFilters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.LongStream;
import org.apache.parquet.example.data.Group;
import org.apache.parquet.filter2.compat.FilterCompat;
Expand Down Expand Up @@ -156,7 +158,11 @@ private static void assertFilter(List<Group> found, UserFilter f) {
}

private static void assertPredicate(FilterPredicate predicate, long... expectedIds) throws IOException {
List<Group> found = PhoneBookWriter.readFile(phonebookFile, FilterCompat.get(predicate));
assertPredicate(phonebookFile, predicate, expectedIds);
}

private static void assertPredicate(File file, FilterPredicate predicate, long... expectedIds) throws IOException {
List<Group> found = PhoneBookWriter.readFile(file, FilterCompat.get(predicate));

assertEquals(expectedIds.length, found.size());
for (int i = 0; i < expectedIds.length; i++) {
Expand All @@ -175,6 +181,35 @@ public boolean keep(User u) {
});
}

@Test
public void testNotInChecksAllValues() throws Exception {
File file = PhoneBookWriter.writeToFile(List.of(
new User(300, "lon-1", null, new Location(1.0, null)),
new User(301, "lon-2", null, new Location(2.0, null)),
new User(302, "lon-3", null, new Location(3.0, null))));
DoubleColumn lon = doubleColumn("location.lon");

Set<Double> values = new LinkedHashSet<>();
values.add(1.0);
values.add(3.0);
assertPredicate(file, notIn(lon, values), 301L);
}

@Test
public void testInAndNotInCheckNullAndNonNullValues() throws Exception {
File file = PhoneBookWriter.writeToFile(List.of(
new User(300, "lon-null", null, new Location(null, null)),
new User(301, "lon-2", null, new Location(2.0, null)),
new User(302, "lon-3", null, new Location(3.0, null))));
DoubleColumn lon = doubleColumn("location.lon");

Set<Double> values = new LinkedHashSet<>();
values.add(null);
values.add(3.0);
assertPredicate(file, in(lon, values), 300L, 302L);
assertPredicate(file, notIn(lon, values), 301L);
}

@Test
public void testAllFilter() throws Exception {
BinaryColumn name = binaryColumn("name");
Expand Down