Switch to Guava's Lists

apache · Jul 7, 2023 · 32074d6 · 32074d6
1 parent 4641684
commit 32074d6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 24 deletions.
diff --git a/...v3.1/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java b/...v3.1/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
@@ -2058,15 +2058,11 @@ public static Types.StructType nonDerivedSchema(Dataset<Row> metadataTable) {
   }
 
   private long totalSizeInBytes(Iterable<DataFile> dataFiles) {
-    return StreamSupport.stream(dataFiles.spliterator(), false)
-        .mapToLong(DataFile::fileSizeInBytes)
-        .sum();
+    return Lists.newArrayList(dataFiles).stream().mapToLong(DataFile::fileSizeInBytes).sum();
   }
 
   private List<DataFile> dataFiles(Table table, long commitId) {
-    return StreamSupport.stream(
-            table.snapshot(commitId).addedDataFiles(table.io()).spliterator(), false)
-        .collect(Collectors.toList());
+    return Lists.newArrayList(table.snapshot(commitId).addedDataFiles(table.io()));
   }
 
   private void assertDataFilePartitions(

diff --git a/...v3.2/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java b/...v3.2/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
@@ -2195,15 +2195,11 @@ private DeleteFile writeEqDeleteFile(Table table) {
   }
 
   private long totalSizeInBytes(Iterable<DataFile> dataFiles) {
-    return StreamSupport.stream(dataFiles.spliterator(), false)
-        .mapToLong(DataFile::fileSizeInBytes)
-        .sum();
+    return Lists.newArrayList(dataFiles).stream().mapToLong(DataFile::fileSizeInBytes).sum();
   }
 
   private List<DataFile> dataFiles(Table table, long commitId) {
-    return StreamSupport.stream(
-            table.snapshot(commitId).addedDataFiles(table.io()).spliterator(), false)
-        .collect(Collectors.toList());
+    return Lists.newArrayList(table.snapshot(commitId).addedDataFiles(table.io()));
   }
 
   private void assertDataFilePartitions(

diff --git a/...v3.3/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java b/...v3.3/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
@@ -2262,15 +2262,11 @@ private DeleteFile writeEqDeleteFile(Table table) {
   }
 
   private long totalSizeInBytes(Iterable<DataFile> dataFiles) {
-    return StreamSupport.stream(dataFiles.spliterator(), false)
-        .mapToLong(DataFile::fileSizeInBytes)
-        .sum();
+    return Lists.newArrayList(dataFiles).stream().mapToLong(DataFile::fileSizeInBytes).sum();
   }
 
   private List<DataFile> dataFiles(Table table, long commitId) {
-    return StreamSupport.stream(
-            table.snapshot(commitId).addedDataFiles(table.io()).spliterator(), false)
-        .collect(Collectors.toList());
+    return Lists.newArrayList(table.snapshot(commitId).addedDataFiles(table.io()));
   }
 
   private void assertDataFilePartitions(

diff --git a/...v3.4/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java b/...v3.4/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
@@ -2259,15 +2259,11 @@ private DeleteFile writeEqDeleteFile(Table table) {
   }
 
   private long totalSizeInBytes(Iterable<DataFile> dataFiles) {
-    return StreamSupport.stream(dataFiles.spliterator(), false)
-        .mapToLong(DataFile::fileSizeInBytes)
-        .sum();
+    return Lists.newArrayList(dataFiles).stream().mapToLong(DataFile::fileSizeInBytes).sum();
   }
 
   private List<DataFile> dataFiles(Table table, long commitId) {
-    return StreamSupport.stream(
-            table.snapshot(commitId).addedDataFiles(table.io()).spliterator(), false)
-        .collect(Collectors.toList());
+    return Lists.newArrayList(table.snapshot(commitId).addedDataFiles(table.io()));
   }
 
   private void assertDataFilePartitions(