HIVE-26675: Update Iceberg from 0.14.1 to 1.0.0 (#3711)

Contributed by zhangbutao
apache · Oct 31, 2022 · f8a6fd6 · f8a6fd6
1 parent 856d807
commit f8a6fd6
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/...erg/iceberg-catalog/src/test/java/org/apache/iceberg/hive/HiveCreateReplaceTableTest.java b/...erg/iceberg-catalog/src/test/java/org/apache/iceberg/hive/HiveCreateReplaceTableTest.java
@@ -128,7 +128,7 @@ public void testCreateTableTxnAndAppend() {
 
     Table table = catalog.loadTable(TABLE_IDENTIFIER);
     Snapshot snapshot = table.currentSnapshot();
-    Assert.assertTrue("Table should have one manifest file", snapshot.allManifests().size() == 1);
+    Assert.assertTrue("Table should have one manifest file", snapshot.allManifests(table.io()).size() == 1);
   }
 
   @Test

diff --git a/iceberg/iceberg-catalog/src/test/java/org/apache/iceberg/hive/HiveTableTest.java b/iceberg/iceberg-catalog/src/test/java/org/apache/iceberg/hive/HiveTableTest.java
@@ -225,7 +225,7 @@ public void testDropTable() throws IOException {
 
     String manifestListLocation = table.currentSnapshot().manifestListLocation().replace("file:", "");
 
-    List<ManifestFile> manifests = table.currentSnapshot().allManifests();
+    List<ManifestFile> manifests = table.currentSnapshot().allManifests(table.io());
 
     Assert.assertTrue("Drop (table and data) should return true and drop the table",
         catalog.dropTable(TABLE_IDENTIFIER));

diff --git a/iceberg/iceberg-catalog/src/test/java/org/apache/iceberg/hive/TestHiveTableConcurrency.java b/iceberg/iceberg-catalog/src/test/java/org/apache/iceberg/hive/TestHiveTableConcurrency.java
@@ -75,7 +75,7 @@ public synchronized void testConcurrentFastAppends() {
         });
 
     icebergTable.refresh();
-    Assert.assertEquals(20, icebergTable.currentSnapshot().allManifests().size());
+    Assert.assertEquals(20, icebergTable.currentSnapshot().allManifests(icebergTable.io()).size());
   }
 
   @Test

diff --git a/...g/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergStorageHandler.java b/...g/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergStorageHandler.java
@@ -568,7 +568,7 @@ public void validateSinkDesc(FileSinkDesc sinkDesc) throws SemanticException {
         throw new SemanticException("Cannot perform insert overwrite query on bucket partitioned Iceberg table.");
       }
       if (table.currentSnapshot() != null) {
-        if (table.currentSnapshot().allManifests().parallelStream().map(ManifestFile::partitionSpecId)
+        if (table.currentSnapshot().allManifests(table.io()).parallelStream().map(ManifestFile::partitionSpecId)
             .anyMatch(id -> id < table.spec().specId())) {
           throw new SemanticException(
               "Cannot perform insert overwrite query on Iceberg table where partition evolution happened. In order " +

diff --git a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergV2.java b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergV2.java
@@ -138,7 +138,7 @@ public void testReadAndWriteFormatV2Unpartitioned_PosDelete() throws IOException
         PartitionSpec.unpartitioned(), fileFormat, HiveIcebergStorageHandlerTestUtils.CUSTOMER_RECORDS, 2);
 
     // delete one of the rows
-    DataFile dataFile = StreamSupport.stream(tbl.currentSnapshot().addedFiles().spliterator(), false)
+    DataFile dataFile = StreamSupport.stream(tbl.currentSnapshot().addedDataFiles(tbl.io()).spliterator(), false)
         .findFirst()
         .orElseThrow(() -> new RuntimeException("Did not find any data files for test table"));
     List<PositionDelete<Record>> deletes = ImmutableList.of(positionDelete(
@@ -172,7 +172,7 @@ public void testReadAndWriteFormatV2Partitioned_PosDelete_RowNotSupplied() throw
     tbl.refresh();
 
     // delete the first and third rows from the newly-added data file - with row supplied
-    DataFile dataFile = StreamSupport.stream(tbl.currentSnapshot().addedFiles().spliterator(), false)
+    DataFile dataFile = StreamSupport.stream(tbl.currentSnapshot().addedDataFiles(tbl.io()).spliterator(), false)
         .filter(file -> file.partition().get(0, Long.class) == 0L)
         .filter(file -> file.recordCount() == 3)
         .findAny()
@@ -210,7 +210,7 @@ public void testReadAndWriteFormatV2Partitioned_PosDelete_RowSupplied() throws I
     tbl.refresh();
 
     // delete the first and third rows from the newly-added data file
-    DataFile dataFile = StreamSupport.stream(tbl.currentSnapshot().addedFiles().spliterator(), false)
+    DataFile dataFile = StreamSupport.stream(tbl.currentSnapshot().addedDataFiles(tbl.io()).spliterator(), false)
         .filter(file -> file.partition().get(0, Long.class) == 0L)
         .filter(file -> file.recordCount() == 3)
         .findAny()

diff --git a/iceberg/pom.xml b/iceberg/pom.xml
@@ -25,7 +25,7 @@
   <properties>
     <hive.path.to.root>..</hive.path.to.root>
     <path.to.iceberg.root>.</path.to.iceberg.root>
-    <iceberg.version>0.14.1</iceberg.version>
+    <iceberg.version>1.0.0</iceberg.version>
     <kryo-shaded.version>4.0.2</kryo-shaded.version>
     <iceberg.mockito-core.version>3.4.4</iceberg.mockito-core.version>
     <iceberg.avro.version>1.9.2</iceberg.avro.version>