update columns type to list in manifest reader

apache · Nov 25, 2020 · bb09e68 · bb09e68
1 parent 684459c
commit bb09e68
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/core/src/main/java/org/apache/iceberg/ManifestGroup.java b/core/src/main/java/org/apache/iceberg/ManifestGroup.java
@@ -164,7 +164,7 @@ public CloseableIterable<FileScanTask> planFiles() {
 
     boolean dropStats = ManifestReader.dropStats(dataFilter, columns);
     if (!deleteFiles.isEmpty()) {
-      select(Lists.newArrayList(ManifestReader.withStatsColumns(columns)));
+      select(ManifestReader.withStatsColumns(columns));
     }
 
     Iterable<CloseableIterable<FileScanTask>> tasks = entries((manifest, entries) -> {

diff --git a/core/src/main/java/org/apache/iceberg/ManifestReader.java b/core/src/main/java/org/apache/iceberg/ManifestReader.java
@@ -88,7 +88,7 @@ private String fileClass() {
   private Expression partFilter = alwaysTrue();
   private Expression rowFilter = alwaysTrue();
   private Schema fileProjection = null;
-  private Collection<String> columns = null;
+  private List<String> columns = null;
   private boolean caseSensitive = true;
 
   // lazily initialized
@@ -143,7 +143,7 @@ public PartitionSpec spec() {
     return spec;
   }
 
-  public ManifestReader<F> select(Collection<String> newColumns) {
+  public ManifestReader<F> select(List<String> newColumns) {
     Preconditions.checkState(fileProjection == null,
         "Cannot select columns using both select(String...) and project(Schema)");
     this.columns = newColumns;
@@ -296,7 +296,7 @@ static boolean dropStats(Expression rowFilter, Collection<String> columns) {
         Sets.intersection(Sets.newHashSet(columns), STATS_COLUMNS).isEmpty();
   }
 
-  static Collection<String> withStatsColumns(Collection<String> columns) {
+  static List<String> withStatsColumns(List<String> columns) {
     if (columns.containsAll(ManifestReader.ALL_COLUMNS)) {
       return columns;
     } else {

diff --git a/core/src/test/java/org/apache/iceberg/TestManifestReaderStats.java b/core/src/test/java/org/apache/iceberg/TestManifestReaderStats.java
@@ -24,8 +24,8 @@
 import java.util.Map;
 import org.apache.iceberg.expressions.Expressions;
 import org.apache.iceberg.io.CloseableIterable;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList;
 import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
-import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet;
 import org.apache.iceberg.types.Conversions;
 import org.apache.iceberg.types.Types;
 import org.junit.Assert;
@@ -88,7 +88,7 @@ public void testReadWithFilterIncludesFullStats() throws IOException {
   public void testReadEntriesWithFilterAndSelectIncludesFullStats() throws IOException {
     ManifestFile manifest = writeManifest(1000L, FILE);
     try (ManifestReader<DataFile> reader = ManifestFiles.read(manifest, FILE_IO)
-        .select(ImmutableSet.of("file_path"))
+        .select(ImmutableList.of("file_path"))
         .filterRows(Expressions.equal("id", 3))) {
       CloseableIterable<ManifestEntry<DataFile>> entries = reader.entries();
       ManifestEntry<DataFile> entry = entries.iterator().next();
@@ -100,7 +100,7 @@ public void testReadEntriesWithFilterAndSelectIncludesFullStats() throws IOExcep
   public void testReadIteratorWithFilterAndSelectDropsStats() throws IOException {
     ManifestFile manifest = writeManifest(1000L, FILE);
     try (ManifestReader<DataFile> reader = ManifestFiles.read(manifest, FILE_IO)
-        .select(ImmutableSet.of("file_path"))
+        .select(ImmutableList.of("file_path"))
         .filterRows(Expressions.equal("id", 3))) {
       DataFile entry = reader.iterator().next();
       assertStatsDropped(entry);
@@ -110,7 +110,7 @@ public void testReadIteratorWithFilterAndSelectDropsStats() throws IOException {
   public void testReadIteratorWithFilterAndSelectStatsIncludesFullStats() throws IOException {
     ManifestFile manifest = writeManifest(1000L, FILE);
     try (ManifestReader<DataFile> reader = ManifestFiles.read(manifest, FILE_IO)
-        .select(ImmutableSet.of("file_path", "value_counts"))
+        .select(ImmutableList.of("file_path", "value_counts"))
         .filterRows(Expressions.equal("id", 3))) {
       DataFile entry = reader.iterator().next();
       assertFullStats(entry);
@@ -121,7 +121,7 @@ public void testReadIteratorWithFilterAndSelectStatsIncludesFullStats() throws I
   public void testReadEntriesWithSelectNotIncludeFullStats() throws IOException {
     ManifestFile manifest = writeManifest(1000L, FILE);
     try (ManifestReader<DataFile> reader = ManifestFiles.read(manifest, FILE_IO)
-        .select(ImmutableSet.of("file_path"))) {
+        .select(ImmutableList.of("file_path"))) {
       CloseableIterable<ManifestEntry<DataFile>> entries = reader.entries();
       ManifestEntry<DataFile> entry = entries.iterator().next();
       assertNoStats(entry.file());
@@ -131,7 +131,7 @@ public void testReadEntriesWithSelectNotIncludeFullStats() throws IOException {
   public void testReadEntriesWithSelectCertainStatNotIncludeFullStats() throws IOException {
     ManifestFile manifest = writeManifest(1000L, FILE);
     try (ManifestReader<DataFile> reader = ManifestFiles.read(manifest, FILE_IO)
-        .select(ImmutableSet.of("file_path", "value_counts"))) {
+        .select(ImmutableList.of("file_path", "value_counts"))) {
       DataFile dataFile = reader.iterator().next();
 
       Assert.assertEquals(-1, dataFile.recordCount());