tool
/
starrocks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Enhancement] Bump Iceberg version to 1.10.0 (#63667) 

Bump Iceberg version to 1.10.0
This commit is contained in:
Youngwb 2025-09-29 14:37:59 +08:00 committed by GitHub
parent f9106d3c03
commit 800e861277
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fe/fe-core/src/main/java/org/apache/iceberg/ManifestReader.java
View File

@ -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<F extends ContentFile<F>> extends CloseableGroup
implements CloseableIterable<F> {
static final ImmutableList<String> ALL_COLUMNS = ImmutableList.of("*");
@ -338,11 +338,11 @@ public class ManifestReader<F extends ContentFile<F>> 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<F extends ContentFile<F>> 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<String> 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);

2
fe/pom.xml
View File

@ -75,7 +75,7 @@ under the License.
<protobuf-java.version>3.25.5</protobuf-java.version>
<paimon.version>1.0.1</paimon.version>
<delta-kernel.version>4.0.0rc1</delta-kernel.version>
<iceberg.version>1.9.0</iceberg.version>
<iceberg.version>1.10.0</iceberg.version>
<staros.version>3.5-rc4</staros.version>
<!-- hadoop-azure requires no more than jetty10+ -->
<!-- https://stackoverflow.com/questions/66713254/spark-wasb-and-jetty-11 -->

2
java-extensions/pom.xml
View File

@ -34,7 +34,7 @@
<java-extensions.home>${basedir}</java-extensions.home>
<aws-v2-sdk.version>2.29.52</aws-v2-sdk.version>
<hadoop.version>3.4.1</hadoop.version>
<iceberg.version>1.9.0</iceberg.version>
<iceberg.version>1.10.0</iceberg.version>
<log4j2.version>2.23.1</log4j2.version>
<junit.version>5.10.3</junit.version>
<hive-apache.version>3.1.2-22</hive-apache.version>