diff --git a/fe/fe-core/src/main/java/org/apache/iceberg/ManifestReader.java b/fe/fe-core/src/main/java/org/apache/iceberg/ManifestReader.java index ac5e96576b8..5788fcd85ab 100644 --- a/fe/fe-core/src/main/java/org/apache/iceberg/ManifestReader.java +++ b/fe/fe-core/src/main/java/org/apache/iceberg/ManifestReader.java @@ -52,7 +52,7 @@ import java.util.function.Function; import static org.apache.iceberg.expressions.Expressions.alwaysTrue; -// copy from https://github.com/apache/iceberg/blob/apache-iceberg-1.9.0/core/src/main/java/org/apache/iceberg/ManifestReader.java +// copy from https://github.com/apache/iceberg/blob/apache-iceberg-1.10.0/core/src/main/java/org/apache/iceberg/ManifestReader.java public class ManifestReader> extends CloseableGroup implements CloseableIterable { static final ImmutableList ALL_COLUMNS = ImmutableList.of("*"); @@ -338,11 +338,11 @@ public class ManifestReader> extends CloseableGroup } private boolean hasRowFilter() { - return rowFilter != null && rowFilter != Expressions.alwaysTrue(); + return rowFilter != alwaysTrue(); } private boolean hasPartitionFilter() { - return partFilter != null && partFilter != Expressions.alwaysTrue(); + return partFilter != alwaysTrue(); } private boolean inPartitionSet(F fileToCheck) { @@ -422,32 +422,22 @@ public class ManifestReader> extends CloseableGroup if (lazyEvaluator == null) { Expression projected = Projections.inclusive(spec, caseSensitive).project(rowFilter); Expression finalPartFilter = Expressions.and(projected, partFilter); - if (finalPartFilter != null) { - this.lazyEvaluator = new Evaluator(spec.partitionType(), finalPartFilter, caseSensitive); - } else { - this.lazyEvaluator = - new Evaluator(spec.partitionType(), Expressions.alwaysTrue(), caseSensitive); - } + this.lazyEvaluator = new Evaluator(spec.partitionType(), finalPartFilter, caseSensitive); } return lazyEvaluator; } private InclusiveMetricsEvaluator metricsEvaluator() { if (lazyMetricsEvaluator == null) { - if (rowFilter != null) { - this.lazyMetricsEvaluator = - new InclusiveMetricsEvaluator(spec.schema(), rowFilter, caseSensitive); - } else { - this.lazyMetricsEvaluator = - new InclusiveMetricsEvaluator(spec.schema(), Expressions.alwaysTrue(), caseSensitive); - } + this.lazyMetricsEvaluator = + new InclusiveMetricsEvaluator(spec.schema(), rowFilter, caseSensitive); } return lazyMetricsEvaluator; } private static boolean requireStatsProjection(Expression rowFilter, Collection columns) { // Make sure we have all stats columns for metrics evaluator - return rowFilter != Expressions.alwaysTrue() + return rowFilter != alwaysTrue() && columns != null && !columns.containsAll(ManifestReader.ALL_COLUMNS) && !columns.containsAll(STATS_COLUMNS); diff --git a/fe/pom.xml b/fe/pom.xml index ecd93151263..e3a4b83890d 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -75,7 +75,7 @@ under the License. 3.25.5 1.0.1 4.0.0rc1 - 1.9.0 + 1.10.0 3.5-rc4 diff --git a/java-extensions/pom.xml b/java-extensions/pom.xml index 1e462d94947..12c09f8d8bf 100644 --- a/java-extensions/pom.xml +++ b/java-extensions/pom.xml @@ -34,7 +34,7 @@ ${basedir} 2.29.52 3.4.1 - 1.9.0 + 1.10.0 2.23.1 5.10.3 3.1.2-22