Bump Iceberg version to 0.8.0-incubating

The change in IcebergMetadata::toIcebergSchema is needed to avoid failures with nested types. With 0.8.0-incubating, we need to assign fresh IDs (to avoid duplicate IDs) before constructing an Iceberg schema.
trinodb · Jul 10, 2020 · 7d1e7e5 · 7d1e7e5
1 parent 32c4f1a
commit 7d1e7e5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/presto-iceberg/pom.xml b/presto-iceberg/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-        <dep.iceberg.version>0.7.0-incubating</dep.iceberg.version>
+        <dep.iceberg.version>0.8.0-incubating</dep.iceberg.version>
     </properties>
 
     <dependencies>

diff --git a/presto-iceberg/src/main/java/io/prestosql/plugin/iceberg/IcebergMetadata.java b/presto-iceberg/src/main/java/io/prestosql/plugin/iceberg/IcebergMetadata.java
@@ -70,6 +70,7 @@
 import org.apache.iceberg.hadoop.HadoopInputFile;
 import org.apache.iceberg.types.Type;
 import org.apache.iceberg.types.TypeUtil;
+import org.apache.iceberg.types.Types;
 import org.apache.iceberg.types.Types.NestedField;
 
 import java.io.IOException;
@@ -563,9 +564,10 @@ private static Schema toIcebergSchema(List<ColumnMetadata> columns)
                 icebergColumns.add(field);
             }
         }
-        Schema schema = new Schema(icebergColumns);
+        Type icebergSchema = Types.StructType.of(icebergColumns);
         AtomicInteger nextFieldId = new AtomicInteger(1);
-        return TypeUtil.assignFreshIds(schema, nextFieldId::getAndIncrement);
+        icebergSchema = TypeUtil.assignFreshIds(icebergSchema, nextFieldId::getAndIncrement);
+        return new Schema(icebergSchema.asStructType().fields());
     }
 
     @Override