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 to Iceberg 1.1.0 #15079

Merged
merged 1 commit into from
Dec 13, 2022
Merged

Update to Iceberg 1.1.0 #15079

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
2 changes: 2 additions & 0 deletions plugin/trino-iceberg/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,8 @@
<ignoredResourcePattern>about.html</ignoredResourcePattern>
<ignoredResourcePattern>iceberg-build.properties</ignoredResourcePattern>
<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
<!-- TODO: To be removed https://github.com/trinodb/trino/issues/15371 -->
<ignoredResourcePattern>google/protobuf/.*\.proto$</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergAvroPageSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ public IcebergAvroPageSource(
.collect(toImmutableMap(Types.NestedField::name, Types.NestedField::type));
pageBuilder = new PageBuilder(columnTypes);
recordIterator = avroReader.iterator();
// TODO: Remove when NPE check has been released: https://github.com/trinodb/trino/issues/15372
isFinished();
}

private boolean isIndexColumn(int column)
Expand Down
2 changes: 2 additions & 0 deletions plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSplitSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@ public CompletableFuture<ConnectorSplitBatch> getNextBatch(int maxSize)
closer.register(fileScanTaskIterable);
this.fileScanTaskIterator = fileScanTaskIterable.iterator();
closer.register(fileScanTaskIterator);
// TODO: Remove when NPE check has been released: https://github.com/trinodb/trino/issues/15372
isFinished();
}

TupleDomain<IcebergColumnHandle> dynamicFilterPredicate = dynamicFilter.getCurrentPredicate()
Expand Down
76 changes: 38 additions & 38 deletions ...rino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMetadataFileOperations.java
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import org.apache.iceberg.data.Record;
import org.apache.iceberg.data.parquet.GenericParquetWriter;
import org.apache.iceberg.deletes.EqualityDeleteWriter;
import org.apache.iceberg.deletes.PositionDelete;
import org.apache.iceberg.deletes.PositionDeleteWriter;
import org.apache.iceberg.hadoop.HadoopOutputFile;
import org.apache.iceberg.parquet.Parquet;
Expand Down Expand Up @@ -171,8 +172,10 @@ public void testV2TableWithPositionDelete()
.withSpec(PartitionSpec.unpartitioned())
.buildPositionWriter();

PositionDelete<Record> positionDelete = PositionDelete.create();
PositionDelete<Record> record = positionDelete.set(dataFilePath, 0, GenericRecord.create(icebergTable.schema()));
try (Closeable ignored = writer) {
writer.delete(dataFilePath, 0, GenericRecord.create(icebergTable.schema()));
Copy link
Contributor Author

@Fokko Fokko Nov 17, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

.delete has been deprecated for a while, and removed in 1.1.0

writer.write(record);
}

icebergTable.newRowDelta().addDeletes(writer.toDeleteFile()).commit();
Expand Down Expand Up @@ -521,7 +524,7 @@ private void writeEqualityDeleteToNationTable(Table icebergTable, Optional<Parti

Record dataDelete = GenericRecord.create(deleteRowSchema);
try (Closeable ignored = writer) {
writer.delete(dataDelete.copy(overwriteValues));
writer.write(dataDelete.copy(overwriteValues));
}

icebergTable.newRowDelta().addDeletes(writer.toDeleteFile()).commit();
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<dep.confluent.version>5.5.2</dep.confluent.version>
<dep.casandra.version>4.14.0</dep.casandra.version>
<dep.minio.version>7.1.4</dep.minio.version>
<dep.iceberg.version>1.0.0</dep.iceberg.version>
<dep.iceberg.version>1.1.0</dep.iceberg.version>
<dep.spotbugs-annotations.version>4.7.2</dep.spotbugs-annotations.version>
<dep.protobuf.version>3.21.6</dep.protobuf.version>
<dep.wire.version>3.2.2</dep.wire.version>
Expand Down
2 changes: 2 additions & 0 deletions testing/trino-faulttolerant-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,8 @@
<ignoredResourcePattern>about.html</ignoredResourcePattern>
<ignoredResourcePattern>iceberg-build.properties</ignoredResourcePattern>
<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
<!-- TODO: To be removed https://github.com/trinodb/trino/issues/15371 -->
<ignoredResourcePattern>google/protobuf/.*\.proto$</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions testing/trino-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,8 @@
<ignoredResourcePattern>about.html</ignoredResourcePattern>
<ignoredResourcePattern>iceberg-build.properties</ignoredResourcePattern>
<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
<!-- TODO: To be removed https://github.com/trinodb/trino/issues/15371 -->
<ignoredResourcePattern>google/protobuf/.*\.proto$</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>
Expand Down