You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by bl...@apache.org on 2019/11/06 18:38:15 UTC
[incubator-iceberg] branch master updated: Fix MutableConstantField
(#610)
This is an automated email from the ASF dual-hosted git repository.
blue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new 9f799c8 Fix MutableConstantField (#610)
9f799c8 is described below
commit 9f799c811fd5a34fc3ce56888d243c6c8c22e498
Author: Fokko Driesprong <fo...@apache.org>
AuthorDate: Wed Nov 6 19:38:07 2019 +0100
Fix MutableConstantField (#610)
---
.../org/apache/iceberg/types/CheckCompatibility.java | 2 +-
.../src/main/java/org/apache/iceberg/DataTableScan.java | 5 ++---
core/src/main/java/org/apache/iceberg/FileHistory.java | 2 +-
.../main/java/org/apache/iceberg/ManifestReader.java | 6 +++---
core/src/main/java/org/apache/iceberg/ScanSummary.java | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 55616 bytes
.../org/apache/iceberg/parquet/ParquetValueReaders.java | 2 +-
.../iceberg/spark/PruneColumnsWithReordering.java | 2 +-
.../iceberg/spark/PruneColumnsWithoutReordering.java | 3 +--
.../java/org/apache/iceberg/spark/SparkFilters.java | 3 +--
10 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/api/src/main/java/org/apache/iceberg/types/CheckCompatibility.java b/api/src/main/java/org/apache/iceberg/types/CheckCompatibility.java
index 3888d39..07a84f2 100644
--- a/api/src/main/java/org/apache/iceberg/types/CheckCompatibility.java
+++ b/api/src/main/java/org/apache/iceberg/types/CheckCompatibility.java
@@ -52,7 +52,7 @@ public class CheckCompatibility extends TypeUtil.CustomOrderSchemaVisitor<List<S
return TypeUtil.visit(readSchema, new CheckCompatibility(writeSchema, false));
}
- private static final List<String> NO_ERRORS = ImmutableList.of();
+ private static final ImmutableList<String> NO_ERRORS = ImmutableList.of();
private final Schema schema;
private final boolean checkOrdering;
diff --git a/core/src/main/java/org/apache/iceberg/DataTableScan.java b/core/src/main/java/org/apache/iceberg/DataTableScan.java
index 29d2641..019e24e 100644
--- a/core/src/main/java/org/apache/iceberg/DataTableScan.java
+++ b/core/src/main/java/org/apache/iceberg/DataTableScan.java
@@ -25,7 +25,6 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import java.util.Collection;
-import java.util.List;
import org.apache.iceberg.expressions.Expression;
import org.apache.iceberg.expressions.ManifestEvaluator;
import org.apache.iceberg.expressions.ResidualEvaluator;
@@ -38,11 +37,11 @@ import org.slf4j.LoggerFactory;
public class DataTableScan extends BaseTableScan {
private static final Logger LOG = LoggerFactory.getLogger(DataTableScan.class);
- private static final List<String> SCAN_COLUMNS = ImmutableList.of(
+ private static final ImmutableList<String> SCAN_COLUMNS = ImmutableList.of(
"snapshot_id", "file_path", "file_ordinal", "file_format", "block_size_in_bytes",
"file_size_in_bytes", "record_count", "partition", "key_metadata"
);
- private static final List<String> SCAN_WITH_STATS_COLUMNS = ImmutableList.<String>builder()
+ private static final ImmutableList<String> SCAN_WITH_STATS_COLUMNS = ImmutableList.<String>builder()
.addAll(SCAN_COLUMNS)
.add("value_counts", "null_value_counts", "lower_bounds", "upper_bounds", "column_sizes")
.build();
diff --git a/core/src/main/java/org/apache/iceberg/FileHistory.java b/core/src/main/java/org/apache/iceberg/FileHistory.java
index 001abc7..39f6121 100644
--- a/core/src/main/java/org/apache/iceberg/FileHistory.java
+++ b/core/src/main/java/org/apache/iceberg/FileHistory.java
@@ -33,7 +33,7 @@ import org.apache.iceberg.types.Types;
import org.apache.iceberg.util.CharSequenceWrapper;
public class FileHistory {
- private static final List<String> HISTORY_COLUMNS = ImmutableList.of("file_path");
+ private static final ImmutableList<String> HISTORY_COLUMNS = ImmutableList.of("file_path");
private FileHistory() {
}
diff --git a/core/src/main/java/org/apache/iceberg/ManifestReader.java b/core/src/main/java/org/apache/iceberg/ManifestReader.java
index c61161a..e258d41 100644
--- a/core/src/main/java/org/apache/iceberg/ManifestReader.java
+++ b/core/src/main/java/org/apache/iceberg/ManifestReader.java
@@ -49,10 +49,10 @@ import static org.apache.iceberg.expressions.Expressions.alwaysTrue;
public class ManifestReader extends CloseableGroup implements Filterable<FilteredManifest> {
private static final Logger LOG = LoggerFactory.getLogger(ManifestReader.class);
- private static final List<String> ALL_COLUMNS = ImmutableList.of("*");
- static final List<String> CHANGE_COLUMNS = ImmutableList.of(
+ private static final ImmutableList<String> ALL_COLUMNS = ImmutableList.of("*");
+ static final ImmutableList<String> CHANGE_COLUMNS = ImmutableList.of(
"file_path", "file_format", "partition", "record_count", "file_size_in_bytes");
- static final List<String> CHANGE_WITH_STATS_COLUMNS = ImmutableList.<String>builder()
+ static final ImmutableList<String> CHANGE_WITH_STATS_COLUMNS = ImmutableList.<String>builder()
.addAll(CHANGE_COLUMNS)
.add("value_counts", "null_value_counts", "lower_bounds", "upper_bounds")
.build();
diff --git a/core/src/main/java/org/apache/iceberg/ScanSummary.java b/core/src/main/java/org/apache/iceberg/ScanSummary.java
index 92e59f3..5dca574 100644
--- a/core/src/main/java/org/apache/iceberg/ScanSummary.java
+++ b/core/src/main/java/org/apache/iceberg/ScanSummary.java
@@ -51,7 +51,7 @@ public class ScanSummary {
private ScanSummary() {
}
- private static final List<String> SCAN_SUMMARY_COLUMNS = ImmutableList.of(
+ private static final ImmutableList<String> SCAN_SUMMARY_COLUMNS = ImmutableList.of(
"partition", "record_count", "file_size_in_bytes");
/**
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..5c2d1cf
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetValueReaders.java b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetValueReaders.java
index 18f1cd6..aa7f572 100644
--- a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetValueReaders.java
+++ b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetValueReaders.java
@@ -59,7 +59,7 @@ public class ParquetValueReaders {
private static class NullReader<T> implements ParquetValueReader<T> {
private static final NullReader<Void> INSTANCE = new NullReader<>();
- private static final List<TripleIterator<?>> COLUMNS = ImmutableList.of();
+ private static final ImmutableList<TripleIterator<?>> COLUMNS = ImmutableList.of();
private static final TripleIterator<?> NULL_COLUMN = new TripleIterator<Object>() {
@Override
public int currentDefinitionLevel() {
diff --git a/spark/src/main/java/org/apache/iceberg/spark/PruneColumnsWithReordering.java b/spark/src/main/java/org/apache/iceberg/spark/PruneColumnsWithReordering.java
index edbe390..b8ddef1 100644
--- a/spark/src/main/java/org/apache/iceberg/spark/PruneColumnsWithReordering.java
+++ b/spark/src/main/java/org/apache/iceberg/spark/PruneColumnsWithReordering.java
@@ -240,7 +240,7 @@ public class PruneColumnsWithReordering extends TypeUtil.CustomOrderSchemaVisito
return primitive;
}
- private static final Map<TypeID, Class<? extends DataType>> TYPES = ImmutableMap
+ private static final ImmutableMap<TypeID, Class<? extends DataType>> TYPES = ImmutableMap
.<TypeID, Class<? extends DataType>>builder()
.put(TypeID.BOOLEAN, BooleanType.class)
.put(TypeID.INTEGER, IntegerType.class)
diff --git a/spark/src/main/java/org/apache/iceberg/spark/PruneColumnsWithoutReordering.java b/spark/src/main/java/org/apache/iceberg/spark/PruneColumnsWithoutReordering.java
index 1c75b52..47af527 100644
--- a/spark/src/main/java/org/apache/iceberg/spark/PruneColumnsWithoutReordering.java
+++ b/spark/src/main/java/org/apache/iceberg/spark/PruneColumnsWithoutReordering.java
@@ -23,7 +23,6 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;
import org.apache.iceberg.Schema;
@@ -214,7 +213,7 @@ public class PruneColumnsWithoutReordering extends TypeUtil.CustomOrderSchemaVis
return primitive;
}
- private static final Map<TypeID, Class<? extends DataType>> TYPES = ImmutableMap
+ private static final ImmutableMap<TypeID, Class<? extends DataType>> TYPES = ImmutableMap
.<TypeID, Class<? extends DataType>>builder()
.put(TypeID.BOOLEAN, BooleanType.class)
.put(TypeID.INTEGER, IntegerType.class)
diff --git a/spark/src/main/java/org/apache/iceberg/spark/SparkFilters.java b/spark/src/main/java/org/apache/iceberg/spark/SparkFilters.java
index 442854a..c6f8f52 100644
--- a/spark/src/main/java/org/apache/iceberg/spark/SparkFilters.java
+++ b/spark/src/main/java/org/apache/iceberg/spark/SparkFilters.java
@@ -23,7 +23,6 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import java.sql.Date;
import java.sql.Timestamp;
-import java.util.Map;
import org.apache.iceberg.expressions.Expression;
import org.apache.iceberg.expressions.Expression.Operation;
import org.apache.spark.sql.catalyst.util.DateTimeUtils;
@@ -59,7 +58,7 @@ public class SparkFilters {
private SparkFilters() {
}
- private static final Map<Class<? extends Filter>, Operation> FILTERS = ImmutableMap
+ private static final ImmutableMap<Class<? extends Filter>, Operation> FILTERS = ImmutableMap
.<Class<? extends Filter>, Operation>builder()
.put(EqualTo.class, Operation.EQ)
.put(EqualNullSafe.class, Operation.EQ)