Skip to content
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

Update Iceberg from 1.3.1 to 1.4.1 #19434

Merged
merged 1 commit into from
Oct 24, 2023
Merged

Update Iceberg from 1.3.1 to 1.4.1 #19434

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
7 changes: 1 addition & 6 deletions plugin/trino-iceberg/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
-->
<air.test.parallel>instances</air.test.parallel>
<!-- Nessie version (matching to Iceberg release) must be bumped along with Iceberg version bump to avoid compatibility issues -->
<dep.nessie.version>0.59.0</dep.nessie.version>
<dep.nessie.version>0.71.0</dep.nessie.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -249,11 +249,6 @@
<artifactId>parquet-hadoop</artifactId>
</dependency>

<dependency>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-annotations</artifactId>
</dependency>

<dependency>
<groupId>org.jdbi</groupId>
<artifactId>jdbi3-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergParquetFileWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
import static java.lang.String.format;
import static java.util.Objects.requireNonNull;
import static org.apache.iceberg.parquet.TrinoParquetUtil.footerMetrics;
import static org.apache.iceberg.parquet.ParquetUtil.footerMetrics;

public final class IcebergParquetFileWriter
implements IcebergFileWriter
Expand Down
1 change: 0 additions & 1 deletion ...berg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/IcebergNessieCatalogModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ public static NessieIcebergClient createNessieIcebergClient(IcebergNessieCatalog
return new NessieIcebergClient(
HttpClientBuilder.builder()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HttpClientBuilder is deprecated now. Let's migrate to NessieClientBuilder in follow-up.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK

.withUri(icebergNessieCatalogConfig.getServerUri())
.withEnableApiCompatibilityCheck(false)
ebyhr marked this conversation as resolved.
Show resolved Hide resolved
.build(NessieApiV1.class),
icebergNessieCatalogConfig.getDefaultReferenceName(),
null,
Expand Down
4 changes: 2 additions & 2 deletions plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/MigrateProcedure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
import org.apache.iceberg.mapping.MappingUtil;
import org.apache.iceberg.mapping.NameMapping;
import org.apache.iceberg.orc.OrcMetrics;
import org.apache.iceberg.parquet.TrinoParquetUtil;
import org.apache.iceberg.parquet.ParquetUtil;
import org.apache.iceberg.types.TypeUtil;
import org.apache.iceberg.types.Types;

Expand Down Expand Up @@ -382,7 +382,7 @@ private static Metrics loadMetrics(TrinoInputFile file, HiveStorageFormat storag
InputFile inputFile = new ForwardingInputFile(file);
return switch (storageFormat) {
case ORC -> OrcMetrics.fromInputFile(inputFile, METRICS_CONFIG, nameMapping);
case PARQUET -> TrinoParquetUtil.fileMetrics(inputFile, METRICS_CONFIG, nameMapping);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @raunaqmorarka

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ebyhr ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change loos fine for me.

case PARQUET -> ParquetUtil.fileMetrics(inputFile, METRICS_CONFIG, nameMapping);
case AVRO -> new Metrics(Avro.rowCount(inputFile), null, null, null, null);
default -> throw new TrinoException(NOT_SUPPORTED, "Unsupported storage format: " + storageFormat);
};
Expand Down
Loading
Loading