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/iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new 295accd Use relocated guava classes (#1076)
295accd is described below
commit 295accd3f0ad04d5ad67e2a5ff394f44f9eef8ca
Author: Shardul Mahadik <[email protected]>
AuthorDate: Fri May 29 12:56:08 2020 -0700
Use relocated guava classes (#1076)
---
.baseline/checkstyle/checkstyle-suppressions.xml | 3 +++
.baseline/checkstyle/checkstyle.xml | 5 +++++
.../main/java/org/apache/iceberg/data/orc/GenericOrcReaders.java | 4 ++--
data/src/test/java/org/apache/iceberg/data/TestLocalScan.java | 6 +++---
.../java/org/apache/iceberg/data/TestMetricsRowGroupFilter.java | 2 +-
.../org/apache/iceberg/data/TestMetricsRowGroupFilterTypes.java | 2 +-
.../java/org/apache/iceberg/orc/ExpressionToSearchArgument.java | 2 +-
orc/src/main/java/org/apache/iceberg/orc/IdToOrcName.java | 8 ++++----
.../java/org/apache/iceberg/orc/OrcSchemaWithTypeVisitor.java | 2 +-
orc/src/main/java/org/apache/iceberg/orc/OrcValueReaders.java | 2 +-
.../spark/source/orc/IcebergSourceFlatORCDataBenchmark.java | 2 +-
.../spark/source/orc/IcebergSourceFlatORCDataReadBenchmark.java | 2 +-
.../spark/source/orc/IcebergSourceNestedORCDataReadBenchmark.java | 2 +-
.../main/java/org/apache/iceberg/spark/data/SparkOrcReader.java | 2 +-
.../java/org/apache/iceberg/spark/data/SparkOrcValueReaders.java | 2 +-
15 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/.baseline/checkstyle/checkstyle-suppressions.xml
b/.baseline/checkstyle/checkstyle-suppressions.xml
index 65a204a..f4395f5 100644
--- a/.baseline/checkstyle/checkstyle-suppressions.xml
+++ b/.baseline/checkstyle/checkstyle-suppressions.xml
@@ -28,4 +28,7 @@
<suppress files="[/\\].*[/\\]generated.*[/\\]" checks="." />
<suppress files="org.apache.iceberg.hive.ScriptRunner.java"
checks="RegexpHeader"/>
+
+ <!-- Referencing guava classes should be allowed in classes within
bundled-guava module -->
+ <suppress files="org.apache.iceberg.GuavaClasses"
id="BanUnrelocatedGuavaClasses"/>
</suppressions>
diff --git a/.baseline/checkstyle/checkstyle.xml
b/.baseline/checkstyle/checkstyle.xml
index f11542f..11c8841 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -165,6 +165,11 @@
<property name="illegalClasses"
value="com.google.common.base.Optional, com.google.common.base.Supplier"/>
<message key="import.illegal" value="Use the Java8 version of
Guava objects."/>
</module>
+ <module name="IllegalImport">
+ <property name="id" value="BanUnrelocatedGuavaClasses"/>
+ <property name="illegalPkgs" value="com.google.common"/>
+ <message key="import.illegal" value="Use
org.apache.iceberg.relocated.* classes from bundled-guava module instead."/>
+ </module>
<module name="IllegalInstantiation"> <!-- Java Coding Guidelines:
Never instantiate primitive types -->
<property name="classes" value="java.lang.Boolean"/>
<property name="classes" value="java.lang.Byte"/>
diff --git
a/data/src/main/java/org/apache/iceberg/data/orc/GenericOrcReaders.java
b/data/src/main/java/org/apache/iceberg/data/orc/GenericOrcReaders.java
index 0befa6b..1a48508 100644
--- a/data/src/main/java/org/apache/iceberg/data/orc/GenericOrcReaders.java
+++ b/data/src/main/java/org/apache/iceberg/data/orc/GenericOrcReaders.java
@@ -19,8 +19,6 @@
package org.apache.iceberg.data.orc;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
@@ -37,6 +35,8 @@ import org.apache.iceberg.data.GenericRecord;
import org.apache.iceberg.data.Record;
import org.apache.iceberg.orc.OrcValueReader;
import org.apache.iceberg.orc.OrcValueReaders;
+import org.apache.iceberg.relocated.com.google.common.collect.Lists;
+import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.types.Types;
import org.apache.iceberg.util.DateTimeUtil;
import org.apache.orc.storage.ql.exec.vector.BytesColumnVector;
diff --git a/data/src/test/java/org/apache/iceberg/data/TestLocalScan.java
b/data/src/test/java/org/apache/iceberg/data/TestLocalScan.java
index cd80f23..6c7475d 100644
--- a/data/src/test/java/org/apache/iceberg/data/TestLocalScan.java
+++ b/data/src/test/java/org/apache/iceberg/data/TestLocalScan.java
@@ -63,14 +63,14 @@ import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import static com.google.common.collect.Iterables.concat;
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.transform;
import static org.apache.iceberg.DataFiles.fromInputFile;
import static org.apache.iceberg.expressions.Expressions.equal;
import static org.apache.iceberg.expressions.Expressions.lessThan;
import static org.apache.iceberg.expressions.Expressions.lessThanOrEqual;
import static org.apache.iceberg.hadoop.HadoopOutputFile.fromPath;
+import static
org.apache.iceberg.relocated.com.google.common.collect.Iterables.concat;
+import static
org.apache.iceberg.relocated.com.google.common.collect.Iterables.filter;
+import static
org.apache.iceberg.relocated.com.google.common.collect.Iterables.transform;
import static org.apache.iceberg.types.Types.NestedField.optional;
import static org.apache.iceberg.types.Types.NestedField.required;
diff --git
a/data/src/test/java/org/apache/iceberg/data/TestMetricsRowGroupFilter.java
b/data/src/test/java/org/apache/iceberg/data/TestMetricsRowGroupFilter.java
index 5ab5959..e40ba75 100644
--- a/data/src/test/java/org/apache/iceberg/data/TestMetricsRowGroupFilter.java
+++ b/data/src/test/java/org/apache/iceberg/data/TestMetricsRowGroupFilter.java
@@ -19,7 +19,6 @@
package org.apache.iceberg.data;
-import com.google.common.collect.Lists;
import java.io.File;
import java.io.IOException;
import java.util.Locale;
@@ -45,6 +44,7 @@ import org.apache.iceberg.io.SeekableInputStream;
import org.apache.iceberg.orc.ORC;
import org.apache.iceberg.parquet.Parquet;
import org.apache.iceberg.parquet.ParquetMetricsRowGroupFilter;
+import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.types.Types;
import org.apache.iceberg.types.Types.FloatType;
import org.apache.iceberg.types.Types.IntegerType;
diff --git
a/data/src/test/java/org/apache/iceberg/data/TestMetricsRowGroupFilterTypes.java
b/data/src/test/java/org/apache/iceberg/data/TestMetricsRowGroupFilterTypes.java
index 17d3b99..94dde0a 100644
---
a/data/src/test/java/org/apache/iceberg/data/TestMetricsRowGroupFilterTypes.java
+++
b/data/src/test/java/org/apache/iceberg/data/TestMetricsRowGroupFilterTypes.java
@@ -19,7 +19,6 @@
package org.apache.iceberg.data;
-import com.google.common.collect.Lists;
import java.io.File;
import java.io.IOException;
import java.math.BigDecimal;
@@ -52,6 +51,7 @@ import org.apache.iceberg.io.SeekableInputStream;
import org.apache.iceberg.orc.ORC;
import org.apache.iceberg.parquet.Parquet;
import org.apache.iceberg.parquet.ParquetMetricsRowGroupFilter;
+import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.types.Types;
import org.apache.iceberg.types.Types.BinaryType;
import org.apache.iceberg.types.Types.BooleanType;
diff --git
a/orc/src/main/java/org/apache/iceberg/orc/ExpressionToSearchArgument.java
b/orc/src/main/java/org/apache/iceberg/orc/ExpressionToSearchArgument.java
index 716e92e..57f7a0f 100644
--- a/orc/src/main/java/org/apache/iceberg/orc/ExpressionToSearchArgument.java
+++ b/orc/src/main/java/org/apache/iceberg/orc/ExpressionToSearchArgument.java
@@ -19,7 +19,6 @@
package org.apache.iceberg.orc;
-import com.google.common.collect.ImmutableSet;
import java.math.BigDecimal;
import java.sql.Date;
import java.sql.Timestamp;
@@ -32,6 +31,7 @@ import org.apache.iceberg.expressions.BoundPredicate;
import org.apache.iceberg.expressions.Expression;
import org.apache.iceberg.expressions.ExpressionVisitors;
import org.apache.iceberg.expressions.Literal;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet;
import org.apache.iceberg.types.Type;
import org.apache.iceberg.types.Type.TypeID;
import org.apache.orc.TypeDescription;
diff --git a/orc/src/main/java/org/apache/iceberg/orc/IdToOrcName.java
b/orc/src/main/java/org/apache/iceberg/orc/IdToOrcName.java
index ef83028..170a047 100644
--- a/orc/src/main/java/org/apache/iceberg/orc/IdToOrcName.java
+++ b/orc/src/main/java/org/apache/iceberg/orc/IdToOrcName.java
@@ -19,14 +19,14 @@
package org.apache.iceberg.orc;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import java.util.Deque;
import java.util.List;
import java.util.Map;
import org.apache.iceberg.Schema;
+import org.apache.iceberg.relocated.com.google.common.base.Joiner;
+import org.apache.iceberg.relocated.com.google.common.collect.Iterables;
+import org.apache.iceberg.relocated.com.google.common.collect.Lists;
+import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.types.Type;
import org.apache.iceberg.types.TypeUtil;
import org.apache.iceberg.types.Types;
diff --git
a/orc/src/main/java/org/apache/iceberg/orc/OrcSchemaWithTypeVisitor.java
b/orc/src/main/java/org/apache/iceberg/orc/OrcSchemaWithTypeVisitor.java
index 44ce803..175cddf 100644
--- a/orc/src/main/java/org/apache/iceberg/orc/OrcSchemaWithTypeVisitor.java
+++ b/orc/src/main/java/org/apache/iceberg/orc/OrcSchemaWithTypeVisitor.java
@@ -19,8 +19,8 @@
package org.apache.iceberg.orc;
-import com.google.common.collect.Lists;
import java.util.List;
+import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.types.Type;
import org.apache.iceberg.types.Types;
import org.apache.orc.TypeDescription;
diff --git a/orc/src/main/java/org/apache/iceberg/orc/OrcValueReaders.java
b/orc/src/main/java/org/apache/iceberg/orc/OrcValueReaders.java
index b84c3e3..e3aede0 100644
--- a/orc/src/main/java/org/apache/iceberg/orc/OrcValueReaders.java
+++ b/orc/src/main/java/org/apache/iceberg/orc/OrcValueReaders.java
@@ -19,10 +19,10 @@
package org.apache.iceberg.orc;
-import com.google.common.collect.Lists;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.types.Types;
import org.apache.orc.storage.ql.exec.vector.BytesColumnVector;
import org.apache.orc.storage.ql.exec.vector.ColumnVector;
diff --git
a/spark/src/jmh/java/org/apache/iceberg/spark/source/orc/IcebergSourceFlatORCDataBenchmark.java
b/spark/src/jmh/java/org/apache/iceberg/spark/source/orc/IcebergSourceFlatORCDataBenchmark.java
index 6cec4e7..329c9ff 100644
---
a/spark/src/jmh/java/org/apache/iceberg/spark/source/orc/IcebergSourceFlatORCDataBenchmark.java
+++
b/spark/src/jmh/java/org/apache/iceberg/spark/source/orc/IcebergSourceFlatORCDataBenchmark.java
@@ -19,7 +19,6 @@
package org.apache.iceberg.spark.source.orc;
-import com.google.common.collect.Maps;
import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.iceberg.PartitionSpec;
@@ -27,6 +26,7 @@ import org.apache.iceberg.Schema;
import org.apache.iceberg.Table;
import org.apache.iceberg.TableProperties;
import org.apache.iceberg.hadoop.HadoopTables;
+import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.spark.source.IcebergSourceBenchmark;
import org.apache.iceberg.types.Types;
diff --git
a/spark/src/jmh/java/org/apache/iceberg/spark/source/orc/IcebergSourceFlatORCDataReadBenchmark.java
b/spark/src/jmh/java/org/apache/iceberg/spark/source/orc/IcebergSourceFlatORCDataReadBenchmark.java
index 3cc0ab0..5463c7f 100644
---
a/spark/src/jmh/java/org/apache/iceberg/spark/source/orc/IcebergSourceFlatORCDataReadBenchmark.java
+++
b/spark/src/jmh/java/org/apache/iceberg/spark/source/orc/IcebergSourceFlatORCDataReadBenchmark.java
@@ -19,9 +19,9 @@
package org.apache.iceberg.spark.source.orc;
-import com.google.common.collect.Maps;
import java.io.IOException;
import java.util.Map;
+import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.spark.sql.Dataset;
import org.apache.spark.sql.Row;
import org.apache.spark.sql.internal.SQLConf;
diff --git
a/spark/src/jmh/java/org/apache/iceberg/spark/source/orc/IcebergSourceNestedORCDataReadBenchmark.java
b/spark/src/jmh/java/org/apache/iceberg/spark/source/orc/IcebergSourceNestedORCDataReadBenchmark.java
index 184c3b2..a4147e6 100644
---
a/spark/src/jmh/java/org/apache/iceberg/spark/source/orc/IcebergSourceNestedORCDataReadBenchmark.java
+++
b/spark/src/jmh/java/org/apache/iceberg/spark/source/orc/IcebergSourceNestedORCDataReadBenchmark.java
@@ -19,9 +19,9 @@
package org.apache.iceberg.spark.source.orc;
-import com.google.common.collect.Maps;
import java.io.IOException;
import java.util.Map;
+import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.spark.source.IcebergSourceNestedDataBenchmark;
import org.apache.spark.sql.Dataset;
import org.apache.spark.sql.Row;
diff --git
a/spark/src/main/java/org/apache/iceberg/spark/data/SparkOrcReader.java
b/spark/src/main/java/org/apache/iceberg/spark/data/SparkOrcReader.java
index 20f41cc..da1ee6e 100644
--- a/spark/src/main/java/org/apache/iceberg/spark/data/SparkOrcReader.java
+++ b/spark/src/main/java/org/apache/iceberg/spark/data/SparkOrcReader.java
@@ -19,13 +19,13 @@
package org.apache.iceberg.spark.data;
-import com.google.common.collect.ImmutableMap;
import java.util.List;
import java.util.Map;
import org.apache.iceberg.orc.OrcRowReader;
import org.apache.iceberg.orc.OrcSchemaWithTypeVisitor;
import org.apache.iceberg.orc.OrcValueReader;
import org.apache.iceberg.orc.OrcValueReaders;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
import org.apache.iceberg.types.Type;
import org.apache.iceberg.types.Types;
import org.apache.orc.TypeDescription;
diff --git
a/spark/src/main/java/org/apache/iceberg/spark/data/SparkOrcValueReaders.java
b/spark/src/main/java/org/apache/iceberg/spark/data/SparkOrcValueReaders.java
index 93c5d64..55e3117 100644
---
a/spark/src/main/java/org/apache/iceberg/spark/data/SparkOrcValueReaders.java
+++
b/spark/src/main/java/org/apache/iceberg/spark/data/SparkOrcValueReaders.java
@@ -19,12 +19,12 @@
package org.apache.iceberg.spark.data;
-import com.google.common.collect.Lists;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import org.apache.iceberg.orc.OrcValueReader;
import org.apache.iceberg.orc.OrcValueReaders;
+import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.types.Types;
import org.apache.orc.storage.ql.exec.vector.BytesColumnVector;
import org.apache.orc.storage.ql.exec.vector.ColumnVector;
